From dc4de31f3edf9c9e3d56efad36a886e6c8329eb8 Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Wed, 16 May 2018 23:55:42 +0200
Subject: [PATCH 001/932] Fix #7333 Unable to set negative custom option fixed
 price in admin view.

---
 .../Option/Validator/DefaultValidator.php     | 19 +++++++++++++++----
 .../Model/Product/Option/Validator/Select.php |  2 +-
 .../Option/Validator/DefaultValidatorTest.php | 14 +++++++-------
 .../Product/Option/Validator/SelectTest.php   |  3 +--
 .../Product/Form/Modifier/CustomOptions.php   |  2 +-
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
index 1e5c7f76d829b..a1b80b1ac7c12 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
@@ -132,11 +132,11 @@ protected function validateOptionType(Option $option)
      */
     protected function validateOptionValue(Option $option)
     {
-        return $this->isInRange($option->getPriceType(), $this->priceTypes) && !$this->isNegative($option->getPrice());
+        return $this->isInRange($option->getPriceType(), $this->priceTypes) && $this->isNumber($option->getPrice());
     }
 
     /**
-     * Check whether value is empty
+     * Check whether the value is empty
      *
      * @param mixed $value
      * @return bool
@@ -147,7 +147,7 @@ protected function isEmpty($value)
     }
 
     /**
-     * Check whether value is in range
+     * Check whether the value is in range
      *
      * @param string $value
      * @param array $range
@@ -159,7 +159,7 @@ protected function isInRange($value, array $range)
     }
 
     /**
-     * Check whether value is not negative
+     * Check whether the value is negative
      *
      * @param string $value
      * @return bool
@@ -168,4 +168,15 @@ protected function isNegative($value)
     {
         return intval($value) < 0;
     }
+
+    /**
+     * Check whether the value is a number
+     *
+     * @param string $value
+     * @return bool
+     */
+    protected function isNumber($value)
+    {
+        return is_numeric($value);
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
index f04ab497e1d4f..af37c16c4053e 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
@@ -83,7 +83,7 @@ protected function isValidOptionPrice($priceType, $price, $storeId)
         if (!$priceType && !$price) {
             return true;
         }
-        if (!$this->isInRange($priceType, $this->priceTypes) || $this->isNegative($price)) {
+        if (!$this->isInRange($priceType, $this->priceTypes) || !$this->isNumber($price)) {
             return false;
         }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
index 1eb5f1a2dacd2..5e208c5d16604 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
@@ -129,11 +129,13 @@ public function testIsValidFail($product)
      * Data provider for testValidationNegativePrice
      * @return array
      */
-    public function validationNegativePriceDataProvider()
+    public function validationPriceDataProvider()
     {
         return [
             ['option_title', 'name 1.1', 'fixed', -12, new \Magento\Framework\DataObject(['store_id' => 1])],
             ['option_title', 'name 1.1', 'fixed', -12, new \Magento\Framework\DataObject(['store_id' => 0])],
+            ['option_title', 'name 1.1', 'fixed', 12, new \Magento\Framework\DataObject(['store_id' => 1])],
+            ['option_title', 'name 1.1', 'fixed', 12, new \Magento\Framework\DataObject(['store_id' => 0])]
         ];
     }
 
@@ -143,9 +145,9 @@ public function validationNegativePriceDataProvider()
      * @param $priceType
      * @param $price
      * @param $product
-     * @dataProvider validationNegativePriceDataProvider
+     * @dataProvider validationPriceDataProvider
      */
-    public function testValidationNegativePrice($title, $type, $priceType, $price, $product)
+    public function testValidationPrice($title, $type, $priceType, $price, $product)
     {
         $methods = ['getTitle', 'getType', 'getPriceType', 'getPrice', '__wakeup', 'getProduct'];
         $valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
@@ -155,10 +157,8 @@ public function testValidationNegativePrice($title, $type, $priceType, $price, $
         $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
         $valueMock->expects($this->once())->method('getProduct')->will($this->returnValue($product));
 
-        $messages = [
-            'option values' => 'Invalid option value',
-        ];
-        $this->assertFalse($this->validator->isValid($valueMock));
+        $messages = [];
+        $this->assertTrue($this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
index 046ee703c850e..924893bce23a4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
@@ -87,7 +87,7 @@ public function isValidSuccessDataProvider()
                 ]
             ],
             [
-                false,
+                true,
                 [
                     'title' => 'Some Title',
                     'price_type' => 'fixed',
@@ -157,7 +157,6 @@ public function testIsValidateWithInvalidData($priceType, $price, $title)
     public function isValidateWithInvalidDataDataProvider()
     {
         return [
-            'invalid_price' => ['fixed', -10, 'Title'],
             'invalid_price_type' => ['some_value', '10', 'Title'],
             'empty_title' => ['fixed', 10, null]
         ];
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
index 7196a721f1d02..e557c8a377681 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -923,7 +923,7 @@ protected function getPriceFieldConfig($sortOrder)
                         'addbeforePool' => $this->productOptionsPrice->prefixesToOptionArray(),
                         'sortOrder' => $sortOrder,
                         'validation' => [
-                            'validate-zero-or-greater' => true
+                            'validate-number' => true
                         ],
                     ],
                 ],

From 270817fda97179ed86db8b937b2b52954cd7528c Mon Sep 17 00:00:00 2001
From: "Vasiliev.A" <a.vasiliev@sam-solutions.biz>
Date: Tue, 22 May 2018 01:02:03 +0300
Subject: [PATCH 002/932] Add support for topic schema defined as
 ServiceName:methodName

---
 .../Communication/Config/CompositeReader.php  | 38 +++++++++++++++++++
 app/code/Magento/WebapiAsync/etc/di.xml       |  3 ++
 2 files changed, 41 insertions(+)
 create mode 100644 app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php

diff --git a/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php b/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php
new file mode 100644
index 0000000000000..dcfb968282865
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Plugin\Communication\Config;
+
+use Magento\AsynchronousOperations\Model\ConfigInterface;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+class CompositeReader
+{
+    /**
+     * Topics with type schema is always are sync
+     * @see \Magento\Framework\Communication\Config\ReflectionGenerator::generateTopicConfigForServiceMethod().
+     * This plugin add support for topic type schema defined as ServiceName:methodName
+     * by force changing sync type to async
+     * but only if topic name starts with ConfigInterface::TOPIC_PREFIX, e.g. async.*
+     *
+     * @param \Magento\Framework\Communication\Config\CompositeReader $subject
+     * @param array $result
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function afterRead(\Magento\Framework\Communication\Config\CompositeReader $subject, array $result) {
+        foreach ($result[CommunicationConfig::TOPICS] as $topicName => $topicConfig) {
+            if (strpos($topicName, ConfigInterface::DEFAULT_HANDLER_NAME) === 0) {
+                $topicConfig[CommunicationConfig::TOPIC_IS_SYNCHRONOUS] = false;
+                $result[CommunicationConfig::TOPICS][$topicName] = $topicConfig;
+            }
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/etc/di.xml b/app/code/Magento/WebapiAsync/etc/di.xml
index b9cd7302b7350..01611c11d71bf 100755
--- a/app/code/Magento/WebapiAsync/etc/di.xml
+++ b/app/code/Magento/WebapiAsync/etc/di.xml
@@ -42,4 +42,7 @@
             <argument name="processorPath" xsi:type="const">Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor::BULK_PROCESSOR_PATH</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Framework\Communication\Config\CompositeReader">
+        <plugin name="forceTopicsTypeToAsync" type="Magento\WebapiAsync\Plugin\Communication\Config\CompositeReader" />
+    </type>
 </config>

From f7aab572bd188a002717a11f69d5bf572427dabd Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Sat, 2 Jun 2018 15:18:15 +0200
Subject: [PATCH 003/932] magento/magento2##7333: Unable to set negative custom
 option fixed price in admin view.  - Fixed unit tests  - Fixed integration
 tests  - Changed defaultvalidator to have the locale format interface.
 Because a value entered in the backoffice of Magento is passed as the value
 like "40,000.00", which needs to be converted to a float in order to do a
 valid check on it.

---
 .../Option/Validator/DefaultValidator.php     | 16 ++++++--
 .../Option/Validator/DefaultValidatorTest.php | 15 +++++++-
 .../Product/Option/Validator/FileTest.php     | 38 ++++++++++++++++++-
 .../Product/Option/Validator/SelectTest.php   | 17 ++++++++-
 .../Product/Option/Validator/TextTest.php     | 22 ++++++++++-
 5 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
index a1b80b1ac7c12..a01bc6b3e413f 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
@@ -25,13 +25,20 @@ class DefaultValidator extends \Magento\Framework\Validator\AbstractValidator
      */
     protected $priceTypes;
 
+    /**
+     * @var \Magento\Framework\Locale\FormatInterface
+     */
+    private $localeFormat;
+
     /**
      * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
      * @param \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig
+     * @param \Magento\Framework\Locale\FormatInterface|null $localeFormat
      */
     public function __construct(
         \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
-        \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig
+        \Magento\Catalog\Model\Config\Source\Product\Options\Price $priceConfig,
+        \Magento\Framework\Locale\FormatInterface $localeFormat = null
     ) {
         foreach ($productOptionConfig->getAll() as $option) {
             foreach ($option['types'] as $type) {
@@ -42,6 +49,9 @@ public function __construct(
         foreach ($priceConfig->toOptionArray() as $item) {
             $this->priceTypes[] = $item['value'];
         }
+
+        $this->localeFormat = $localeFormat ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Locale\FormatInterface::class);
     }
 
     /**
@@ -166,7 +176,7 @@ protected function isInRange($value, array $range)
      */
     protected function isNegative($value)
     {
-        return intval($value) < 0;
+        return $this->localeFormat->getNumber($value) < 0;
     }
 
     /**
@@ -177,6 +187,6 @@ protected function isNegative($value)
      */
     protected function isNumber($value)
     {
-        return is_numeric($value);
+        return is_numeric($this->localeFormat->getNumber($value));
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
index 5e208c5d16604..40c37731c0474 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
@@ -18,11 +18,18 @@ class DefaultValidatorTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeFormatMock;
+
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
         $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
+        $this->localeFormatMock = $this->createMock(\Magento\Framework\Locale\FormatInterface::class);
+
         $config = [
             [
                 'label' => 'group label 1',
@@ -48,7 +55,8 @@ protected function setUp()
         $configMock->expects($this->once())->method('getAll')->will($this->returnValue($config));
         $this->validator = new \Magento\Catalog\Model\Product\Option\Validator\DefaultValidator(
             $configMock,
-            $priceConfigMock
+            $priceConfigMock,
+            $this->localeFormatMock
         );
     }
 
@@ -86,6 +94,9 @@ public function testIsValidTitle($title, $type, $priceType, $price, $product, $m
         $valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue($priceType));
         $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
         $valueMock->expects($this->once())->method('getProduct')->will($this->returnValue($product));
+
+        $this->localeFormatMock->expects($this->once())->method('getNumber')->will($this->returnValue($price));
+
         $this->assertEquals($result, $this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
     }
@@ -157,6 +168,8 @@ public function testValidationPrice($title, $type, $priceType, $price, $product)
         $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
         $valueMock->expects($this->once())->method('getProduct')->will($this->returnValue($product));
 
+        $this->localeFormatMock->expects($this->once())->method('getNumber')->will($this->returnValue($price));
+
         $messages = [];
         $this->assertTrue($this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
index 3c06db0e7ce5f..f87bcb5d9bb06 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/FileTest.php
@@ -18,11 +18,18 @@ class FileTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeFormatMock;
+
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
         $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
+        $this->localeFormatMock = $this->createMock(\Magento\Framework\Locale\FormatInterface::class);
+
         $config = [
             [
                 'label' => 'group label 1',
@@ -50,7 +57,8 @@ protected function setUp()
         $this->valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
         $this->validator = new \Magento\Catalog\Model\Product\Option\Validator\File(
             $configMock,
-            $priceConfigMock
+            $priceConfigMock,
+            $this->localeFormatMock
         );
     }
 
@@ -62,6 +70,15 @@ public function testIsValidSuccess()
         $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
         $this->valueMock->expects($this->once())->method('getImageSizeX')->will($this->returnValue(10));
         $this->valueMock->expects($this->once())->method('getImageSizeY')->will($this->returnValue(15));
+        $this->localeFormatMock->expects($this->at(0))
+            ->method('getNumber')
+            ->with($this->equalTo(10))
+            ->will($this->returnValue(10));
+        $this->localeFormatMock
+            ->expects($this->at(2))
+            ->method('getNumber')
+            ->with($this->equalTo(15))
+            ->will($this->returnValue(15));
         $this->assertEmpty($this->validator->getMessages());
         $this->assertTrue($this->validator->isValid($this->valueMock));
     }
@@ -74,6 +91,16 @@ public function testIsValidWithNegativeImageSize()
         $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
         $this->valueMock->expects($this->once())->method('getImageSizeX')->will($this->returnValue(-10));
         $this->valueMock->expects($this->never())->method('getImageSizeY');
+        $this->localeFormatMock->expects($this->at(0))
+            ->method('getNumber')
+            ->with($this->equalTo(10))
+            ->will($this->returnValue(10));
+        $this->localeFormatMock
+            ->expects($this->at(1))
+            ->method('getNumber')
+            ->with($this->equalTo(-10))
+            ->will($this->returnValue(-10));
+
         $messages = [
             'option values' => 'Invalid option value',
         ];
@@ -89,6 +116,15 @@ public function testIsValidWithNegativeImageSizeY()
         $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
         $this->valueMock->expects($this->once())->method('getImageSizeX')->will($this->returnValue(10));
         $this->valueMock->expects($this->once())->method('getImageSizeY')->will($this->returnValue(-10));
+        $this->localeFormatMock->expects($this->at(0))
+            ->method('getNumber')
+            ->with($this->equalTo(10))
+            ->will($this->returnValue(10));
+        $this->localeFormatMock
+            ->expects($this->at(2))
+            ->method('getNumber')
+            ->with($this->equalTo(-10))
+            ->will($this->returnValue(-10));
         $messages = [
             'option values' => 'Invalid option value',
         ];
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
index 924893bce23a4..032eb624ed502 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
@@ -18,11 +18,17 @@ class SelectTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeFormatMock;
+
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
         $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
+        $this->localeFormatMock = $this->createMock(\Magento\Framework\Locale\FormatInterface::class);
         $config = [
             [
                 'label' => 'group label 1',
@@ -50,7 +56,8 @@ protected function setUp()
         $this->valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods, []);
         $this->validator = new \Magento\Catalog\Model\Product\Option\Validator\Select(
             $configMock,
-            $priceConfigMock
+            $priceConfigMock,
+            $this->localeFormatMock
         );
     }
 
@@ -66,6 +73,12 @@ public function testIsValidSuccess($expectedResult, array $value)
         $this->valueMock->expects($this->never())->method('getPriceType');
         $this->valueMock->expects($this->never())->method('getPrice');
         $this->valueMock->expects($this->any())->method('getData')->with('values')->will($this->returnValue([$value]));
+        if (isset($value['price'])) {
+            $this->localeFormatMock
+                ->expects($this->once())
+                ->method('getNumber')
+                ->will($this->returnValue($value['price']));
+        }
         $this->assertEquals($expectedResult, $this->validator->isValid($this->valueMock));
     }
 
@@ -108,6 +121,7 @@ public function testIsValidateWithInvalidOptionValues()
             ->method('getData')
             ->with('values')
             ->will($this->returnValue('invalid_data'));
+
         $messages = [
             'option values' => 'Invalid option value',
         ];
@@ -147,6 +161,7 @@ public function testIsValidateWithInvalidData($priceType, $price, $title)
         $this->valueMock->expects($this->never())->method('getPriceType');
         $this->valueMock->expects($this->never())->method('getPrice');
         $this->valueMock->expects($this->any())->method('getData')->with('values')->will($this->returnValue([$value]));
+        $this->localeFormatMock->expects($this->any())->method('getNumber')->will($this->returnValue($price));
         $messages = [
             'option values' => 'Invalid option value',
         ];
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
index cf31d67817684..f3951081b37af 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/TextTest.php
@@ -18,11 +18,17 @@ class TextTest extends \PHPUnit\Framework\TestCase
      */
     protected $valueMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeFormatMock;
+
     protected function setUp()
     {
         $configMock = $this->createMock(\Magento\Catalog\Model\ProductOptions\ConfigInterface::class);
         $storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $priceConfigMock = new \Magento\Catalog\Model\Config\Source\Product\Options\Price($storeManagerMock);
+        $this->localeFormatMock = $this->createMock(\Magento\Framework\Locale\FormatInterface::class);
         $config = [
             [
                 'label' => 'group label 1',
@@ -50,7 +56,8 @@ protected function setUp()
         $this->valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
         $this->validator = new \Magento\Catalog\Model\Product\Option\Validator\Text(
             $configMock,
-            $priceConfigMock
+            $priceConfigMock,
+            $this->localeFormatMock
         );
     }
 
@@ -61,6 +68,10 @@ public function testIsValidSuccess()
         $this->valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue('fixed'));
         $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
         $this->valueMock->expects($this->once())->method('getMaxCharacters')->will($this->returnValue(10));
+        $this->localeFormatMock->expects($this->exactly(2))
+            ->method('getNumber')
+            ->with($this->equalTo(10))
+            ->will($this->returnValue(10));
         $this->assertTrue($this->validator->isValid($this->valueMock));
         $this->assertEmpty($this->validator->getMessages());
     }
@@ -72,6 +83,15 @@ public function testIsValidWithNegativeMaxCharacters()
         $this->valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue('fixed'));
         $this->valueMock->expects($this->once())->method('getPrice')->will($this->returnValue(10));
         $this->valueMock->expects($this->once())->method('getMaxCharacters')->will($this->returnValue(-10));
+        $this->localeFormatMock->expects($this->at(0))
+            ->method('getNumber')
+            ->with($this->equalTo(10))
+            ->will($this->returnValue(10));
+        $this->localeFormatMock
+            ->expects($this->at(1))
+            ->method('getNumber')
+            ->with($this->equalTo(-10))
+            ->will($this->returnValue(-10));
         $messages = [
             'option values' => 'Invalid option value',
         ];

From 9a8e7afa278913afffda7dacf5de3355c58965ae Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Tue, 5 Jun 2018 11:42:21 +0200
Subject: [PATCH 004/932] magento/magento2#7333: Unable to set negative custom
 option fixed price in admin view.  - Changed validator method to public

---
 .../Catalog/Model/Product/Option/Validator/DefaultValidator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
index a01bc6b3e413f..838d92fb5d038 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/DefaultValidator.php
@@ -185,7 +185,7 @@ protected function isNegative($value)
      * @param string $value
      * @return bool
      */
-    protected function isNumber($value)
+    public function isNumber($value)
     {
         return is_numeric($this->localeFormat->getNumber($value));
     }

From 2f8cb97cfe7213e706e326e3f3bf1d5c63bcc76a Mon Sep 17 00:00:00 2001
From: "Vasiliev.A" <a.vasiliev@sam-solutions.biz>
Date: Tue, 26 Jun 2018 03:50:24 +0300
Subject: [PATCH 005/932] fix class and method descriptions

---
 .../Communication/Config/CompositeReader.php  | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php b/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php
index dcfb968282865..8486792736cbf 100644
--- a/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php
+++ b/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php
@@ -11,28 +11,36 @@
 use Magento\AsynchronousOperations\Model\ConfigInterface;
 use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
 
+/**
+ * Force change topic's defined as ServiceName:methodName from sync to async.
+ * Topic type will be changed if topic name starts with
+ * \Magento\AsynchronousOperations\Model\ConfigInterface::TOPIC_PREFIX
+ *
+ * @SuppressWarnings("unused")
+ */
 class CompositeReader
 {
     /**
-     * Topics with type schema is always are sync
-     * @see \Magento\Framework\Communication\Config\ReflectionGenerator::generateTopicConfigForServiceMethod().
-     * This plugin add support for topic type schema defined as ServiceName:methodName
-     * by force changing sync type to async
-     * but only if topic name starts with ConfigInterface::TOPIC_PREFIX, e.g. async.*
+     * Checking communication.xml merged configuration
+     * to find topics with names started from "async"
+     * \Magento\AsynchronousOperations\Model\ConfigInterface::TOPIC_PREFIX
+     * and change config attribute value "is_synchronous" to false (make async)
+     * for this topics.
      *
      * @param \Magento\Framework\Communication\Config\CompositeReader $subject
      * @param array $result
      *
      * @return array
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    public function afterRead(\Magento\Framework\Communication\Config\CompositeReader $subject, array $result) {
+    public function afterRead(\Magento\Framework\Communication\Config\CompositeReader $subject, array $result)
+    {
         foreach ($result[CommunicationConfig::TOPICS] as $topicName => $topicConfig) {
             if (strpos($topicName, ConfigInterface::DEFAULT_HANDLER_NAME) === 0) {
                 $topicConfig[CommunicationConfig::TOPIC_IS_SYNCHRONOUS] = false;
                 $result[CommunicationConfig::TOPICS][$topicName] = $topicConfig;
             }
         }
+
         return $result;
     }
 }

From 04caefa9b6c9bfe4fea6dc032b8e3cb61000f970 Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Tue, 10 Jul 2018 09:12:55 -0400
Subject: [PATCH 006/932] Fixed API test.

---
 .../Magento/Catalog/Api/_files/product_options.php   | 12 +++++++++++-
 .../Catalog/Api/_files/product_options_negative.php  | 11 -----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
index 144f3a9926fe3..955322929762d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
@@ -10,7 +10,7 @@
         'type' => 'field',
         'sort_order' => 1,
         'is_require' => 1,
-        'price' => 10,
+        'price' => -10,
         'price_type' => 'fixed',
         'sku' => 'sku1',
         'max_characters' => 10,
@@ -153,4 +153,14 @@
         'price_type' => 'fixed',
         'sku' => 'time option sku',
     ],
+    [
+        'title' => 'test negative price',
+        'type' => 'field',
+        'sort_order' => 1,
+        'is_require' => 1,
+        'price' => -10,
+        'price_type' => 'fixed',
+        'sku' => 'sku1',
+        'max_characters' => 10,
+    ],
 ];
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php
index 5d2737b3aa532..50b68a2653ed3 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options_negative.php
@@ -15,17 +15,6 @@
         'sku' => 'sku1',
         'max_characters' => 10,
     ],
-    'negative_price' => [
-        'title' => 'area option',
-        'type' => 'area',
-        'sort_order' => 2,
-        'is_require' => 0,
-        'price' => -20,
-        'price_type' => 'percent',
-        'sku' => 'sku2',
-        'max_characters' => 20,
-
-    ],
     'negative_value_of_image_size' => [
         'title' => 'file option',
         'type' => 'file',

From 09b6e03229305f359c270e853029999c2a75cef1 Mon Sep 17 00:00:00 2001
From: "Vasiliev.A" <a.vasiliev@sam-solutions.biz>
Date: Wed, 25 Jul 2018 01:12:31 +0300
Subject: [PATCH 007/932] fix for support schema request
 CommunicationConfig::TOPIC_REQUEST_TYPE_METHOD, added new attribute
 is_synchronous for topic to communication.xsd schema

---
 .../Communication/Config/CompositeReader.php  | 46 -------------------
 app/code/Magento/WebapiAsync/etc/di.xml       |  3 --
 .../Config/Reader/XmlReader/Converter.php     | 23 +++++++++-
 .../Config/ReflectionGenerator.php            | 19 +++++---
 .../Communication/etc/communication.xsd       |  1 +
 5 files changed, 35 insertions(+), 57 deletions(-)
 delete mode 100644 app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php

diff --git a/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php b/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php
deleted file mode 100644
index 8486792736cbf..0000000000000
--- a/app/code/Magento/WebapiAsync/Plugin/Communication/Config/CompositeReader.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\WebapiAsync\Plugin\Communication\Config;
-
-use Magento\AsynchronousOperations\Model\ConfigInterface;
-use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
-
-/**
- * Force change topic's defined as ServiceName:methodName from sync to async.
- * Topic type will be changed if topic name starts with
- * \Magento\AsynchronousOperations\Model\ConfigInterface::TOPIC_PREFIX
- *
- * @SuppressWarnings("unused")
- */
-class CompositeReader
-{
-    /**
-     * Checking communication.xml merged configuration
-     * to find topics with names started from "async"
-     * \Magento\AsynchronousOperations\Model\ConfigInterface::TOPIC_PREFIX
-     * and change config attribute value "is_synchronous" to false (make async)
-     * for this topics.
-     *
-     * @param \Magento\Framework\Communication\Config\CompositeReader $subject
-     * @param array $result
-     *
-     * @return array
-     */
-    public function afterRead(\Magento\Framework\Communication\Config\CompositeReader $subject, array $result)
-    {
-        foreach ($result[CommunicationConfig::TOPICS] as $topicName => $topicConfig) {
-            if (strpos($topicName, ConfigInterface::DEFAULT_HANDLER_NAME) === 0) {
-                $topicConfig[CommunicationConfig::TOPIC_IS_SYNCHRONOUS] = false;
-                $result[CommunicationConfig::TOPICS][$topicName] = $topicConfig;
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/app/code/Magento/WebapiAsync/etc/di.xml b/app/code/Magento/WebapiAsync/etc/di.xml
index c9a07e241ef54..83f1d6a78f227 100755
--- a/app/code/Magento/WebapiAsync/etc/di.xml
+++ b/app/code/Magento/WebapiAsync/etc/di.xml
@@ -42,9 +42,6 @@
             <argument name="processorPath" xsi:type="const">Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor::BULK_PROCESSOR_PATH</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\Framework\Communication\Config\CompositeReader">
-        <plugin name="forceTopicsTypeToAsync" type="Magento\WebapiAsync\Plugin\Communication\Config\CompositeReader" />
-    </type>
     <type name="Magento\Webapi\Controller\Rest">
         <plugin name="webapiContorllerRestAsync" type="Magento\WebapiAsync\Plugin\ControllerRest" />
     </type>
diff --git a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
index 8fcbd74c884d9..b761c0dd1059a 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
@@ -124,6 +124,7 @@ protected function extractTopics($config)
                 $requestSchema,
                 $responseSchema
             );
+            $isSynchronous = $this->extractTopicIsSynchronous($topicNode) ?? null;
             if ($serviceMethod) {
                 $output[$topicName] = $this->reflectionGenerator->generateTopicConfigForServiceMethod(
                     $topicName,
@@ -134,7 +135,7 @@ protected function extractTopics($config)
             } elseif ($requestSchema && $responseSchema) {
                 $output[$topicName] = [
                     Config::TOPIC_NAME => $topicName,
-                    Config::TOPIC_IS_SYNCHRONOUS => true,
+                    Config::TOPIC_IS_SYNCHRONOUS => $isSynchronous ?? true,
                     Config::TOPIC_REQUEST => $requestSchema,
                     Config::TOPIC_REQUEST_TYPE => Config::TOPIC_REQUEST_TYPE_CLASS,
                     Config::TOPIC_RESPONSE => $responseSchema,
@@ -143,7 +144,7 @@ protected function extractTopics($config)
             } elseif ($requestSchema) {
                 $output[$topicName] = [
                     Config::TOPIC_NAME => $topicName,
-                    Config::TOPIC_IS_SYNCHRONOUS => false,
+                    Config::TOPIC_IS_SYNCHRONOUS => $isSynchronous ?? false,
                     Config::TOPIC_REQUEST => $requestSchema,
                     Config::TOPIC_REQUEST_TYPE => Config::TOPIC_REQUEST_TYPE_CLASS,
                     Config::TOPIC_RESPONSE => null,
@@ -258,4 +259,22 @@ protected function parseServiceMethod($serviceMethod, $topicName)
         );
         return $parsedServiceMethod;
     }
+
+    /**
+     * Extract is_synchronous topic value.
+     *
+     * @param \DOMNode $topicNode
+     * @return boolean|null
+     */
+    protected function extractTopicIsSynchronous($topicNode)
+    {
+        $attributeName = Config::TOPIC_IS_SYNCHRONOUS;
+        $topicAttributes = $topicNode->attributes;
+        if (!$topicAttributes->getNamedItem($attributeName)) {
+            return null;
+        }
+        $value = $topicAttributes->getNamedItem($attributeName)->nodeValue;
+        $isSynchronous = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+        return $isSynchronous;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php b/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
index d1bc62464f212..e3ffd849f375f 100644
--- a/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
+++ b/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
@@ -42,7 +42,10 @@ public function extractMethodMetadata($className, $methodName)
         $result = [
             Config::SCHEMA_METHOD_PARAMS => [],
             Config::SCHEMA_METHOD_RETURN_TYPE => $this->methodsMap->getMethodReturnType($className, $methodName),
-            Config::SCHEMA_METHOD_HANDLER => [Config::HANDLER_TYPE => $className, Config::HANDLER_METHOD => $methodName]
+            Config::SCHEMA_METHOD_HANDLER => [
+                Config::HANDLER_TYPE => $className,
+                Config::HANDLER_METHOD => $methodName
+            ]
         ];
         $paramsMeta = $this->methodsMap->getMethodParams($className, $methodName);
         foreach ($paramsMeta as $paramPosition => $paramMeta) {
@@ -63,29 +66,33 @@ public function extractMethodMetadata($className, $methodName)
      * @param string $serviceType
      * @param string $serviceMethod
      * @param array|null $handlers
+     * @param bool|null $isSynchronous
      * @return array
      */
-    public function generateTopicConfigForServiceMethod($topicName, $serviceType, $serviceMethod, $handlers = [])
+    public function generateTopicConfigForServiceMethod($topicName, $serviceType, $serviceMethod, $handlers = [], $isSynchronous = null)
     {
         $methodMetadata = $this->extractMethodMetadata($serviceType, $serviceMethod);
         $returnType = $methodMetadata[Config::SCHEMA_METHOD_RETURN_TYPE];
         $returnType = ($returnType != 'void' && $returnType != 'null') ? $returnType : null;
+        if (!isset($isSynchronous)) {
+            $isSynchronous = $returnType ? true : false;
+        }
         return [
             Config::TOPIC_NAME => $topicName,
-            Config::TOPIC_IS_SYNCHRONOUS => $returnType ? true : false,
+            Config::TOPIC_IS_SYNCHRONOUS => $isSynchronous,
             Config::TOPIC_REQUEST => $methodMetadata[Config::SCHEMA_METHOD_PARAMS],
             Config::TOPIC_REQUEST_TYPE => Config::TOPIC_REQUEST_TYPE_METHOD,
             Config::TOPIC_RESPONSE => $returnType,
             Config::TOPIC_HANDLERS => $handlers
-                ?: [self::DEFAULT_HANDLER => $methodMetadata[Config::SCHEMA_METHOD_HANDLER]]
+                ? : [self::DEFAULT_HANDLER => $methodMetadata[Config::SCHEMA_METHOD_HANDLER]]
         ];
     }
 
     /**
      * Generate topic name based on service type and method name.
-     *
      * Perform the following conversion:
-     * \Magento\Customer\Api\RepositoryInterface + getById => magento.customer.api.repositoryInterface.getById
+     * \Magento\Customer\Api\RepositoryInterface + getById =>
+     * magento.customer.api.repositoryInterface.getById
      *
      * @param string $typeName
      * @param string $methodName
diff --git a/lib/internal/Magento/Framework/Communication/etc/communication.xsd b/lib/internal/Magento/Framework/Communication/etc/communication.xsd
index 12ee56371ce77..678d89f30c531 100644
--- a/lib/internal/Magento/Framework/Communication/etc/communication.xsd
+++ b/lib/internal/Magento/Framework/Communication/etc/communication.xsd
@@ -40,6 +40,7 @@
         <xs:attribute type="schemaType" name="schema" use="optional"/>
         <xs:attribute type="xs:string" name="request" use="optional"/>
         <xs:attribute type="xs:string" name="response" use="optional"/>
+        <xs:attribute type="xs:boolean" name="is_synchronous" use="optional"/>
     </xs:complexType>
     <xs:complexType name="handlerType">
         <xs:attribute type="xs:string" name="name" use="required"/>

From 08c35d44b5d84eb1fa6a096b2b47eced97570dcf Mon Sep 17 00:00:00 2001
From: "Vasiliev.A" <a.vasiliev@sam-solutions.biz>
Date: Wed, 25 Jul 2018 23:23:45 +0300
Subject: [PATCH 008/932] fix long string

---
 .../Communication/Config/ReflectionGenerator.php         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php b/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
index e3ffd849f375f..31ceb64bbd62e 100644
--- a/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
+++ b/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
@@ -69,8 +69,13 @@ public function extractMethodMetadata($className, $methodName)
      * @param bool|null $isSynchronous
      * @return array
      */
-    public function generateTopicConfigForServiceMethod($topicName, $serviceType, $serviceMethod, $handlers = [], $isSynchronous = null)
-    {
+    public function generateTopicConfigForServiceMethod(
+        $topicName,
+        $serviceType,
+        $serviceMethod,
+        $handlers = [],
+        $isSynchronous = null
+    ) {
         $methodMetadata = $this->extractMethodMetadata($serviceType, $serviceMethod);
         $returnType = $methodMetadata[Config::SCHEMA_METHOD_RETURN_TYPE];
         $returnType = ($returnType != 'void' && $returnType != 'null') ? $returnType : null;

From 1f743bd7fdf8147a80630fbd8f37a2cd53ee4d49 Mon Sep 17 00:00:00 2001
From: Yurii Borysov <yurii_borysov@epam.com>
Date: Thu, 23 Aug 2018 15:17:16 +0300
Subject: [PATCH 009/932] MAGETWO-91559: Static blocks with same ID appear in
 place of correct block

---
 .../Magento/Cms/Model/ResourceModel/Block.php   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block.php b/app/code/Magento/Cms/Model/ResourceModel/Block.php
index 9aab54b02bc14..ff7cc8d3e034d 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block.php
@@ -183,10 +183,12 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
         $entityMetadata = $this->metadataPool->getMetadata(BlockInterface::class);
         $linkField = $entityMetadata->getLinkField();
 
-        if ($this->_storeManager->isSingleStoreMode()) {
-            $stores = [Store::DEFAULT_STORE_ID];
-        } else {
-            $stores = (array)$object->getData('store_id');
+        $stores = (array)$object->getData('store_id');
+        $isDefaultStore = $this->_storeManager->isSingleStoreMode()
+            || array_search(Store::DEFAULT_STORE_ID, $stores) !== false;
+
+        if(!$isDefaultStore) {
+            $stores[] = Store::DEFAULT_STORE_ID;
         }
 
         $select = $this->getConnection()->select()
@@ -196,8 +198,11 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
                 'cb.' . $linkField . ' = cbs.' . $linkField,
                 []
             )
-            ->where('cb.identifier = ?', $object->getData('identifier'))
-            ->where('cbs.store_id IN (?)', $stores);
+            ->where('cb.identifier = ?  ', $object->getData('identifier'));
+
+        if(!$isDefaultStore) {
+            $select->where('cbs.store_id IN (?)', $stores);
+        }
 
         if ($object->getId()) {
             $select->where('cb.' . $entityMetadata->getIdentifierField() . ' <> ?', $object->getId());

From 33a84d6b554dbc82b4fda378bb8da79a1ecc9f1f Mon Sep 17 00:00:00 2001
From: Vital_Pantsialeyeu <vital_pantsialeyeu@epam.com>
Date: Thu, 30 Aug 2018 02:23:28 +0300
Subject: [PATCH 010/932] MAGETWO-66872: Customer Address Attribute not being
 marked as required when the "Values Required" setting is overriden on Website
 scope

- Updated retrieve attribute collection
---
 .../Model/ResourceModel/Attribute/Collection.php    | 13 +++++++++++++
 app/code/Magento/Eav/Model/Entity/Type.php          | 10 ++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php
index 4dd2eaa68b686..4cf438a95bed4 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php
@@ -42,4 +42,17 @@ protected function _getEavWebsiteTable()
     {
         return $this->getTable('customer_eav_attribute_website');
     }
+
+    /**
+     * Set collection item class name.
+     *
+     * @return $this
+     */
+    protected function _beforeLoad()
+    {
+        $entityType = $this->getEntityType();
+        $this->setItemObjectClass($entityType->getAttributeModel());
+
+        return parent::_beforeLoad();
+    }
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
index 80fcfd4ab585c..e0f890170f1b7 100644
--- a/app/code/Magento/Eav/Model/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -163,17 +163,11 @@ public function getAttributeCollection($setId = null)
     /**
      * Init and retrieve attribute collection
      *
-     * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
+     * @return mixed
      */
     protected function _getAttributeCollection()
     {
-        $collection = $this->_attributeFactory->create()->getCollection();
-        $objectsModel = $this->getAttributeModel();
-        if ($objectsModel) {
-            $collection->setModel($objectsModel);
-        }
-
-        return $collection;
+        return $this->_universalFactory->create($this->getEntityAttributeCollection());
     }
 
     /**

From 78a9a737a2c64c7deece3fa4708a57c23cf4d314 Mon Sep 17 00:00:00 2001
From: Lusine Hakobyan <lusine_hakobyan@epam.com>
Date: Thu, 30 Aug 2018 10:38:55 +0400
Subject: [PATCH 011/932] MAGETWO-91559: Static blocks with same ID appear in
 place of correct block

- Add automated test
---
 .../Test/Mftf/ActionGroup/CMSActionGroup.xml  | 12 +++-
 .../CmsNewBlockBlockActionsSection.xml        |  1 +
 .../Test/Mftf/Test/CheckStaticBlocksTest.xml  | 72 +++++++++++++++++++
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index 06419356d8e84..d83e154bc9d70 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
     <actionGroup name="navigateToCreatedCMSPage">
         <arguments>
             <argument name="CMSPage" defaultValue=""/>
@@ -44,4 +44,14 @@
         <waitForPageLoad stepKey="waitForPageLoad3"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
     </actionGroup>
+    <actionGroup name="DeleteCMSBlockActionGroup">
+        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSPagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{CmsPagesPageActionsSection.select(_defaultBlock.title)}}" stepKey="ClickOnSelect"/>
+        <click selector="{{CmsPagesPageActionsSection.delete(_defaultBlock.title)}}" stepKey="ClickOnEdit"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <click selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="ClickToConfirm"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <see userInput="You deleted the block." stepKey="VerifyBlockIsDeleted"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
index 65ea1226772cf..3cc204d64adca 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection.xml
@@ -17,6 +17,7 @@
         <element name="saveAndDuplicate" type="button" selector="#save_and_duplicate" timeout="10"/>
         <element name="saveAndClose" type="button" selector="#save_and_close" timeout="10"/>
         <element name="expandSplitButton" type="button" selector="//button[@data-ui-id='save-button-dropdown']" timeout="10"/>
+        <element name="back" type="button" selector="#back"/>
     </section>
     <section name="BlockWYSIWYGSection">
         <element name="ShowHideBtn" type="button" selector="#togglecms_block_form_content"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
new file mode 100644
index 0000000000000..df7cd59a45886
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="CheckStaticBlocksTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-91559 - Static blocks with same ID appear in place of correct block"/>
+            <title value="Check static blocks: ID should be unique per Store View"/>
+            <description value="Check static blocks: ID should be unique per Store View"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-94229"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
+                <argument name="newWebsiteName" value="secondWebsite"/>
+                <argument name="websiteCode" value="second_website"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
+                <argument name="website" value="secondWebsite"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+        </before>
+
+        <!--Go to Cms blocks page-->
+        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSPagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <seeInCurrentUrl url="cms/block/" stepKey="VerifyPageIsOpened"/>
+        <!--Click to create new block-->
+        <click selector="{{BlockPageActionsSection.addNewBlock}}" stepKey="ClickToAddNewBlock"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <seeInCurrentUrl url="cms/block/new" stepKey="VerifyNewBlockPageIsOpened"/>
+        <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent"/>
+        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <see userInput="You saved the block." stepKey="VerifyBlockIsSaved"/>
+        <!--Click to go back and add new block-->
+        <click selector="{{BlockNewPagePageActionsSection.back}}" stepKey="ClickToGoBack"/>
+        <waitForPageLoad stepKey="waitForPageLoad4"/>
+        <click selector="{{BlockPageActionsSection.addNewBlock}}" stepKey="ClickToAddNewBlock1"/>
+        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <seeInCurrentUrl url="cms/block/new" stepKey="VerifyNewBlockPageIsOpened1"/>
+        <!--Add new BLock with the same data-->
+        <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent1"/>
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="Default Store View" stepKey="selectDefaultStoreView" />
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="{{customStore.name}}" stepKey="selectSecondStoreView1" />
+        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock1"/>
+        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <!--Verify that corresponding message is displayed-->
+        <see userInput="A block identifier with the same properties already exists in the selected store." stepKey="VerifyBlockIsSaved1"/>
+
+        <after>
+            <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
+                <argument name="websiteName" value="secondWebsite"/>
+            </actionGroup>
+        </after>
+    </test>
+</tests>

From ff6482642346b69861cdc8d545a8015d5205044b Mon Sep 17 00:00:00 2001
From: andrewizotov <andrew.izotov@yahoo.com>
Date: Fri, 31 Aug 2018 11:45:29 +0300
Subject: [PATCH 012/932] 139: show only active categories

---
 .../Model/Resolver/Products/DataProvider/CategoryTree.php    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index d2fc174fb1ed5..3955fbef0de4d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -98,9 +98,12 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
         $collection->addPathFilter(sprintf('.*/%s/[/0-9]*$', $rootCategoryId));
         $collection->addFieldToFilter('level', ['gt' => $level]);
         $collection->addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
+        $collection->addIsActiveFilter();
         $collection->setOrder('level');
         $collection->getSelect()->orWhere(
-            $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField() . ' = ?',
+            $collection->getSelect()->getConnection()->quoteIdentifier('e.'.
+                $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()
+            ) . ' = ?',
             $rootCategoryId
         );
         return $this->processTree($collection->getIterator());

From ea8ea88082c596a36b75a15b5970871c414f10e8 Mon Sep 17 00:00:00 2001
From: andrewizotov <andrew.izotov@yahoo.com>
Date: Fri, 31 Aug 2018 16:41:12 +0300
Subject: [PATCH 013/932] 139: show only active categories, remove space

---
 .../Model/Resolver/Products/DataProvider/CategoryTree.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index 3955fbef0de4d..78d30c59c58f2 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -101,11 +101,11 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
         $collection->addIsActiveFilter();
         $collection->setOrder('level');
         $collection->getSelect()->orWhere(
-            $collection->getSelect()->getConnection()->quoteIdentifier('e.'.
-                $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()
-            ) . ' = ?',
+            $collection->getSelect()->getConnection()->quoteIdentifier(
+                'e.'. $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()) . ' = ?',
             $rootCategoryId
         );
+
         return $this->processTree($collection->getIterator());
     }
 

From 0d52d0d49a7f6094328d768d4ff04217d235474a Mon Sep 17 00:00:00 2001
From: andrewizotov <andrew.izotov@yahoo.com>
Date: Fri, 31 Aug 2018 17:44:45 +0300
Subject: [PATCH 014/932] 139: show only active categories, refactoring

---
 .../Model/Resolver/Products/DataProvider/CategoryTree.php    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index 78d30c59c58f2..782d3e128fb84 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -101,8 +101,9 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
         $collection->addIsActiveFilter();
         $collection->setOrder('level');
         $collection->getSelect()->orWhere(
-            $collection->getSelect()->getConnection()->quoteIdentifier(
-                'e.'. $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()) . ' = ?',
+            $collection->getSelect()
+                ->getConnection()
+                ->quoteIdentifier('e.' . $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()) . ' = ?',
             $rootCategoryId
         );
 

From ce63f2a873f5c5faf55507c9d07ef6b3d5a89bee Mon Sep 17 00:00:00 2001
From: andrewizotov <andrew.izotov@yahoo.com>
Date: Fri, 31 Aug 2018 17:59:55 +0300
Subject: [PATCH 015/932] 139: show only active categories, refactoring

---
 .../Model/Resolver/Products/DataProvider/CategoryTree.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index 782d3e128fb84..2d50221342373 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -103,7 +103,9 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
         $collection->getSelect()->orWhere(
             $collection->getSelect()
                 ->getConnection()
-                ->quoteIdentifier('e.' . $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()) . ' = ?',
+                ->quoteIdentifier(
+                    'e.' . $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()
+                ) . ' = ?',
             $rootCategoryId
         );
 

From aa5fa74db5eb7b5725c7ca8ad9cb47b77c968b7c Mon Sep 17 00:00:00 2001
From: Vital_Pantsialeyeu <vital_pantsialeyeu@epam.com>
Date: Tue, 4 Sep 2018 23:50:07 +0300
Subject: [PATCH 016/932] MAGETWO-66872: Customer Address Attribute not being
 marked as required when the "Values Required" setting is overriden on Website
 scope

- Updated retrieve attribute collection
---
 .../Model/ResourceModel/Attribute/Collection.php    | 13 -------------
 app/code/Magento/Eav/Model/Entity/Type.php          |  4 +++-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php
index 4cf438a95bed4..4dd2eaa68b686 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Attribute/Collection.php
@@ -42,17 +42,4 @@ protected function _getEavWebsiteTable()
     {
         return $this->getTable('customer_eav_attribute_website');
     }
-
-    /**
-     * Set collection item class name.
-     *
-     * @return $this
-     */
-    protected function _beforeLoad()
-    {
-        $entityType = $this->getEntityType();
-        $this->setItemObjectClass($entityType->getAttributeModel());
-
-        return parent::_beforeLoad();
-    }
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
index e0f890170f1b7..462c42cbc9654 100644
--- a/app/code/Magento/Eav/Model/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -167,7 +167,9 @@ public function getAttributeCollection($setId = null)
      */
     protected function _getAttributeCollection()
     {
-        return $this->_universalFactory->create($this->getEntityAttributeCollection());
+        $collection = $this->_universalFactory->create($this->getEntityAttributeCollection());
+        $collection->setItemObjectClass($this->getAttributeModel());
+        return $collection;
     }
 
     /**

From d43a52f4d919d0537a61028869f35a1f225aa324 Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Wed, 5 Sep 2018 10:33:27 +0200
Subject: [PATCH 017/932] Resolved merge conflict with merging 2.3 develop
 branch.

---
 .../Model/Product/Option/Validator/DefaultValidatorTest.php    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
index 2ac000499a220..82019db2e128f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
@@ -137,7 +137,6 @@ public function testIsValidFail($product)
         $this->assertFalse($this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
     }
-<<<<<<< HEAD
 
     /**
      * Data provider for testValidationNegativePrice
@@ -177,6 +176,4 @@ public function testValidationPrice($title, $type, $priceType, $price, $product)
         $this->assertTrue($this->validator->isValid($valueMock));
         $this->assertEquals($messages, $this->validator->getMessages());
     }
-=======
->>>>>>> 2.3-develop
 }

From d66329a3f49c96525b998227505be47163a7e4de Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Wed, 5 Sep 2018 10:53:10 +0200
Subject: [PATCH 018/932] Fixed DefaultValidatorTest

---
 .../Option/Validator/DefaultValidatorTest.php      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
index 82019db2e128f..7c2ec8abb768a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/DefaultValidatorTest.php
@@ -71,10 +71,10 @@ public function isValidTitleDataProvider()
     {
         $mess = ['option required fields' => 'Missed values for option required fields'];
         return [
-            ['option_title', 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
-            ['option_title', 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 0]), [], true],
-            [null, 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
-            [null, 'name 1.1', 'fixed', new \Magento\Framework\DataObject(['store_id' => 0]), $mess, false],
+            ['option_title', 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
+            ['option_title', 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 0]), [], true],
+            [null, 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 1]), [], true],
+            [null, 'name 1.1', 'fixed', 10, new \Magento\Framework\DataObject(['store_id' => 0]), $mess, false],
         ];
     }
 
@@ -87,14 +87,14 @@ public function isValidTitleDataProvider()
      * @param bool $result
      * @dataProvider isValidTitleDataProvider
      */
-    public function testIsValidTitle($title, $type, $priceType, $product, $messages, $result)
+    public function testIsValidTitle($title, $type, $priceType, $price, $product, $messages, $result)
     {
-        $methods = ['getTitle', 'getType', 'getPriceType', '__wakeup', 'getProduct'];
+        $methods = ['getTitle', 'getType', 'getPriceType', 'getPrice', '__wakeup', 'getProduct'];
         $valueMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Option::class, $methods);
         $valueMock->expects($this->once())->method('getTitle')->will($this->returnValue($title));
         $valueMock->expects($this->any())->method('getType')->will($this->returnValue($type));
         $valueMock->expects($this->once())->method('getPriceType')->will($this->returnValue($priceType));
-       // $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
+        $valueMock->expects($this->once())->method('getPrice')->will($this->returnValue($price));
         $valueMock->expects($this->once())->method('getProduct')->will($this->returnValue($product));
 
         $this->localeFormatMock->expects($this->once())->method('getNumber')->will($this->returnValue($price));

From db020882e1f7d237b25f4e087a37fa5cb2817f22 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 12 Sep 2018 09:44:07 +0300
Subject: [PATCH 019/932] MAGETWO-91688: Exception when login as restricted
 admin with access only to CMS Block

- Add component type to data provider
---
 app/code/Magento/Cms/Ui/Component/DataProvider.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Ui/Component/DataProvider.php b/app/code/Magento/Cms/Ui/Component/DataProvider.php
index 5fc9c5a896037..35b34c7675224 100644
--- a/app/code/Magento/Cms/Ui/Component/DataProvider.php
+++ b/app/code/Magento/Cms/Ui/Component/DataProvider.php
@@ -95,7 +95,8 @@ public function prepareMetadata()
                             'config' => [
                                 'editorConfig' => [
                                     'enabled' => false
-                                ]
+                                ],
+                                'componentType' => 'container'
                             ]
                         ]
                     ]

From 5367bded3fe37e327fc97d9b97a2ac7931192982 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 12 Sep 2018 09:46:53 +0300
Subject: [PATCH 020/932] MAGETWO-91688: Exception when login as restricted
 admin with access only to CMS Block

- Add component type as constant
---
 app/code/Magento/Cms/Ui/Component/DataProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Ui/Component/DataProvider.php b/app/code/Magento/Cms/Ui/Component/DataProvider.php
index 35b34c7675224..736a71ccb747e 100644
--- a/app/code/Magento/Cms/Ui/Component/DataProvider.php
+++ b/app/code/Magento/Cms/Ui/Component/DataProvider.php
@@ -96,7 +96,7 @@ public function prepareMetadata()
                                 'editorConfig' => [
                                     'enabled' => false
                                 ],
-                                'componentType' => 'container'
+                                'componentType' => \Magento\Ui\Component\Container::NAME
                             ]
                         ]
                     ]

From b7ea0d826612566ceebc39fa2fca03b0e7352dd0 Mon Sep 17 00:00:00 2001
From: "Vasiliev.A" <a.vasiliev@sam-solutions.biz>
Date: Wed, 12 Sep 2018 13:08:39 +0300
Subject: [PATCH 021/932] fix formatting, fix unused method param
 $isSynchronous

---
 .../Communication/Config/Reader/XmlReader/Converter.php      | 5 +++--
 .../Framework/Communication/Config/ReflectionGenerator.php   | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
index b761c0dd1059a..bc4deb7fe2461 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
@@ -130,7 +130,8 @@ protected function extractTopics($config)
                     $topicName,
                     $serviceMethod[ConfigParser::TYPE_NAME],
                     $serviceMethod[ConfigParser::METHOD_NAME],
-                    $handlers
+                    $handlers,
+                    $isSynchronous
                 );
             } elseif ($requestSchema && $responseSchema) {
                 $output[$topicName] = [
@@ -138,7 +139,7 @@ protected function extractTopics($config)
                     Config::TOPIC_IS_SYNCHRONOUS => $isSynchronous ?? true,
                     Config::TOPIC_REQUEST => $requestSchema,
                     Config::TOPIC_REQUEST_TYPE => Config::TOPIC_REQUEST_TYPE_CLASS,
-                    Config::TOPIC_RESPONSE => $responseSchema,
+                    Config::TOPIC_RESPONSE => ($isSynchronous) ? $responseSchema: null,
                     Config::TOPIC_HANDLERS => $handlers
                 ];
             } elseif ($requestSchema) {
diff --git a/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php b/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
index 31ceb64bbd62e..7ef84f1c43b10 100644
--- a/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
+++ b/lib/internal/Magento/Framework/Communication/Config/ReflectionGenerator.php
@@ -81,6 +81,8 @@ public function generateTopicConfigForServiceMethod(
         $returnType = ($returnType != 'void' && $returnType != 'null') ? $returnType : null;
         if (!isset($isSynchronous)) {
             $isSynchronous = $returnType ? true : false;
+        } else {
+            $returnType = ($isSynchronous) ? $returnType : null;
         }
         return [
             Config::TOPIC_NAME => $topicName,
@@ -89,12 +91,13 @@ public function generateTopicConfigForServiceMethod(
             Config::TOPIC_REQUEST_TYPE => Config::TOPIC_REQUEST_TYPE_METHOD,
             Config::TOPIC_RESPONSE => $returnType,
             Config::TOPIC_HANDLERS => $handlers
-                ? : [self::DEFAULT_HANDLER => $methodMetadata[Config::SCHEMA_METHOD_HANDLER]]
+                ?: [self::DEFAULT_HANDLER => $methodMetadata[Config::SCHEMA_METHOD_HANDLER]]
         ];
     }
 
     /**
      * Generate topic name based on service type and method name.
+     *
      * Perform the following conversion:
      * \Magento\Customer\Api\RepositoryInterface + getById =>
      * magento.customer.api.repositoryInterface.getById

From a21fed6f2e70e9f6191d94a7b37050c7221433a4 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Fri, 14 Sep 2018 16:17:32 +0300
Subject: [PATCH 022/932] MAGETWO-95034: Investigate ability of addresses grid
 displaying on frontent

---
 .../Magento/Customer/Block/Address/Book.php   | 12 +++++
 .../frontend/templates/address/book.phtml     | 54 ++++++++++++++-----
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 8b38946a063db..e1c53356c7e69 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -212,4 +212,16 @@ public function getDefaultShipping()
             return $customer->getDefaultShipping();
         }
     }
+
+    /**
+     * @param $street
+     * @return string
+     */
+    public function getStreetAddress($street)
+    {
+        if (is_array($street)) {
+            $street = implode(', ', $street);
+        }
+        return $street;
+    }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index 45c13d9357425..96b2f4dd0a1e1 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -67,19 +67,45 @@
     <div class="block-title"><strong><?= $block->escapeHtml(__('Additional Address Entries')) ?></strong></div>
     <div class="block-content">
         <?php if ($_pAddsses = $block->getAdditionalAddresses()): ?>
-            <ol class="items addresses">
-                <?php foreach ($_pAddsses as $_address): ?>
-                    <li class="item">
-                        <address>
-                            <?= $block->getAddressHtml($_address) ?><br />
-                        </address>
-                        <div class="item actions">
-                            <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $_address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit Address')) ?></span></a>
-                            <a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($_address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete Address')) ?></span></a>
-                        </div>
-                    </li>
-                <?php endforeach; ?>
-            </ol>
+
+            <div class="table-wrapper additional-addresses">
+                <table class="data table table-additional-addresses-items history" id="additional-addresses-table">
+                    <caption class="table-caption"><?= /* @escapeNotVerified */ __('Additional addresses') ?></caption>
+                    <thead>
+                    <tr>
+                        <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Address #') ?></th>
+                        <th scope="col" class="col firstname"><?= /* @escapeNotVerified */ __('First Name') ?></th>
+                        <th scope="col" class="col lastname"><?= /* @escapeNotVerified */ __('Last Name') ?></th>
+                        <th scope="col" class="col streetaddress"><?= /* @escapeNotVerified */ __('Street Address') ?></th>
+                        <th scope="col" class="col city"><?= /* @escapeNotVerified */ __('City') ?></th>
+                        <th scope="col" class="col country"><?= /* @escapeNotVerified */ __('Country') ?></th>
+                        <th scope="col" class="col state"><?= /* @escapeNotVerified */ __('State') ?></th>
+                        <th scope="col" class="col zip"><?= /* @escapeNotVerified */ __('Zip/Postal Code') ?></th>
+                        <th scope="col" class="col phone"><?= /* @escapeNotVerified */ __('Phone') ?></th>
+                        <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php foreach ($_pAddsses as $address): ?>
+                        <tr>
+                            <td data-th="<?= $block->escapeHtml(__('Address #')) ?>" class="col id"><?= /* @escapeNotVerified */ $address->getId() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('First Name')) ?>" class="col firstname"><?= /* @escapeNotVerified */ $address->getFirstname() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Last Name')) ?>" class="col lastname"><?= /* @escapeNotVerified */ $address->getLastname() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->getStreetAddress($address->getStreet()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= /* @escapeNotVerified */ $address->getCity() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= /* @escapeNotVerified */ $address->getCountryId() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion()->getRegion() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= /* @escapeNotVerified */ $address->getPostcode() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= /* @escapeNotVerified */ $address->getTelephone() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
+                                <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit Address')) ?></span></a>
+                                <a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete Address')) ?></span></a>
+                            </td>
+                        </tr>
+                    <?php endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
         <?php else: ?>
             <p class="empty"><?= $block->escapeHtml(__('You have no other address entries in your address book.')) ?></p>
         <?php endif ?>
@@ -98,7 +124,7 @@
     {
         ".page-main": {
             "address": {
-                "deleteAddress": "li.item a[role='delete-address']",
+                "deleteAddress": "td a[role='delete-address']",
                 "deleteUrlPrefix": "<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>id/",
                 "addAddress": "button[role='add-address']",
                 "addAddressLocation": "<?= $block->escapeJs($block->escapeUrl($block->getAddAddressUrl())) ?>"

From e61b23a8e506576974cf37f12929c7b2c8053614 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Mon, 17 Sep 2018 10:42:58 +0300
Subject: [PATCH 023/932] MAGETWO-91559: Static blocks with same ID appear in
 place of correct block

- Fix static test
---
 app/code/Magento/Cms/Model/ResourceModel/Block.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block.php b/app/code/Magento/Cms/Model/ResourceModel/Block.php
index ff7cc8d3e034d..30e817713755c 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block.php
@@ -95,9 +95,11 @@ protected function _beforeSave(AbstractModel $object)
     }
 
     /**
+     * Get block id.
+     *
      * @param AbstractModel $object
      * @param mixed $value
-     * @param null $field
+     * @param string $field
      * @return bool|int|string
      * @throws LocalizedException
      * @throws \Exception
@@ -187,7 +189,7 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
         $isDefaultStore = $this->_storeManager->isSingleStoreMode()
             || array_search(Store::DEFAULT_STORE_ID, $stores) !== false;
 
-        if(!$isDefaultStore) {
+        if (!$isDefaultStore) {
             $stores[] = Store::DEFAULT_STORE_ID;
         }
 
@@ -200,7 +202,7 @@ public function getIsUniqueBlockToStores(AbstractModel $object)
             )
             ->where('cb.identifier = ?  ', $object->getData('identifier'));
 
-        if(!$isDefaultStore) {
+        if (!$isDefaultStore) {
             $select->where('cbs.store_id IN (?)', $stores);
         }
 
@@ -241,6 +243,8 @@ public function lookupStoreIds($id)
     }
 
     /**
+     * Save an object.
+     *
      * @param AbstractModel $object
      * @return $this
      * @throws \Exception

From 4de1d94cfa538a910693ea55cdf54c4fa67d553c Mon Sep 17 00:00:00 2001
From: "Vasiliev.A" <a.vasiliev@sam-solutions.biz>
Date: Tue, 18 Sep 2018 01:34:34 +0300
Subject: [PATCH 024/932] fix implmentation of isSynchronuos attribute
 processing

---
 .../Config/RemoteServiceReader/Communication.php |  3 ++-
 .../Config/Reader/XmlReader/Converter.php        | 16 +++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php b/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php
index 39e7fa418a35c..2a6cac09c22f7 100644
--- a/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php
+++ b/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php
@@ -67,7 +67,8 @@ public function read($scope = null)
                         CommunicationConfig::HANDLER_TYPE   => $serviceClass,
                         CommunicationConfig::HANDLER_METHOD => $serviceMethod,
                     ],
-                ]
+                ],
+                false
             );
             $rewriteTopicParams = [
                 CommunicationConfig::TOPIC_IS_SYNCHRONOUS => false,
diff --git a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
index bc4deb7fe2461..b79ba49a24ddd 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
@@ -124,7 +124,7 @@ protected function extractTopics($config)
                 $requestSchema,
                 $responseSchema
             );
-            $isSynchronous = $this->extractTopicIsSynchronous($topicNode) ?? null;
+            $isSynchronous = $this->extractTopicIsSynchronous($topicNode);
             if ($serviceMethod) {
                 $output[$topicName] = $this->reflectionGenerator->generateTopicConfigForServiceMethod(
                     $topicName,
@@ -136,7 +136,7 @@ protected function extractTopics($config)
             } elseif ($requestSchema && $responseSchema) {
                 $output[$topicName] = [
                     Config::TOPIC_NAME => $topicName,
-                    Config::TOPIC_IS_SYNCHRONOUS => $isSynchronous ?? true,
+                    Config::TOPIC_IS_SYNCHRONOUS => $isSynchronous,
                     Config::TOPIC_REQUEST => $requestSchema,
                     Config::TOPIC_REQUEST_TYPE => Config::TOPIC_REQUEST_TYPE_CLASS,
                     Config::TOPIC_RESPONSE => ($isSynchronous) ? $responseSchema: null,
@@ -145,7 +145,7 @@ protected function extractTopics($config)
             } elseif ($requestSchema) {
                 $output[$topicName] = [
                     Config::TOPIC_NAME => $topicName,
-                    Config::TOPIC_IS_SYNCHRONOUS => $isSynchronous ?? false,
+                    Config::TOPIC_IS_SYNCHRONOUS => false,
                     Config::TOPIC_REQUEST => $requestSchema,
                     Config::TOPIC_REQUEST_TYPE => Config::TOPIC_REQUEST_TYPE_CLASS,
                     Config::TOPIC_RESPONSE => null,
@@ -265,17 +265,15 @@ protected function parseServiceMethod($serviceMethod, $topicName)
      * Extract is_synchronous topic value.
      *
      * @param \DOMNode $topicNode
-     * @return boolean|null
+     * @return bool
      */
-    protected function extractTopicIsSynchronous($topicNode)
+    private function extractTopicIsSynchronous($topicNode): bool
     {
         $attributeName = Config::TOPIC_IS_SYNCHRONOUS;
         $topicAttributes = $topicNode->attributes;
         if (!$topicAttributes->getNamedItem($attributeName)) {
-            return null;
+            return true;
         }
-        $value = $topicAttributes->getNamedItem($attributeName)->nodeValue;
-        $isSynchronous = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
-        return $isSynchronous;
+        return $this->booleanUtils->toBoolean($topicAttributes->getNamedItem($attributeName)->nodeValue);
     }
 }

From 921fa69da95fa159a9a57fcc374b3cd19ac270df Mon Sep 17 00:00:00 2001
From: Vital_Pantsialeyeu <vital_pantsialeyeu@epam.com>
Date: Wed, 19 Sep 2018 17:43:23 +0300
Subject: [PATCH 025/932] MAGETWO-66872: Customer Address Attribute not being
 marked as required when the "Values Required" setting is overriden on Website
 scope

- Updated retrieve attribute collection
---
 app/code/Magento/Eav/Model/Entity/Type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
index 462c42cbc9654..444d58bf546d4 100644
--- a/app/code/Magento/Eav/Model/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -163,7 +163,7 @@ public function getAttributeCollection($setId = null)
     /**
      * Init and retrieve attribute collection
      *
-     * @return mixed
+     * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection
      */
     protected function _getAttributeCollection()
     {

From 699108bf3e27ba4c1b7e1588d2afa1b0f3899f3a Mon Sep 17 00:00:00 2001
From: Ruslan Kostiv <rkostiv@magento.com>
Date: Thu, 20 Sep 2018 12:56:35 +0300
Subject: [PATCH 026/932] MAGETWO-95080: Add pagination to the customer
 addresses grid

---
 .../Magento/Customer/Block/Address/Book.php   | 117 +++++++++++++++++-
 .../frontend/templates/address/book.phtml     |   5 +-
 .../frontend/templates/order/history.phtml    |   2 +
 .../web/css/source/_module.less               |   5 +-
 4 files changed, 123 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index e1c53356c7e69..2076d389bb563 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -43,6 +43,11 @@ class Book extends \Magento\Framework\View\Element\Template
      */
     protected $addressMapper;
 
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory
+     */
+    private $addressesCollectionFactory;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param CustomerRepositoryInterface $customerRepository
@@ -51,6 +56,7 @@ class Book extends \Magento\Framework\View\Element\Template
      * @param \Magento\Customer\Model\Address\Config $addressConfig
      * @param Mapper $addressMapper
      * @param array $data
+     * @param \Magento\Customer\Model\ResourceModel\Address\Collection $addressesCollection
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -59,13 +65,26 @@ public function __construct(
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
         \Magento\Customer\Model\Address\Config $addressConfig,
         Mapper $addressMapper,
-        array $data = []
+        array $data = [],
+        \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressesCollectionFactory,
+        \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
+        \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor = null,
+        \Magento\Framework\Api\FilterBuilder $filterBuilder,
+        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
     ) {
         $this->customerRepository = $customerRepository;
         $this->currentCustomer = $currentCustomer;
         $this->addressRepository = $addressRepository;
         $this->_addressConfig = $addressConfig;
         $this->addressMapper = $addressMapper;
+        $this->addressesCollectionFactory = $addressesCollectionFactory;
+        $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
+        $this->collectionProcessor = $collectionProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            'Magento\Eav\Model\Api\SearchCriteria\CollectionProcessor'
+        );
+        $this->filterBuilder = $filterBuilder;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+
         parent::__construct($context, $data);
     }
 
@@ -75,7 +94,20 @@ public function __construct(
     protected function _prepareLayout()
     {
         $this->pageConfig->getTitle()->set(__('Address Book'));
-        return parent::_prepareLayout();
+        parent::_prepareLayout();
+        if ($this->getAddresses()) {
+            $pager = $this->getLayout()->createBlock(
+                \Magento\Theme\Block\Html\Pager::class,
+                'customer.addresses.pager'
+            )
+                ->setCollection(
+                $this->getAddresses()
+            )
+            ;
+            $this->setChild('pager', $pager);
+            $this->getAddresses()->load();
+        }
+        return $this;
     }
 
     /**
@@ -128,7 +160,10 @@ public function hasPrimaryAddress()
     public function getAdditionalAddresses()
     {
         try {
-            $addresses = $this->customerRepository->getById($this->currentCustomer->getCustomerId())->getAddresses();
+            //$addresses = $this->customerRepository->getById($this->currentCustomer->getCustomerId())->getAddresses();
+
+            $addresses = $this->getAddresses();
+            // continue work here!!!
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             return false;
         }
@@ -224,4 +259,80 @@ public function getStreetAddress($street)
         }
         return $street;
     }
+
+    /**
+     * @return string
+     */
+    public function getPagerHtml()
+    {
+        return $this->getChildHtml('pager');
+    }
+
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\Address\Collection
+     */
+    private $addressesCollection;
+
+
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory
+     */
+    private $addressCollectionFactory;
+
+    /**
+     * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
+     */
+    private $extensionAttributesJoinProcessor;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var \Magento\Framework\Api\FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    private function getAddresses()
+    {
+        $customerId = $this->currentCustomer->getCustomerId();
+
+        if (!($customerId)) {
+            return false;
+        }
+        if (!$this->addressesCollection) {
+
+            $filter = $this->filterBuilder->setField('parent_id')
+                ->setValue($customerId)
+                ->setConditionType('eq')
+                ->create();
+
+
+            $searchCriteria = $this->searchCriteriaBuilder->addFilters([$filter])->create();
+
+            //$listtt = $this->addressRepository->getList($searchCriteria);
+
+            /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
+            $collection = $this->addressesCollectionFactory->create();
+            $this->extensionAttributesJoinProcessor->process(
+                $collection,
+                \Magento\Customer\Api\Data\AddressInterface::class
+            );
+
+            $this->collectionProcessor->process($searchCriteria, $collection);
+            $collection->setOrder(
+                'created_at',
+                'desc'
+            );
+            $this->addressesCollection = $collection;
+        }
+
+        return $this->addressesCollection;
+    }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index 96b2f4dd0a1e1..95e381455a293 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -79,7 +79,6 @@
                         <th scope="col" class="col streetaddress"><?= /* @escapeNotVerified */ __('Street Address') ?></th>
                         <th scope="col" class="col city"><?= /* @escapeNotVerified */ __('City') ?></th>
                         <th scope="col" class="col country"><?= /* @escapeNotVerified */ __('Country') ?></th>
-                        <th scope="col" class="col state"><?= /* @escapeNotVerified */ __('State') ?></th>
                         <th scope="col" class="col zip"><?= /* @escapeNotVerified */ __('Zip/Postal Code') ?></th>
                         <th scope="col" class="col phone"><?= /* @escapeNotVerified */ __('Phone') ?></th>
                         <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
@@ -94,7 +93,6 @@
                             <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->getStreetAddress($address->getStreet()) ?></td>
                             <td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= /* @escapeNotVerified */ $address->getCity() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= /* @escapeNotVerified */ $address->getCountryId() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion()->getRegion() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= /* @escapeNotVerified */ $address->getPostcode() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= /* @escapeNotVerified */ $address->getTelephone() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
@@ -106,6 +104,9 @@
                     </tbody>
                 </table>
             </div>
+            <?php if ($block->getPagerHtml()): ?>
+                <div class="customer-addresses-toolbar toolbar bottom"><?= $block->getPagerHtml() ?></div>
+            <?php endif ?>
         <?php else: ?>
             <p class="empty"><?= $block->escapeHtml(__('You have no other address entries in your address book.')) ?></p>
         <?php endif ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
index 1c02a5c31ea6b..b9a032212352b 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
@@ -6,6 +6,8 @@
 
 // @codingStandardsIgnoreFile
 
+/** @var \Magento\Sales\Block\Order\History $block */
+
 ?>
 <?php $_orders = $block->getOrders(); ?>
 <?= $block->getChildHtml('info') ?>
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index d7ae6c3b28f4a..dfb9047595953 100755
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -334,13 +334,16 @@
         }
     }
 
-    .order-products-toolbar {
+    .order-products-toolbar, .customer-addresses-toolbar {
         position: relative;
 
         .toolbar-amount {
             position: relative;
             text-align: center;
         }
+        .pages {
+            position: relative;
+        }
     }
 }
 

From 1ef3f1403da9dd1a1312f157b4771e13aa1ede21 Mon Sep 17 00:00:00 2001
From: Jayanka <jayan@codilar.com>
Date: Fri, 21 Sep 2018 23:45:45 +0530
Subject: [PATCH 027/932] (Fixes issue #18027) Round the total amount to 4
 decimal places, to avoid floating point overflows

---
 app/code/Magento/Quote/Model/Quote/Address/Total.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 42224c970ed27..49bf7bb967b09 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -54,6 +54,9 @@ public function __construct(
      */
     public function setTotalAmount($code, $amount)
     {
+        /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
+        $amount = number_format($amount, 4);
+
         $this->totalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
             $code = $code . '_amount';

From 93a94c3dc58cf5fa5a3babbefd47bc8974434aa5 Mon Sep 17 00:00:00 2001
From: Jayanka <jayan@codilar.com>
Date: Sat, 22 Sep 2018 00:43:11 +0530
Subject: [PATCH 028/932] round the total amount only if it is float

---
 app/code/Magento/Quote/Model/Quote/Address/Total.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 49bf7bb967b09..e4ceeac3905f0 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -55,7 +55,7 @@ public function __construct(
     public function setTotalAmount($code, $amount)
     {
         /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
-        $amount = number_format($amount, 4);
+        $amount = is_float($amount) ? number_format($amount, 4) : $amount;
 
         $this->totalAmounts[$code] = $amount;
         if ($code != 'subtotal') {

From 55ba0ae9416798ee743251b522f4593acdbf5b76 Mon Sep 17 00:00:00 2001
From: Jayanka <jayan@codilar.com>
Date: Sun, 23 Sep 2018 14:58:43 +0530
Subject: [PATCH 029/932] round base total amount

---
 app/code/Magento/Quote/Model/Quote/Address/Total.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index e4ceeac3905f0..44a81b5011cf2 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -6,6 +6,7 @@
 namespace Magento\Quote\Model\Quote\Address;
 
 /**
+ * Class Total
  * @method string getCode()
  *
  * @api
@@ -75,6 +76,9 @@ public function setTotalAmount($code, $amount)
      */
     public function setBaseTotalAmount($code, $amount)
     {
+        /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
+        $amount = is_float($amount) ? number_format($amount, 4) : $amount;
+
         $this->baseTotalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
             $code = $code . '_amount';
@@ -170,6 +174,7 @@ public function getAllBaseTotalAmounts()
 
     /**
      * Set the full info, which is used to capture tax related information.
+     *
      * If a string is used, it is assumed to be serialized.
      *
      * @param array|string $info

From 1e81c95abbccce1c086189ab6f59d81f3d30ab9e Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Tue, 25 Sep 2018 16:10:48 +0400
Subject: [PATCH 030/932] MAGETWO-66872: Customer Address Attribute not being
 marked as required when the "Values Required" setting is overriden on Website
 scope

- Add automation test
---
 ...tCustomerAddressesFromAdminActionGroup.xml | 32 +++++++++++++++++++
 .../Test/Mftf/Page/AdminEditCustomerPage.xml  |  1 +
 .../AdminEditCustomerAddressesSection.xml     | 31 ++++++++++++++++++
 3 files changed, 64 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
new file mode 100644
index 0000000000000..402566c771928
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="EditCustomerAddressesFromAdminActionGroup" >
+        <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddresses}}" stepKey="addNewAddresses"/>
+        <fillField  stepKey="fillPrefixName" userInput="{{CustomerAddressSimple.prefix}}" selector="{{AdminEditCustomerAddressesSection.prefixName}}"/>
+        <fillField  stepKey="fillFirstName" userInput="{{CustomerAddressSimple.firstname}}" selector="{{AdminEditCustomerAddressesSection.firstName}}"/>
+        <fillField  stepKey="fillMiddleName" userInput="{{CustomerAddressSimple.middlename}}" selector="{{AdminEditCustomerAddressesSection.middleName}}"/>
+        <fillField  stepKey="fillLastName" userInput="{{CustomerAddressSimple.lastname}}" selector="{{AdminEditCustomerAddressesSection.lastName}}"/>
+        <fillField  stepKey="fillSuffixName" userInput="{{CustomerAddressSimple.suffix}}" selector="{{AdminEditCustomerAddressesSection.suffixName}}"/>
+        <fillField  stepKey="fillCompany" userInput="{{CustomerAddressSimple.company}}" selector="{{AdminEditCustomerAddressesSection.company}}"/>
+        <fillField  stepKey="fillStreetAddress" userInput="{{CustomerAddressSimple.street}}" selector="{{AdminEditCustomerAddressesSection.streetAddress}}"/>
+        <fillField  stepKey="fillCity" userInput="{{CustomerAddressSimple.city}}" selector="{{AdminEditCustomerAddressesSection.city}}"/>
+        <selectOption stepKey="selectCountry" selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{US_Address_CA.country_id}}"/>
+        <selectOption stepKey="selectState" selector="{{AdminEditCustomerAddressesSection.state}}" userInput="{{US_Address_CA.state}}"/>
+        <fillField  stepKey="fillZipCode" userInput="{{CustomerAddressSimple.postcode}}" selector="{{AdminEditCustomerAddressesSection.zipCode}}"/>
+        <fillField  stepKey="fillPhone" userInput="{{CustomerAddressSimple.telephone}}" selector="{{AdminEditCustomerAddressesSection.phone}}"/>
+        <fillField  stepKey="fillVAT" userInput="{{CustomerAddressSimple.vat_id}}" selector="{{AdminEditCustomerAddressesSection.vat}}"/>
+        <click selector="{{CustomerAccountSection.save}}" stepKey="saveAddress"/>
+        <waitForPageLoad stepKey="waitForStorefrontPage"/>
+        <click selector="{{CustomerAccountSection.save}}" stepKey="saveCustomer"/>
+        <waitForPageLoad stepKey="waitForCustomerSaved"/>
+        <see stepKey="seeSaveMessage" userInput="You saved the customer."/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
index 31dad24ba8372..327cfe659aff2 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminEditCustomerPage.xml
@@ -10,5 +10,6 @@
     <page name="AdminEditCustomerPage" url="/customer/index/edit/id/{{var1}}" area="admin" module="Magento_Customer" parameterized="true">
         <section name="AdminCustomerAccountInformationSection"/>
         <section name="AdminCustomerMainActionsSection"/>
+        <section name="AdminEditCustomerAddressesSection" />
     </page>
 </pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
new file mode 100644
index 0000000000000..0718800c871a7
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminEditCustomerAddressesSection">
+        <element name="addresses" type="button" selector="//span[text()='Addresses']" timeout="30"/>
+        <element name="addNewAddresses" type="button" selector="//span[text()='Add New Addresses']"/>
+        <element name="defaultBillingAddress" type="text" selector="input[name='address[new_0][default_billing]']"/>
+        <element name="defaultShippingAddress" type="text" selector="input[name='address[new_0][default_shipping]']"/>
+        <element name="prefixName" type="text" selector="input[name='address[new_0][prefix]']"/>
+        <element name="firstName" type="text" selector="input[name='address[new_0][firstname]']" />
+        <element name="middleName" type="text" selector="input[name='address[new_0][middlename]']" />
+        <element name="lastName" type="text" selector="input[name='address[new_0][lastname]']" />
+        <element name="suffixName" type="text" selector="input[name='address[new_0][suffix]']" />
+        <element name="company" type="text" selector="input[name='address[new_0][company]']" />
+        <element name="streetAddress" type="text" selector="input[name='address[new_0][street][0]']" />
+        <element name="city" type="text" selector="input[name='address[new_0][city]']" />
+        <element name="country" type="select" selector="select[name='address[new_0][country_id]']" />
+        <element name="state" type="select" selector="select[name='address[new_0][region_id]']" />
+        <element name="zipCode" type="text" selector="input[name='address[new_0][postcode]']" />
+        <element name="phone" type="text" selector="input[name='address[new_0][telephone]']" />
+        <element name="vat" type="text" selector="input[name='address[new_0][vat_id]']" />
+    </section>
+
+</sections>

From 09c9e6bed435aada9b2f38800087f60ef134d7c4 Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Mon, 24 Sep 2018 11:07:05 -0300
Subject: [PATCH 031/932] GraphQL-57: Manager Address Book

---
 .../Model/Resolver/Address.php                | 374 ++++++++++++++++++
 .../Resolver/Address/AddressDataProvider.php  |  82 ++++
 .../CustomerGraphQl/etc/schema.graphqls       | 290 ++++++++++++++
 3 files changed, 746 insertions(+)
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
new file mode 100644
index 0000000000000..4c64273cacdaf
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\AddressMetadataManagementInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
+use Magento\Customer\Api\Data\AddressExtensionInterfaceFactory;
+use Magento\Framework\Api\AttributeInterfaceFactory;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\CustomerGraphQl\Model\Resolver\Address\AddressDataProvider;
+use Magento\Eav\Model\Config;
+
+/**
+ * Customers Address Update
+ */
+class Address implements ResolverInterface
+{
+    /**
+     * Customer address attributes
+     * @var array
+     */
+    const ADDRESS_ATTRIBUTES = [
+        AddressInterface::REGION,
+        AddressInterface::REGION_ID,
+        AddressInterface::COUNTRY_ID,
+        AddressInterface::STREET,
+        AddressInterface::COMPANY,
+        AddressInterface::TELEPHONE,
+        AddressInterface::FAX,
+        AddressInterface::POSTCODE,
+        AddressInterface::CITY,
+        AddressInterface::FIRSTNAME,
+        AddressInterface::LASTNAME,
+        AddressInterface::MIDDLENAME,
+        AddressInterface::PREFIX,
+        AddressInterface::SUFFIX,
+        AddressInterface::VAT_ID
+    ];
+
+    /**
+     * Input data key
+     */
+    const CUSTOM_ATTRIBUTE_KEY = 'custom_attributes';
+    const EXTENSION_ATTRIBUTE_KEY = 'extension_attributes';
+
+    /**
+     * Mutation Address type
+     */
+    const MUTATION_ADDRESS_CREATE = 'customerAddressCreate';
+    const MUTATION_ADDRESS_UPDATE = 'customerAddressUpdate';
+    const MUTATION_ADDRESS_DELETE = 'customerAddressDelete';
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepositoryInterface;
+
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $addressInterfaceFactory;
+
+    /**
+     * @var RegionInterfaceFactory
+     */
+    private $regionInterfaceFactory;
+
+    /**
+     * @var AttributeInterfaceFactory
+     */
+    private $attributeInterfaceFactory;
+
+    /**
+     * @var AddressExtensionInterfaceFactory
+     */
+    private $addressExtensionInterfaceFactory;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var AddressDataProvider
+     */
+    private $addressDataProvider;
+
+    /**
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param AddressRepositoryInterface $addressRepositoryInterface
+     * @param AddressInterfaceFactory $addressInterfaceFactory
+     * @param RegionInterfaceFactory $regionInterfaceFactory
+     * @param AttributeInterfaceFactory $attributeInterfaceFactory
+     * @param AddressExtensionInterfaceFactory $addressExtensionInterfaceFactory
+     * @param Config $eavConfig
+     * @param AddressDataProvider $addressDataProvider
+     */
+    public function __construct(
+        CustomerRepositoryInterface $customerRepository,
+        AddressRepositoryInterface $addressRepositoryInterface,
+        AddressInterfaceFactory $addressInterfaceFactory,
+        RegionInterfaceFactory $regionInterfaceFactory,
+        AttributeInterfaceFactory $attributeInterfaceFactory,
+        AddressExtensionInterfaceFactory $addressExtensionInterfaceFactory,
+        Config $eavConfig,
+        AddressDataProvider $addressDataProvider
+    ) {
+        $this->customerRepository = $customerRepository;
+        $this->addressRepositoryInterface = $addressRepositoryInterface;
+        $this->addressInterfaceFactory = $addressInterfaceFactory;
+        $this->regionInterfaceFactory = $regionInterfaceFactory;
+        $this->attributeInterfaceFactory = $attributeInterfaceFactory;
+        $this->addressExtensionInterfaceFactory = $addressExtensionInterfaceFactory;
+        $this->eavConfig = $eavConfig;
+        $this->addressDataProvider = $addressDataProvider;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        /** @var ContextInterface $context */
+        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
+            throw new GraphQlAuthorizationException(
+                __(
+                    'Current customer does not have access to the resource "%1"',
+                    [\Magento\Customer\Model\Customer::ENTITY]
+                )
+            );
+        }
+        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+        $customer = $this->customerRepository->getById($context->getUserId());
+        switch ($field->getName()) {
+            case self::MUTATION_ADDRESS_CREATE:
+                return $this->addressDataProvider->processCustomerAddress(
+                    $this->processCustomerAddressCreate($customer, $args['input'])
+                );
+            case self::MUTATION_ADDRESS_UPDATE:
+                return $this->addressDataProvider->processCustomerAddress(
+                    $this->processCustomerAddressUpdate($customer, $args['id'], $args['input'])
+                );
+            case self::MUTATION_ADDRESS_DELETE:
+                return $this->processCustomerAddressDelete($customer, $args['id']);
+            default:
+                return [];
+        }
+    }
+
+    /**
+     * Get input address attribute errors
+     * @param $addressInput
+     * @return bool|string
+     */
+    private function getAddressInputError($addressInput)
+    {
+        foreach (self::ADDRESS_ATTRIBUTES as $attribute) {
+            if ($this->isAttributeRequired($attribute) && !isset($addressInput[$attribute])) {
+                return $attribute;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if attribute is set as required
+     * @param $attributeName
+     * @return bool
+     */
+    private function isAttributeRequired($attributeName)
+    {
+        return $this->eavConfig->getAttribute(
+            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS,
+            $attributeName
+        )->getIsRequired();
+    }
+
+    /**
+     * @param AddressInterface $address
+     * @param array $addressInput
+     * @return AddressInterface
+     */
+    private function fillAddress($address, $addressInput)
+    {
+        if (isset($addressInput[AddressInterface::REGION])) {
+            /** @var \Magento\Customer\Api\Data\RegionInterface $newRegion */
+            $newRegion = $this->regionInterfaceFactory->create($addressInput[AddressInterface::REGION]);
+            $address->setRegion($newRegion);
+        }
+        if (isset($addressInput[AddressInterface::REGION_ID])) {
+            $address->setRegionId($addressInput[AddressInterface::REGION_ID]);
+        }
+        if (isset($addressInput[AddressInterface::COUNTRY_ID])) {
+            $address->setCountryId($addressInput[AddressInterface::COUNTRY_ID]);
+        }
+        if (isset($addressInput[AddressInterface::STREET])) {
+            $address->setStreet($addressInput[AddressInterface::STREET]);
+        }
+        if (isset($addressInput[AddressInterface::COMPANY])) {
+            $address->setCompany($addressInput[AddressInterface::COMPANY]);
+        }
+        if (isset($addressInput[AddressInterface::TELEPHONE])) {
+            $address->setTelephone($addressInput[AddressInterface::TELEPHONE]);
+        }
+        if (isset($addressInput[AddressInterface::FAX])) {
+            $address->setFax($addressInput[AddressInterface::FAX]);
+        }
+        if (isset($addressInput[AddressInterface::POSTCODE])) {
+            $address->setPostcode($addressInput[AddressInterface::POSTCODE]);
+        }
+        if (isset($addressInput[AddressInterface::CITY])) {
+            $address->setCity($addressInput[AddressInterface::CITY]);
+        }
+        if (isset($addressInput[AddressInterface::FIRSTNAME])) {
+            $address->setFirstname($addressInput[AddressInterface::FIRSTNAME]);
+        }
+        if (isset($addressInput[AddressInterface::LASTNAME])) {
+            $address->setLastname($addressInput[AddressInterface::LASTNAME]);
+        }
+        if (isset($addressInput[AddressInterface::MIDDLENAME])) {
+            $address->setMiddlename($addressInput[AddressInterface::MIDDLENAME]);
+        }
+        if (isset($addressInput[AddressInterface::PREFIX])) {
+            $address->setPrefix($addressInput[AddressInterface::PREFIX]);
+        }
+        if (isset($addressInput[AddressInterface::SUFFIX])) {
+            $address->setSuffix($addressInput[AddressInterface::SUFFIX]);
+        }
+        if (isset($addressInput[AddressInterface::VAT_ID])) {
+            $address->setVatId($addressInput[AddressInterface::VAT_ID]);
+        }
+        if (isset($addressInput[AddressInterface::DEFAULT_BILLING])) {
+            $address->setIsDefaultBilling($addressInput[AddressInterface::DEFAULT_BILLING]);
+        }
+        if (isset($addressInput[AddressInterface::DEFAULT_SHIPPING])) {
+            $address->setIsDefaultShipping($addressInput[AddressInterface::DEFAULT_SHIPPING]);
+        }
+        if (isset($addressInput[AddressInterface::DEFAULT_SHIPPING])) {
+            $address->setIsDefaultShipping($addressInput[AddressInterface::DEFAULT_SHIPPING]);
+        }
+        if (isset($addressInput[self::CUSTOM_ATTRIBUTE_KEY])) {
+            foreach ($addressInput[self::CUSTOM_ATTRIBUTE_KEY] as $attribute) {
+                $address->setCustomAttribute($attribute['attribute_code'], $attribute['value']);
+            }
+        }
+        if (isset($addressInput[self::EXTENSION_ATTRIBUTE_KEY])) {
+            $extensionAttributes = $address->getExtensionAttributes();
+            if (!$extensionAttributes) {
+                /** @var \Magento\Customer\Api\Data\AddressExtensionInterface $newExtensionAttribute */
+                $extensionAttributes = $this->addressExtensionInterfaceFactory->create();
+            }
+            foreach ($addressInput[self::EXTENSION_ATTRIBUTE_KEY] as $attribute) {
+                $extensionAttributes->setData($attribute['attribute_code'], $attribute['value']);
+            }
+            $address->setExtensionAttributes($extensionAttributes);
+        }
+        return $address;
+    }
+
+    /**
+     * Process customer address create
+     * @param CustomerInterface $customer
+     * @param array $addressInput
+     * @return AddressInterface
+     * @throws GraphQlInputException
+     */
+    private function processCustomerAddressCreate($customer, $addressInput)
+    {
+        $errorInput = $this->getAddressInputError($addressInput);
+        if ($errorInput) {
+            throw new GraphQlInputException(__('Required parameter %1 is missing', [$errorInput]));
+        }
+        /** @var AddressInterface $newAddress */
+        $newAddress = $this->fillAddress(
+            $this->addressInterfaceFactory->create(),
+            $addressInput
+        );
+        $newAddress->setCustomerId($customer->getId());
+        return $this->addressRepositoryInterface->save($newAddress);
+    }
+
+    /**
+     * Process customer address update
+     * @param CustomerInterface $customer
+     * @param int $addressId
+     * @param array $addressInput
+     * @return AddressInterface
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function processCustomerAddressUpdate($customer, $addressId, $addressInput)
+    {
+        try {
+            /** @var AddressInterface $address */
+            $address = $this->addressRepositoryInterface->getById($addressId);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(
+                __('Address id %1 does not exist.', [$addressId])
+            );
+        }
+        if ($address->getCustomerId() != $customer->getId()) {
+            throw new GraphQlAuthorizationException(
+                __('Current customer does not have permission to update address id %1', [$addressId])
+            );
+        }
+        return $this->addressRepositoryInterface->save(
+            $this->fillAddress($address, $addressInput)
+        );
+    }
+
+    /**
+     * Process customer address delete
+     * @param CustomerInterface $customer
+     * @param int $addressId
+     * @return bool
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function processCustomerAddressDelete($customer, $addressId)
+    {
+        try {
+            /** @var AddressInterface $address */
+            $address = $this->addressRepositoryInterface->getById($addressId);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(
+                __('Address id %1 does not exist.', [$addressId])
+            );
+        }
+        if ($address->getCustomerId() != $customer->getId()) {
+            throw new GraphQlAuthorizationException(
+                __('Current customer does not have permission to delete address id %1', [$addressId])
+            );
+        }
+        if ($address->isDefaultBilling()) {
+            throw new GraphQlAuthorizationException(
+                __('Customer Address %1 is set as default billing address and can not be deleted', [$addressId])
+            );
+        }
+        if ($address->isDefaultShipping()) {
+            throw new GraphQlAuthorizationException(
+                __('Customer Address %1 is set as default shipping address and can not be deleted', [$addressId])
+            );
+        }
+        return $this->addressRepositoryInterface->delete($address);
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
new file mode 100644
index 0000000000000..042aeaf031de0
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver\Address;
+
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\Webapi\ServiceOutputProcessor;
+use Magento\Framework\Serialize\SerializerInterface;
+
+class AddressDataProvider
+{
+    /**
+     * @var ServiceOutputProcessor
+     */
+    private $serviceOutputProcessor;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $jsonSerializer;
+
+    /**
+     * @param ServiceOutputProcessor $serviceOutputProcessor
+     * @param SerializerInterface $jsonSerializer
+     */
+    public function __construct(
+        ServiceOutputProcessor $serviceOutputProcessor,
+        SerializerInterface $jsonSerializer
+    ) {
+        $this->serviceOutputProcessor = $serviceOutputProcessor;
+        $this->jsonSerializer = $jsonSerializer;
+    }
+
+    /**
+     * Transform single customer address data from object to in array format
+     *
+     * @param AddressInterface $addressObject
+     * @return array
+     */
+    public function processCustomerAddress(AddressInterface $addressObject) : array
+    {
+        $address = $this->serviceOutputProcessor->process(
+            $addressObject,
+            AddressRepositoryInterface::class,
+            'getById'
+        );
+        if (isset($address['extension_attributes'])) {
+            $address = array_merge($address, $address['extension_attributes']);
+        }
+        $customAttributes = [];
+        if (isset($address['custom_attributes'])) {
+            foreach ($address['custom_attributes'] as $attribute) {
+                $isArray = false;
+                if (is_array($attribute['value'])) {
+                    $isArray = true;
+                    foreach ($attribute['value'] as $attributeValue) {
+                        if (is_array($attributeValue)) {
+                            $customAttributes[$attribute['attribute_code']] = $this->jsonSerializer->serialize(
+                                $attribute['value']
+                            );
+                            continue;
+                        }
+                        $customAttributes[$attribute['attribute_code']] = implode(',', $attribute['value']);
+                        continue;
+                    }
+                }
+                if ($isArray) {
+                    continue;
+                }
+                $customAttributes[$attribute['attribute_code']] = $attribute['value'];
+            }
+        }
+        $address = array_merge($address, $customAttributes);
+
+        return $address;
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index 93c741adea87b..c53bfa645d807 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -8,6 +8,42 @@ type Query {
 type Mutation {
     generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\GenerateCustomerToken") @doc(description:"Retrieve Customer token")
     changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\ChangePassword") @doc(description:"Changes password for logged in customer")
+    customerAddressCreate(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Address") @doc(description: "Create customer address")
+    customerAddressUpdate(id: Int!, input: CustomerAddressInput): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Address") @doc(description: "Update customer address")
+    customerAddressDelete(id: Int!): Boolean @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Address") @doc(description: "Delete customer address")
+}
+
+input CustomerAddressInput {
+    region: CustomerAddressRegionInput @doc(description: "An object containing the region name, region code, and region ID")
+    region_id: Int @doc(description: "A number that uniquely identifies the state, province, or other area")
+    country_id: CountryCodeEnum @doc(description: "The customer's country")
+    street: [String] @doc(description: "An array of strings that define the street number and name")
+    company: String @doc(description: "The customer's company")
+    telephone: String @doc(description: "The telephone number")
+    fax: String @doc(description: "The fax number")
+    postcode: String @doc(description: "The customer's ZIP or postal code")
+    city: String @doc(description: "The city or town")
+    firstname: String @doc(description: "The first name of the person associated with the shipping/billing address")
+    lastname: String @doc(description: "The family name of the person associated with the shipping/billing address")
+    middlename: String @doc(description: "The middle name of the person associated with the shipping/billing address")
+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
+    vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
+    default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
+    default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
+    custom_attributes: [CustomerAddressAttributeInput] @doc(description: "Address custom attributes")
+    extension_attributes: [CustomerAddressAttributeInput] @doc(description: "Address extension attributes")
+}
+
+input CustomerAddressRegionInput @doc(description: "CustomerAddressRegionInput defines the customer's state or province") {
+    region_code: String @doc(description: "The address region code")
+    region: String @doc(description: "The state or province name")
+    region_id: Int @doc(description: "Uniquely identifies the region")
+}
+
+input CustomerAddressAttributeInput {
+    attribute_code: String! @doc(description: "Attribute code")
+    value: String! @doc(description: "Attribute value")
 }
 
 type CustomerToken {
@@ -52,6 +88,8 @@ type CustomerAddress @doc(description: "CustomerAddress contains detailed inform
     vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
     default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
     default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
+    custom_attributes: [CustomerAddressAttribute] @doc(description: "Address custom attributes")
+    extension_attributes: [CustomerAddressAttribute] @doc(description: "Address extension attributes")
 }
 
 type CustomerAddressRegion @doc(description: "CustomerAddressRegion defines the customer's state or province") {
@@ -60,3 +98,255 @@ type CustomerAddressRegion @doc(description: "CustomerAddressRegion defines the
     region_id: Int @doc(description: "Uniquely identifies the region")
 }
 
+type CustomerAddressAttribute {
+     attribute_code: String  @doc(description: "Attribute code")
+     value: String  @doc(description: "Attribute value")
+}
+
+enum CountryCodeEnum @doc(description: "The list of countries codes") {
+    AF @doc(description: "Afghanistan")
+    AX @doc(description: "Åland Islands")
+    AL @doc(description: "Albania")
+    DZ @doc(description: "Algeria")
+    AS @doc(description: "American Samoa")
+    AD @doc(description: "Andorra")
+    AO @doc(description: "Angola")
+    AI @doc(description: "Anguilla")
+    AQ @doc(description: "Antarctica")
+    AG @doc(description: "Antigua & Barbuda")
+    AR @doc(description: "Argentina")
+    AM @doc(description: "Armenia")
+    AW @doc(description: "Aruba")
+    AU @doc(description: "Australia")
+    AT @doc(description: "Austria")
+    AZ @doc(description: "Azerbaijan")
+    BS @doc(description: "Bahamas")
+    BH @doc(description: "Bahrain")
+    BD @doc(description: "Bangladesh")
+    BB @doc(description: "Barbados")
+    BY @doc(description: "Belarus")
+    BE @doc(description: "Belgium")
+    BZ @doc(description: "Belize")
+    BJ @doc(description: "Benin")
+    BM @doc(description: "Bermuda")
+    BT @doc(description: "Bhutan")
+    BO @doc(description: "Bolivia")
+    BA @doc(description: "Bosnia & Herzegovina")
+    BW @doc(description: "Botswana")
+    BV @doc(description: "Bouvet Island")
+    BR @doc(description: "Brazil")
+    IO @doc(description: "British Indian Ocean Territory")
+    VG @doc(description: "British Virgin Islands")
+    BN @doc(description: "Brunei")
+    BG @doc(description: "Bulgaria")
+    BF @doc(description: "Burkina Faso")
+    BI @doc(description: "Burundi")
+    KH @doc(description: "Cambodia")
+    CM @doc(description: "Cameroon")
+    CA @doc(description: "Canada")
+    CV @doc(description: "Cape Verde")
+    KY @doc(description: "Cayman Islands")
+    CF @doc(description: "Central African Republic")
+    TD @doc(description: "Chad")
+    CL @doc(description: "Chile")
+    CN @doc(description: "China")
+    CX @doc(description: "Christmas Island")
+    CC @doc(description: "Cocos (Keeling) Islands")
+    CO @doc(description: "Colombia")
+    KM @doc(description: "Comoros")
+    CG @doc(description: "Congo -Brazzaville")
+    CD @doc(description: "Congo - Kinshasa")
+    CK @doc(description: "Cook Islands")
+    CR @doc(description: "Costa Rica")
+    CI @doc(description: "Côte d’Ivoire")
+    HR @doc(description: "Croatia")
+    CU @doc(description: "Cuba")
+    CY @doc(description: "Cyprus")
+    CZ @doc(description: "Czech Republic")
+    DK @doc(description: "Denmark")
+    DJ @doc(description: "Djibouti")
+    DM @doc(description: "Dominica")
+    DO @doc(description: "Dominican Republic")
+    EC @doc(description: "Ecuador")
+    EG @doc(description: "Egypt")
+    SV @doc(description: "El Salvador")
+    GQ @doc(description: "Equatorial Guinea")
+    ER @doc(description: "Eritrea")
+    EE @doc(description: "Estonia")
+    ET @doc(description: "Ethiopia")
+    FK @doc(description: "Falkland Islands")
+    FO @doc(description: "Faroe Islands")
+    FJ @doc(description: "Fiji")
+    FI @doc(description: "Finland")
+    FR @doc(description: "France")
+    GF @doc(description: "French Guiana")
+    PF @doc(description: "French Polynesia")
+    TF @doc(description: "French Southern Territories")
+    GA @doc(description: "Gabon")
+    GM @doc(description: "Gambia")
+    GE @doc(description: "Georgia")
+    DE @doc(description: "Germany")
+    GH @doc(description: "Ghana")
+    GI @doc(description: "Gibraltar")
+    GR @doc(description: "Greece")
+    GL @doc(description: "Greenland")
+    GD @doc(description: "Grenada")
+    GP @doc(description: "Guadeloupe")
+    GU @doc(description: "Guam")
+    GT @doc(description: "Guatemala")
+    GG @doc(description: "Guernsey")
+    GN @doc(description: "Guinea")
+    GW @doc(description: "Guinea-Bissau")
+    GY @doc(description: "Guyana")
+    HT @doc(description: "Haiti")
+    HM @doc(description: "Heard &amp; McDonald Islands")
+    HN @doc(description: "Honduras")
+    HK @doc(description: "Hong Kong SAR China")
+    HU @doc(description: "Hungary")
+    IS @doc(description: "Iceland")
+    IN @doc(description: "India")
+    ID @doc(description: "Indonesia")
+    IR @doc(description: "Iran")
+    IQ @doc(description: "Iraq")
+    IE @doc(description: "Ireland")
+    IM @doc(description: "Isle of Man")
+    IL @doc(description: "Israel")
+    IT @doc(description: "Italy")
+    JM @doc(description: "Jamaica")
+    JP @doc(description: "Japan")
+    JE @doc(description: "Jersey")
+    JO @doc(description: "Jordan")
+    KZ @doc(description: "Kazakhstan")
+    KE @doc(description: "Kenya")
+    KI @doc(description: "Kiribati")
+    KW @doc(description: "Kuwait")
+    KG @doc(description: "Kyrgyzstan")
+    LA @doc(description: "Laos")
+    LV @doc(description: "Latvia")
+    LB @doc(description: "Lebanon")
+    LS @doc(description: "Lesotho")
+    LR @doc(description: "Liberia")
+    LY @doc(description: "Libya")
+    LI @doc(description: "Liechtenstein")
+    LT @doc(description: "Lithuania")
+    LU @doc(description: "Luxembourg")
+    MO @doc(description: "Macau SAR China")
+    MK @doc(description: "Macedonia")
+    MG @doc(description: "Madagascar")
+    MW @doc(description: "Malawi")
+    MY @doc(description: "Malaysia")
+    MV @doc(description: "Maldives")
+    ML @doc(description: "Mali")
+    MT @doc(description: "Malta")
+    MH @doc(description: "Marshall Islands")
+    MQ @doc(description: "Martinique")
+    MR @doc(description: "Mauritania")
+    MU @doc(description: "Mauritius")
+    YT @doc(description: "Mayotte")
+    MX @doc(description: "Mexico")
+    FM @doc(description: "Micronesia")
+    MD @doc(description: "Moldova")
+    MC @doc(description: "Monaco")
+    MN @doc(description: "Mongolia")
+    ME @doc(description: "Montenegro")
+    MS @doc(description: "Montserrat")
+    MA @doc(description: "Morocco")
+    MZ @doc(description: "Mozambique")
+    MM @doc(description: "Myanmar (Burma)")
+    NA @doc(description: "Namibia")
+    NR @doc(description: "Nauru")
+    NP @doc(description: "Nepal")
+    NL @doc(description: "Netherlands")
+    AN @doc(description: "Netherlands Antilles")
+    NC @doc(description: "New Caledonia")
+    NZ @doc(description: "New Zealand")
+    NI @doc(description: "Nicaragua")
+    NE @doc(description: "Niger")
+    NG @doc(description: "Nigeria")
+    NU @doc(description: "Niue")
+    NF @doc(description: "Norfolk Island")
+    MP @doc(description: "Northern Mariana Islands")
+    KP @doc(description: "North Korea")
+    NO @doc(description: "Norway")
+    OM @doc(description: "Oman")
+    PK @doc(description: "Pakistan")
+    PW @doc(description: "Palau")
+    PS @doc(description: "Palestinian Territories")
+    PA @doc(description: "Panama")
+    PG @doc(description: "Papua New Guinea")
+    PY @doc(description: "Paraguay")
+    PE @doc(description: "Peru")
+    PH @doc(description: "Philippines")
+    PN @doc(description: "Pitcairn Islands")
+    PL @doc(description: "Poland")
+    PT @doc(description: "Portugal")
+    QA @doc(description: "Qatar")
+    RE @doc(description: "Réunion")
+    RO @doc(description: "Romania")
+    RU @doc(description: "Russia")
+    RW @doc(description: "Rwanda")
+    WS @doc(description: "Samoa")
+    SM @doc(description: "San Marino")
+    ST @doc(description: "São Tomé & Príncipe")
+    SA @doc(description: "Saudi Arabia")
+    SN @doc(description: "Senegal")
+    RS @doc(description: "Serbia")
+    SC @doc(description: "Seychelles")
+    SL @doc(description: "Sierra Leone")
+    SG @doc(description: "Singapore")
+    SK @doc(description: "Slovakia")
+    SI @doc(description: "Slovenia")
+    SB @doc(description: "Solomon Islands")
+    SO @doc(description: "Somalia")
+    ZA @doc(description: "South Africa")
+    GS @doc(description: "South Georgia & South Sandwich Islands")
+    KR @doc(description: "South Korea")
+    ES @doc(description: "Spain")
+    LK @doc(description: "Sri Lanka")
+    BL @doc(description: "St. Barthélemy")
+    SH @doc(description: "St. Helena")
+    KN @doc(description: "St. Kitts & Nevis")
+    LC @doc(description: "St. Lucia")
+    MF @doc(description: "St. Martin")
+    PM @doc(description: "St. Pierre & Miquelon")
+    VC @doc(description: "St. Vincent & Grenadines")
+    SD @doc(description: "Sudan")
+    SR @doc(description: "Suriname")
+    SJ @doc(description: "Svalbard & Jan Mayen")
+    SZ @doc(description: "Swaziland")
+    SE @doc(description: "Sweden")
+    CH @doc(description: "Switzerland")
+    SY @doc(description: "Syria")
+    TW @doc(description: "Taiwan")
+    TJ @doc(description: "Tajikistan")
+    TZ @doc(description: "Tanzania")
+    TH @doc(description: "Thailand")
+    TL @doc(description: "Timor-Leste")
+    TG @doc(description: "Togo")
+    TK @doc(description: "Tokelau")
+    TO @doc(description: "Tonga")
+    TT @doc(description: "Trinidad & Tobago")
+    TN @doc(description: "Tunisia")
+    TR @doc(description: "Turkey")
+    TM @doc(description: "Turkmenistan")
+    TC @doc(description: "Turks & Caicos Islands")
+    TV @doc(description: "Tuvalu")
+    UG @doc(description: "Uganda")
+    UA @doc(description: "Ukraine")
+    AE @doc(description: "United Arab Emirates")
+    GB @doc(description: "United Kingdom")
+    US @doc(description: "United States")
+    UY @doc(description: "Uruguay")
+    UM @doc(description: "U.S. Outlying Islands")
+    VI @doc(description: "U.S. Virgin Islands")
+    UZ @doc(description: "Uzbekistan")
+    VU @doc(description: "Vanuatu")
+    VA @doc(description: "Vatican City")
+    VE @doc(description: "Venezuela")
+    VN @doc(description: "Vietnam")
+    WF @doc(description: "Wallis & Futuna")
+    EH @doc(description: "Western Sahara")
+    YE @doc(description: "Yemen")
+    ZM @doc(description: "Zambia")
+    ZW @doc(description: "Zimbabwe")
+}
\ No newline at end of file

From fbefe295047a64ed94c60e7bc2adfb2730916c1b Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Wed, 26 Sep 2018 11:11:46 -0300
Subject: [PATCH 032/932] GraphQL-57: Add functional test

---
 .../Model/Resolver/Address.php                |   7 +-
 .../GraphQl/Customer/CustomerAddressTest.php  | 521 ++++++++++++++++++
 2 files changed, 523 insertions(+), 5 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
index 4c64273cacdaf..c28d0f3c24d23 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
@@ -258,13 +258,10 @@ private function fillAddress($address, $addressInput)
             $address->setVatId($addressInput[AddressInterface::VAT_ID]);
         }
         if (isset($addressInput[AddressInterface::DEFAULT_BILLING])) {
-            $address->setIsDefaultBilling($addressInput[AddressInterface::DEFAULT_BILLING]);
+            $address->setIsDefaultBilling((bool)$addressInput[AddressInterface::DEFAULT_BILLING]);
         }
         if (isset($addressInput[AddressInterface::DEFAULT_SHIPPING])) {
-            $address->setIsDefaultShipping($addressInput[AddressInterface::DEFAULT_SHIPPING]);
-        }
-        if (isset($addressInput[AddressInterface::DEFAULT_SHIPPING])) {
-            $address->setIsDefaultShipping($addressInput[AddressInterface::DEFAULT_SHIPPING]);
+            $address->setIsDefaultShipping((bool)$addressInput[AddressInterface::DEFAULT_SHIPPING]);
         }
         if (isset($addressInput[self::CUSTOM_ATTRIBUTE_KEY])) {
             foreach ($addressInput[self::CUSTOM_ATTRIBUTE_KEY] as $attribute) {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php
new file mode 100644
index 0000000000000..7141c2d15d4b2
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php
@@ -0,0 +1,521 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use PHPUnit\Framework\TestResult;
+
+class CustomerAddressTest extends GraphQlAbstract
+{
+
+    /**
+     * Verify customers with valid credentials create new address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testAddCustomerAddressWithValidCredentials()
+    {
+        $newAddress = [
+            'region' => [
+                'region' => 'Alaska',
+                'region_id' => 4,
+                'region_code' => 'AK'
+            ],
+            'region_id' => 4,
+            'country_id' => 'US',
+            'street' => ['Line 1 Street', 'Line 2'],
+            'company' => 'Company name',
+            'telephone' => '123456789',
+            'fax' => '123123123',
+            'postcode' => '7777',
+            'city' => 'City Name',
+            'firstname' => 'Adam',
+            'lastname' => 'Phillis',
+            'middlename' => 'A',
+            'prefix' => 'Mr.',
+            'suffix' => 'Jr.',
+            'vat_id' => '1',
+            'default_shipping' => false,
+            'default_billing' => false
+        ];
+        $defaultShippingText = $newAddress['default_shipping'] ? "true": "false";
+        $defaultBillingText = $newAddress['default_billing'] ? "true": "false";
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressCreate(input: {
+    region: {
+        region: "{$newAddress['region']['region']}"
+        region_id: {$newAddress['region']['region_id']}
+        region_code: "{$newAddress['region']['region_code']}"
+    }
+    region_id: {$newAddress['region_id']}
+    country_id: {$newAddress['country_id']}
+    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
+    company: "{$newAddress['company']}"
+    telephone: "{$newAddress['telephone']}"
+    fax: "{$newAddress['fax']}"
+    postcode: "{$newAddress['postcode']}"
+    city: "{$newAddress['city']}"
+    firstname: "{$newAddress['firstname']}"
+    lastname: "{$newAddress['lastname']}"
+    middlename: "{$newAddress['middlename']}"
+    prefix: "{$newAddress['prefix']}"
+    suffix: "{$newAddress['suffix']}"
+    vat_id: "{$newAddress['vat_id']}"
+    default_shipping: {$defaultShippingText}
+    default_billing: {$defaultBillingText}
+  }) {
+    id
+    customer_id
+    region {
+      region
+      region_id
+      region_code
+    }
+    region_id
+    country_id
+    street
+    company
+    telephone
+    fax
+    postcode
+    city
+    firstname
+    lastname
+    middlename
+    prefix
+    suffix
+    vat_id
+    default_shipping
+    default_billing
+  }
+}
+MUTATION;
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->assertArrayHasKey('customerAddressCreate', $response);
+        $this->assertArrayHasKey('customer_id', $response['customerAddressCreate']);
+        $this->assertEquals($customer->getId(), $response['customerAddressCreate']['customer_id']);
+        $this->assertArrayHasKey('id', $response['customerAddressCreate']);
+        /** @var AddressRepositoryInterface $addressRepository */
+        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
+        $addressId = $response['customerAddressCreate']['id'];
+        $address = $addressRepository->getById($addressId);
+        $this->assertEquals($address->getId(), $response['customerAddressCreate']['id']);
+        $this->assertCustomerAddressesFields($address, $response['customerAddressCreate']);
+        $this->assertCustomerAddressesFields($address, $newAddress);
+    }
+
+    /**
+     * Verify customers without credentials create new address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testAddCustomerAddressWithoutCredentials()
+    {
+        $mutation
+            = <<<MUTATION
+mutation{
+  customerAddressCreate(input: {
+  	prefix: "Mr."
+    firstname: "John"
+    middlename: "A"
+    lastname: "Smith"
+    telephone: "123456789"
+    street: ["Line 1", "Line 2"]
+    city: "Test City"
+    region_id: 1
+    country_id: US
+    postcode: "9999"
+    default_shipping: true
+    default_billing: false
+  }) {
+    id
+    customer_id
+    firstname
+    lastname
+  }
+}
+MUTATION;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Current customer does not have access to the resource "customer"');
+        $this->graphQlQuery($mutation);
+    }
+
+    /**
+     * Verify customers with valid credentials update address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testUpdateCustomerAddressWithValidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $updateAddress = [
+            'region' => [
+                'region' => 'Alaska',
+                'region_id' => 4,
+                'region_code' => 'AK'
+            ],
+            'region_id' => 4,
+            'country_id' => 'US',
+            'street' => ['Line 1 Street', 'Line 2'],
+            'company' => 'Company Name',
+            'telephone' => '123456789',
+            'fax' => '123123123',
+            'postcode' => '7777',
+            'city' => 'City Name',
+            'firstname' => 'Adam',
+            'lastname' => 'Phillis',
+            'middlename' => 'A',
+            'prefix' => 'Mr.',
+            'suffix' => 'Jr.',
+            'vat_id' => '1',
+            'default_shipping' => true,
+            'default_billing' => true
+        ];
+        $defaultShippingText = $updateAddress['default_shipping'] ? "true": "false";
+        $defaultBillingText = $updateAddress['default_billing'] ? "true": "false";
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = current($addresses);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressUpdate(id: {$addressId}, input: {
+    region: {
+        region: "{$updateAddress['region']['region']}"
+        region_id: {$updateAddress['region']['region_id']}
+        region_code: "{$updateAddress['region']['region_code']}"
+    }
+    region_id: {$updateAddress['region_id']}
+    country_id: {$updateAddress['country_id']}
+    street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
+    company: "{$updateAddress['company']}"
+    telephone: "{$updateAddress['telephone']}"
+    fax: "{$updateAddress['fax']}"
+    postcode: "{$updateAddress['postcode']}"
+    city: "{$updateAddress['city']}"
+    firstname: "{$updateAddress['firstname']}"
+    lastname: "{$updateAddress['lastname']}"
+    middlename: "{$updateAddress['middlename']}"
+    prefix: "{$updateAddress['prefix']}"
+    suffix: "{$updateAddress['suffix']}"
+    vat_id: "{$updateAddress['vat_id']}"
+    default_shipping: {$defaultShippingText}
+    default_billing: {$defaultBillingText}
+  }) {
+    id
+    customer_id
+    region {
+      region
+      region_id
+      region_code
+    }
+    region_id
+    country_id
+    street
+    company
+    telephone
+    fax
+    postcode
+    city
+    firstname
+    lastname
+    middlename
+    prefix
+    suffix
+    vat_id
+    default_shipping
+    default_billing
+  }
+}
+MUTATION;
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->assertArrayHasKey('customerAddressUpdate', $response);
+        $this->assertArrayHasKey('customer_id', $response['customerAddressUpdate']);
+        $this->assertEquals($customer->getId(), $response['customerAddressUpdate']['customer_id']);
+        $this->assertArrayHasKey('id', $response['customerAddressUpdate']);
+        /** @var AddressRepositoryInterface $addressRepository */
+        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
+        $address = $addressRepository->getById($addressId);
+        $this->assertEquals($address->getId(), $response['customerAddressUpdate']['id']);
+        $this->assertCustomerAddressesFields($address, $response['customerAddressUpdate']);
+        $this->assertCustomerAddressesFields($address, $updateAddress);
+    }
+
+    /**
+     * Verify customers without credentials update address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testUpdateCustomerAddressWithoutCredentials()
+    {
+        $userName = 'customer@example.com';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = current($addresses);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressUpdate(id:{$addressId}, input: {
+  	city: "New City"
+    postcode: "5555"
+  }) {
+    id
+    customer_id
+    postcode
+  }
+}
+MUTATION;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Current customer does not have access to the resource "customer"');
+        $this->graphQlQuery($mutation);
+    }
+
+    /**
+     * Verify customers with valid credentials with a customer bearer token
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteCustomerAddressWithValidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = end($addresses);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: {$addressId})
+}
+MUTATION;
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->assertArrayHasKey('customerAddressDelete', $response);
+        $this->assertEquals(true, $response['customerAddressDelete']);
+    }
+
+    /**
+     * Verify customers without credentials delete address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteCustomerAddressWithoutCredentials()
+    {
+        $userName = 'customer@example.com';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = current($addresses);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: {$addressId})
+}
+MUTATION;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Current customer does not have access to the resource "customer"');
+        $this->graphQlQuery($mutation);
+    }
+
+    /**
+     * Verify customers with valid credentials delete default shipping address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteDefaultShippingCustomerAddressWithValidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = end($addresses);
+        $address->setIsDefaultShipping(true);
+        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
+        $addressRepository->save($address);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: {$addressId})
+}
+MUTATION;
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Customer Address ' . $addressId . ' is set as default shipping address and can not be deleted');
+        $this->graphQlQuery($mutation, [], '', $headerMap);
+    }
+
+    /**
+     * Verify customers with valid credentials delete default billing address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteDefaultBillingCustomerAddressWithValidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = end($addresses);
+        $address->setIsDefaultBilling(true);
+        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
+        $addressRepository->save($address);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: {$addressId})
+}
+MUTATION;
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Customer Address ' . $addressId . ' is set as default billing address and can not be deleted');
+        $this->graphQlQuery($mutation, [], '', $headerMap);
+    }
+
+    /**
+     * Verify customers with valid credentials delete non exist address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteNonExistCustomerAddressWithValidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: 9999)
+}
+MUTATION;
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Address id 9999 does not exist.');
+        $this->graphQlQuery($mutation, [], '', $headerMap);
+    }
+
+    /**
+     * Verify the fields for Customer address
+     *
+     * @param \Magento\Customer\Api\Data\AddressInterface $address
+     * @param array $actualResponse
+     */
+    private function assertCustomerAddressesFields($address, $actualResponse)
+    {
+        /** @var  $addresses */
+        $assertionMap = [
+            ['response_field' => 'region_id', 'expected_value' => $address->getRegionId()],
+            ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
+            ['response_field' => 'street', 'expected_value' => $address->getStreet()],
+            ['response_field' => 'company', 'expected_value' => $address->getCompany()],
+            ['response_field' => 'telephone', 'expected_value' => $address->getTelephone()],
+            ['response_field' => 'fax', 'expected_value' => $address->getFax()],
+            ['response_field' => 'postcode', 'expected_value' => $address->getPostcode()],
+            ['response_field' => 'city', 'expected_value' => $address->getCity()],
+            ['response_field' => 'firstname', 'expected_value' => $address->getFirstname()],
+            ['response_field' => 'lastname', 'expected_value' => $address->getLastname()],
+            ['response_field' => 'middlename', 'expected_value' => $address->getMiddlename()],
+            ['response_field' => 'prefix', 'expected_value' => $address->getPrefix()],
+            ['response_field' => 'suffix', 'expected_value' => $address->getSuffix()],
+            ['response_field' => 'vat_id', 'expected_value' => $address->getVatId()],
+            ['response_field' => 'default_shipping', 'expected_value' => (bool)$address->isDefaultShipping()],
+            ['response_field' => 'default_billing', 'expected_value' => (bool)$address->isDefaultBilling()],
+        ];
+        $this->assertResponseFields($actualResponse, $assertionMap);
+        $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
+        $assertionRegionMap = [
+            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
+            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
+            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
+        ];
+        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
+    }
+}

From 7aaba83bf3239076f595407fe07bf41645f7962b Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Wed, 26 Sep 2018 16:17:11 -0300
Subject: [PATCH 033/932] Refactor fillAddress and add missing doc

---
 .../Model/Resolver/Address.php                | 150 ++++--------------
 .../Resolver/Address/AddressDataProvider.php  |   5 +-
 .../GraphQl/Customer/CustomerAddressTest.php  |   2 +-
 3 files changed, 39 insertions(+), 118 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
index c28d0f3c24d23..32afe0d65171e 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
@@ -3,24 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\AddressInterface;
-use Magento\Customer\Api\Data\RegionInterfaceFactory;
-use Magento\Customer\Api\Data\AddressExtensionInterfaceFactory;
-use Magento\Framework\Api\AttributeInterfaceFactory;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
@@ -29,7 +26,7 @@
 use Magento\Eav\Model\Config;
 
 /**
- * Customers Address Update
+ * Customers Address, used for GraphQL request processing.
  */
 class Address implements ResolverInterface
 {
@@ -68,10 +65,11 @@ class Address implements ResolverInterface
     const MUTATION_ADDRESS_UPDATE = 'customerAddressUpdate';
     const MUTATION_ADDRESS_DELETE = 'customerAddressDelete';
 
+
     /**
      * @var CustomerRepositoryInterface
      */
-    private $customerRepository;
+    private $customerRepositoryInterface;
 
     /**
      * @var AddressRepositoryInterface
@@ -83,21 +81,6 @@ class Address implements ResolverInterface
      */
     private $addressInterfaceFactory;
 
-    /**
-     * @var RegionInterfaceFactory
-     */
-    private $regionInterfaceFactory;
-
-    /**
-     * @var AttributeInterfaceFactory
-     */
-    private $attributeInterfaceFactory;
-
-    /**
-     * @var AddressExtensionInterfaceFactory
-     */
-    private $addressExtensionInterfaceFactory;
-
     /**
      * @var Config
      */
@@ -109,37 +92,35 @@ class Address implements ResolverInterface
     private $addressDataProvider;
 
     /**
-     * @param CustomerRepositoryInterface $customerRepository
+     * @var \Magento\Framework\Api\DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
      * @param AddressRepositoryInterface $addressRepositoryInterface
      * @param AddressInterfaceFactory $addressInterfaceFactory
-     * @param RegionInterfaceFactory $regionInterfaceFactory
-     * @param AttributeInterfaceFactory $attributeInterfaceFactory
-     * @param AddressExtensionInterfaceFactory $addressExtensionInterfaceFactory
      * @param Config $eavConfig
      * @param AddressDataProvider $addressDataProvider
+     * @param DataObjectHelper $dataObjectHelper
      */
     public function __construct(
-        CustomerRepositoryInterface $customerRepository,
+        CustomerRepositoryInterface $customerRepositoryInterface,
         AddressRepositoryInterface $addressRepositoryInterface,
         AddressInterfaceFactory $addressInterfaceFactory,
-        RegionInterfaceFactory $regionInterfaceFactory,
-        AttributeInterfaceFactory $attributeInterfaceFactory,
-        AddressExtensionInterfaceFactory $addressExtensionInterfaceFactory,
         Config $eavConfig,
-        AddressDataProvider $addressDataProvider
+        AddressDataProvider $addressDataProvider,
+        DataObjectHelper $dataObjectHelper
     ) {
-        $this->customerRepository = $customerRepository;
+        $this->customerRepositoryInterface = $customerRepositoryInterface;
         $this->addressRepositoryInterface = $addressRepositoryInterface;
         $this->addressInterfaceFactory = $addressInterfaceFactory;
-        $this->regionInterfaceFactory = $regionInterfaceFactory;
-        $this->attributeInterfaceFactory = $attributeInterfaceFactory;
-        $this->addressExtensionInterfaceFactory = $addressExtensionInterfaceFactory;
         $this->eavConfig = $eavConfig;
         $this->addressDataProvider = $addressDataProvider;
+        $this->dataObjectHelper = $dataObjectHelper;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resolve(
         Field $field,
@@ -148,7 +129,7 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        /** @var ContextInterface $context */
+        /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
         if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
             throw new GraphQlAuthorizationException(
                 __(
@@ -158,7 +139,7 @@ public function resolve(
             );
         }
         /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
-        $customer = $this->customerRepository->getById($context->getUserId());
+        $customer = $this->customerRepositoryInterface->getById($context->getUserId());
         switch ($field->getName()) {
             case self::MUTATION_ADDRESS_CREATE:
                 return $this->addressDataProvider->processCustomerAddress(
@@ -177,10 +158,10 @@ public function resolve(
 
     /**
      * Get input address attribute errors
-     * @param $addressInput
+     * @param array $addressInput
      * @return bool|string
      */
-    private function getAddressInputError($addressInput)
+    private function getAddressInputError(array $addressInput)
     {
         foreach (self::ADDRESS_ATTRIBUTES as $attribute) {
             if ($this->isAttributeRequired($attribute) && !isset($addressInput[$attribute])) {
@@ -192,7 +173,7 @@ private function getAddressInputError($addressInput)
 
     /**
      * Check if attribute is set as required
-     * @param $attributeName
+     * @param string $attributeName
      * @return bool
      */
     private function isAttributeRequired($attributeName)
@@ -204,81 +185,18 @@ private function isAttributeRequired($attributeName)
     }
 
     /**
+     * Add $addressInput array information to a $address object
      * @param AddressInterface $address
      * @param array $addressInput
      * @return AddressInterface
      */
-    private function fillAddress($address, $addressInput)
+    private function fillAddress(AddressInterface $address, array $addressInput) : AddressInterface
     {
-        if (isset($addressInput[AddressInterface::REGION])) {
-            /** @var \Magento\Customer\Api\Data\RegionInterface $newRegion */
-            $newRegion = $this->regionInterfaceFactory->create($addressInput[AddressInterface::REGION]);
-            $address->setRegion($newRegion);
-        }
-        if (isset($addressInput[AddressInterface::REGION_ID])) {
-            $address->setRegionId($addressInput[AddressInterface::REGION_ID]);
-        }
-        if (isset($addressInput[AddressInterface::COUNTRY_ID])) {
-            $address->setCountryId($addressInput[AddressInterface::COUNTRY_ID]);
-        }
-        if (isset($addressInput[AddressInterface::STREET])) {
-            $address->setStreet($addressInput[AddressInterface::STREET]);
-        }
-        if (isset($addressInput[AddressInterface::COMPANY])) {
-            $address->setCompany($addressInput[AddressInterface::COMPANY]);
-        }
-        if (isset($addressInput[AddressInterface::TELEPHONE])) {
-            $address->setTelephone($addressInput[AddressInterface::TELEPHONE]);
-        }
-        if (isset($addressInput[AddressInterface::FAX])) {
-            $address->setFax($addressInput[AddressInterface::FAX]);
-        }
-        if (isset($addressInput[AddressInterface::POSTCODE])) {
-            $address->setPostcode($addressInput[AddressInterface::POSTCODE]);
-        }
-        if (isset($addressInput[AddressInterface::CITY])) {
-            $address->setCity($addressInput[AddressInterface::CITY]);
-        }
-        if (isset($addressInput[AddressInterface::FIRSTNAME])) {
-            $address->setFirstname($addressInput[AddressInterface::FIRSTNAME]);
-        }
-        if (isset($addressInput[AddressInterface::LASTNAME])) {
-            $address->setLastname($addressInput[AddressInterface::LASTNAME]);
-        }
-        if (isset($addressInput[AddressInterface::MIDDLENAME])) {
-            $address->setMiddlename($addressInput[AddressInterface::MIDDLENAME]);
-        }
-        if (isset($addressInput[AddressInterface::PREFIX])) {
-            $address->setPrefix($addressInput[AddressInterface::PREFIX]);
-        }
-        if (isset($addressInput[AddressInterface::SUFFIX])) {
-            $address->setSuffix($addressInput[AddressInterface::SUFFIX]);
-        }
-        if (isset($addressInput[AddressInterface::VAT_ID])) {
-            $address->setVatId($addressInput[AddressInterface::VAT_ID]);
-        }
-        if (isset($addressInput[AddressInterface::DEFAULT_BILLING])) {
-            $address->setIsDefaultBilling((bool)$addressInput[AddressInterface::DEFAULT_BILLING]);
-        }
-        if (isset($addressInput[AddressInterface::DEFAULT_SHIPPING])) {
-            $address->setIsDefaultShipping((bool)$addressInput[AddressInterface::DEFAULT_SHIPPING]);
-        }
-        if (isset($addressInput[self::CUSTOM_ATTRIBUTE_KEY])) {
-            foreach ($addressInput[self::CUSTOM_ATTRIBUTE_KEY] as $attribute) {
-                $address->setCustomAttribute($attribute['attribute_code'], $attribute['value']);
-            }
-        }
-        if (isset($addressInput[self::EXTENSION_ATTRIBUTE_KEY])) {
-            $extensionAttributes = $address->getExtensionAttributes();
-            if (!$extensionAttributes) {
-                /** @var \Magento\Customer\Api\Data\AddressExtensionInterface $newExtensionAttribute */
-                $extensionAttributes = $this->addressExtensionInterfaceFactory->create();
-            }
-            foreach ($addressInput[self::EXTENSION_ATTRIBUTE_KEY] as $attribute) {
-                $extensionAttributes->setData($attribute['attribute_code'], $attribute['value']);
-            }
-            $address->setExtensionAttributes($extensionAttributes);
-        }
+        $this->dataObjectHelper->populateWithArray(
+            $address,
+            $addressInput,
+            \Magento\Customer\Api\Data\AddressInterface::class
+        );
         return $address;
     }
 
@@ -289,7 +207,7 @@ private function fillAddress($address, $addressInput)
      * @return AddressInterface
      * @throws GraphQlInputException
      */
-    private function processCustomerAddressCreate($customer, $addressInput)
+    private function processCustomerAddressCreate(CustomerInterface $customer, array $addressInput) : AddressInterface
     {
         $errorInput = $this->getAddressInputError($addressInput);
         if ($errorInput) {
@@ -313,7 +231,7 @@ private function processCustomerAddressCreate($customer, $addressInput)
      * @throws GraphQlAuthorizationException
      * @throws GraphQlNoSuchEntityException
      */
-    private function processCustomerAddressUpdate($customer, $addressId, $addressInput)
+    private function processCustomerAddressUpdate(CustomerInterface $customer, $addressId, array $addressInput)
     {
         try {
             /** @var AddressInterface $address */
@@ -341,7 +259,7 @@ private function processCustomerAddressUpdate($customer, $addressId, $addressInp
      * @throws GraphQlAuthorizationException
      * @throws GraphQlNoSuchEntityException
      */
-    private function processCustomerAddressDelete($customer, $addressId)
+    private function processCustomerAddressDelete(CustomerInterface $customer, $addressId)
     {
         try {
             /** @var AddressInterface $address */
@@ -368,4 +286,4 @@ private function processCustomerAddressDelete($customer, $addressId)
         }
         return $this->addressRepositoryInterface->delete($address);
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
index 042aeaf031de0..b794c4ef58794 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
@@ -12,6 +12,9 @@
 use Magento\Framework\Webapi\ServiceOutputProcessor;
 use Magento\Framework\Serialize\SerializerInterface;
 
+/**
+ * Customer Address field data provider, used for GraphQL request processing.
+ */
 class AddressDataProvider
 {
     /**
@@ -79,4 +82,4 @@ public function processCustomerAddress(AddressInterface $addressObject) : array
 
         return $address;
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php
index 7141c2d15d4b2..6a1ea8934bfa9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Magento\GraphQl\Customer;
 

From 47adffd0bac94c42659dd74d867640de0f243882 Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Thu, 27 Sep 2018 13:18:27 -0300
Subject: [PATCH 034/932] GraphQL-57: Refactor address resolve to check address
 attributes required dinamically

---
 .../Model/Resolver/Address.php                | 90 +++++++------------
 1 file changed, 30 insertions(+), 60 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
index 32afe0d65171e..185830475ad3c 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
@@ -9,7 +9,6 @@
 
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
@@ -17,11 +16,7 @@
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\CustomerGraphQl\Model\Resolver\Address\AddressDataProvider;
 use Magento\Eav\Model\Config;
 
@@ -30,28 +25,6 @@
  */
 class Address implements ResolverInterface
 {
-    /**
-     * Customer address attributes
-     * @var array
-     */
-    const ADDRESS_ATTRIBUTES = [
-        AddressInterface::REGION,
-        AddressInterface::REGION_ID,
-        AddressInterface::COUNTRY_ID,
-        AddressInterface::STREET,
-        AddressInterface::COMPANY,
-        AddressInterface::TELEPHONE,
-        AddressInterface::FAX,
-        AddressInterface::POSTCODE,
-        AddressInterface::CITY,
-        AddressInterface::FIRSTNAME,
-        AddressInterface::LASTNAME,
-        AddressInterface::MIDDLENAME,
-        AddressInterface::PREFIX,
-        AddressInterface::SUFFIX,
-        AddressInterface::VAT_ID
-    ];
-
     /**
      * Input data key
      */
@@ -65,7 +38,6 @@ class Address implements ResolverInterface
     const MUTATION_ADDRESS_UPDATE = 'customerAddressUpdate';
     const MUTATION_ADDRESS_DELETE = 'customerAddressDelete';
 
-
     /**
      * @var CustomerRepositoryInterface
      */
@@ -97,6 +69,12 @@ class Address implements ResolverInterface
     private $dataObjectHelper;
 
     /**
+     * @var array
+     */
+    private $addressAttributes;
+
+    /**
+     * @param CustomerRepositoryInterface $customerRepositoryInterface
      * @param AddressRepositoryInterface $addressRepositoryInterface
      * @param AddressInterfaceFactory $addressInterfaceFactory
      * @param Config $eavConfig
@@ -117,6 +95,9 @@ public function __construct(
         $this->eavConfig = $eavConfig;
         $this->addressDataProvider = $addressDataProvider;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->addressAttributes = $this->eavConfig->getEntityAttributes(
+            \Magento\Customer\Api\AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
+        );
     }
 
     /**
@@ -131,7 +112,7 @@ public function resolve(
     ) {
         /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
         if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
-            throw new GraphQlAuthorizationException(
+            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
                 __(
                     'Current customer does not have access to the resource "%1"',
                     [\Magento\Customer\Model\Customer::ENTITY]
@@ -163,27 +144,14 @@ public function resolve(
      */
     private function getAddressInputError(array $addressInput)
     {
-        foreach (self::ADDRESS_ATTRIBUTES as $attribute) {
-            if ($this->isAttributeRequired($attribute) && !isset($addressInput[$attribute])) {
-                return $attribute;
+        foreach ($this->addressAttributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired() && !isset($addressInput[$attributeName])) {
+                return $attributeName;
             }
         }
         return false;
     }
 
-    /**
-     * Check if attribute is set as required
-     * @param string $attributeName
-     * @return bool
-     */
-    private function isAttributeRequired($attributeName)
-    {
-        return $this->eavConfig->getAttribute(
-            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS,
-            $attributeName
-        )->getIsRequired();
-    }
-
     /**
      * Add $addressInput array information to a $address object
      * @param AddressInterface $address
@@ -195,7 +163,7 @@ private function fillAddress(AddressInterface $address, array $addressInput) : A
         $this->dataObjectHelper->populateWithArray(
             $address,
             $addressInput,
-            \Magento\Customer\Api\Data\AddressInterface::class
+            AddressInterface::class
         );
         return $address;
     }
@@ -205,13 +173,15 @@ private function fillAddress(AddressInterface $address, array $addressInput) : A
      * @param CustomerInterface $customer
      * @param array $addressInput
      * @return AddressInterface
-     * @throws GraphQlInputException
+     * @throws \Magento\Framework\GraphQl\Exception\GraphQlInputException
      */
     private function processCustomerAddressCreate(CustomerInterface $customer, array $addressInput) : AddressInterface
     {
         $errorInput = $this->getAddressInputError($addressInput);
         if ($errorInput) {
-            throw new GraphQlInputException(__('Required parameter %1 is missing', [$errorInput]));
+            throw new \Magento\Framework\GraphQl\Exception\GraphQlInputException(
+                __('Required parameter %1 is missing', [$errorInput])
+            );
         }
         /** @var AddressInterface $newAddress */
         $newAddress = $this->fillAddress(
@@ -228,21 +198,21 @@ private function processCustomerAddressCreate(CustomerInterface $customer, array
      * @param int $addressId
      * @param array $addressInput
      * @return AddressInterface
-     * @throws GraphQlAuthorizationException
-     * @throws GraphQlNoSuchEntityException
+     * @throws \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException
+     * @throws \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException
      */
     private function processCustomerAddressUpdate(CustomerInterface $customer, $addressId, array $addressInput)
     {
         try {
             /** @var AddressInterface $address */
             $address = $this->addressRepositoryInterface->getById($addressId);
-        } catch (NoSuchEntityException $exception) {
-            throw new GraphQlNoSuchEntityException(
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+            throw new \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException(
                 __('Address id %1 does not exist.', [$addressId])
             );
         }
         if ($address->getCustomerId() != $customer->getId()) {
-            throw new GraphQlAuthorizationException(
+            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
                 __('Current customer does not have permission to update address id %1', [$addressId])
             );
         }
@@ -256,31 +226,31 @@ private function processCustomerAddressUpdate(CustomerInterface $customer, $addr
      * @param CustomerInterface $customer
      * @param int $addressId
      * @return bool
-     * @throws GraphQlAuthorizationException
-     * @throws GraphQlNoSuchEntityException
+     * @throws \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException
+     * @throws \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException
      */
     private function processCustomerAddressDelete(CustomerInterface $customer, $addressId)
     {
         try {
             /** @var AddressInterface $address */
             $address = $this->addressRepositoryInterface->getById($addressId);
-        } catch (NoSuchEntityException $exception) {
-            throw new GraphQlNoSuchEntityException(
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+            throw new \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException(
                 __('Address id %1 does not exist.', [$addressId])
             );
         }
         if ($address->getCustomerId() != $customer->getId()) {
-            throw new GraphQlAuthorizationException(
+            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
                 __('Current customer does not have permission to delete address id %1', [$addressId])
             );
         }
         if ($address->isDefaultBilling()) {
-            throw new GraphQlAuthorizationException(
+            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
                 __('Customer Address %1 is set as default billing address and can not be deleted', [$addressId])
             );
         }
         if ($address->isDefaultShipping()) {
-            throw new GraphQlAuthorizationException(
+            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
                 __('Customer Address %1 is set as default shipping address and can not be deleted', [$addressId])
             );
         }

From 9041bdba067d618e1e382a59c4002c0488e7932f Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Fri, 28 Sep 2018 12:28:10 -0300
Subject: [PATCH 035/932] GraphQL: Add missing module depenency and add input
 checker on address update

---
 .../Model/Resolver/Address.php                | 121 ++++++++++--------
 .../Magento/CustomerGraphQl/composer.json     |   1 +
 .../Magento/CustomerGraphQl/etc/module.xml    |   1 +
 3 files changed, 72 insertions(+), 51 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
index 185830475ad3c..773f084bd2bc2 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
@@ -8,9 +8,9 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Framework\Api\DataObjectHelper;
@@ -19,18 +19,16 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\CustomerGraphQl\Model\Resolver\Address\AddressDataProvider;
 use Magento\Eav\Model\Config;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Customers Address, used for GraphQL request processing.
  */
 class Address implements ResolverInterface
 {
-    /**
-     * Input data key
-     */
-    const CUSTOM_ATTRIBUTE_KEY = 'custom_attributes';
-    const EXTENSION_ATTRIBUTE_KEY = 'extension_attributes';
-
     /**
      * Mutation Address type
      */
@@ -38,11 +36,6 @@ class Address implements ResolverInterface
     const MUTATION_ADDRESS_UPDATE = 'customerAddressUpdate';
     const MUTATION_ADDRESS_DELETE = 'customerAddressDelete';
 
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepositoryInterface;
-
     /**
      * @var AddressRepositoryInterface
      */
@@ -64,7 +57,7 @@ class Address implements ResolverInterface
     private $addressDataProvider;
 
     /**
-     * @var \Magento\Framework\Api\DataObjectHelper
+     * @var DataObjectHelper
      */
     private $dataObjectHelper;
 
@@ -74,7 +67,6 @@ class Address implements ResolverInterface
     private $addressAttributes;
 
     /**
-     * @param CustomerRepositoryInterface $customerRepositoryInterface
      * @param AddressRepositoryInterface $addressRepositoryInterface
      * @param AddressInterfaceFactory $addressInterfaceFactory
      * @param Config $eavConfig
@@ -82,21 +74,19 @@ class Address implements ResolverInterface
      * @param DataObjectHelper $dataObjectHelper
      */
     public function __construct(
-        CustomerRepositoryInterface $customerRepositoryInterface,
         AddressRepositoryInterface $addressRepositoryInterface,
         AddressInterfaceFactory $addressInterfaceFactory,
         Config $eavConfig,
         AddressDataProvider $addressDataProvider,
         DataObjectHelper $dataObjectHelper
     ) {
-        $this->customerRepositoryInterface = $customerRepositoryInterface;
         $this->addressRepositoryInterface = $addressRepositoryInterface;
         $this->addressInterfaceFactory = $addressInterfaceFactory;
         $this->eavConfig = $eavConfig;
         $this->addressDataProvider = $addressDataProvider;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->addressAttributes = $this->eavConfig->getEntityAttributes(
-            \Magento\Customer\Api\AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
+            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
         );
     }
 
@@ -112,40 +102,58 @@ public function resolve(
     ) {
         /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
         if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
-            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
+            throw new GraphQlAuthorizationException(
                 __(
                     'Current customer does not have access to the resource "%1"',
-                    [\Magento\Customer\Model\Customer::ENTITY]
+                    [AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS]
                 )
             );
         }
-        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
-        $customer = $this->customerRepositoryInterface->getById($context->getUserId());
+        $customerId = $context->getUserId();
         switch ($field->getName()) {
             case self::MUTATION_ADDRESS_CREATE:
                 return $this->addressDataProvider->processCustomerAddress(
-                    $this->processCustomerAddressCreate($customer, $args['input'])
+                    $this->processCustomerAddressCreate($customerId, $args['input'])
                 );
             case self::MUTATION_ADDRESS_UPDATE:
                 return $this->addressDataProvider->processCustomerAddress(
-                    $this->processCustomerAddressUpdate($customer, $args['id'], $args['input'])
+                    $this->processCustomerAddressUpdate($customerId, $args['id'], $args['input'])
                 );
             case self::MUTATION_ADDRESS_DELETE:
-                return $this->processCustomerAddressDelete($customer, $args['id']);
+                return $this->processCustomerAddressDelete($customerId, $args['id']);
             default:
                 return [];
         }
     }
 
     /**
-     * Get input address attribute errors
+     * Get new address attribute input errors
+     *
+     * @param array $addressInput
+     * @return bool|string
+     */
+    private function getNewAddressInputError(array $addressInput)
+    {
+        foreach ($this->addressAttributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (!isset($addressInput[$attributeName]) || empty($addressInput[$attributeName]))) {
+                return $attributeName;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get update address attribute input errors
+     *
      * @param array $addressInput
      * @return bool|string
      */
-    private function getAddressInputError(array $addressInput)
+    private function getUpdateAddressInputError(array $addressInput)
     {
         foreach ($this->addressAttributes as $attributeName => $attributeInfo) {
-            if ($attributeInfo->getIsRequired() && !isset($addressInput[$attributeName])) {
+            if ($attributeInfo->getIsRequired()
+                && (isset($addressInput[$attributeName]) && empty($addressInput[$attributeName]))) {
                 return $attributeName;
             }
         }
@@ -154,6 +162,7 @@ private function getAddressInputError(array $addressInput)
 
     /**
      * Add $addressInput array information to a $address object
+     *
      * @param AddressInterface $address
      * @param array $addressInput
      * @return AddressInterface
@@ -170,16 +179,17 @@ private function fillAddress(AddressInterface $address, array $addressInput) : A
 
     /**
      * Process customer address create
-     * @param CustomerInterface $customer
+     *
+     * @param int $customerId
      * @param array $addressInput
      * @return AddressInterface
-     * @throws \Magento\Framework\GraphQl\Exception\GraphQlInputException
+     * @throws GraphQlInputException
      */
-    private function processCustomerAddressCreate(CustomerInterface $customer, array $addressInput) : AddressInterface
+    private function processCustomerAddressCreate($customerId, array $addressInput) : AddressInterface
     {
-        $errorInput = $this->getAddressInputError($addressInput);
+        $errorInput = $this->getNewAddressInputError($addressInput);
         if ($errorInput) {
-            throw new \Magento\Framework\GraphQl\Exception\GraphQlInputException(
+            throw new GraphQlInputException(
                 __('Required parameter %1 is missing', [$errorInput])
             );
         }
@@ -188,34 +198,42 @@ private function processCustomerAddressCreate(CustomerInterface $customer, array
             $this->addressInterfaceFactory->create(),
             $addressInput
         );
-        $newAddress->setCustomerId($customer->getId());
+        $newAddress->setCustomerId($customerId);
         return $this->addressRepositoryInterface->save($newAddress);
     }
 
     /**
      * Process customer address update
-     * @param CustomerInterface $customer
+     *
+     * @param int $customerId
      * @param int $addressId
      * @param array $addressInput
      * @return AddressInterface
-     * @throws \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException
-     * @throws \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlInputException
      */
-    private function processCustomerAddressUpdate(CustomerInterface $customer, $addressId, array $addressInput)
+    private function processCustomerAddressUpdate($customerId, $addressId, array $addressInput)
     {
         try {
             /** @var AddressInterface $address */
             $address = $this->addressRepositoryInterface->getById($addressId);
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-            throw new \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException(
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(
                 __('Address id %1 does not exist.', [$addressId])
             );
         }
-        if ($address->getCustomerId() != $customer->getId()) {
-            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
+        if ($address->getCustomerId() != $customerId) {
+            throw new GraphQlAuthorizationException(
                 __('Current customer does not have permission to update address id %1', [$addressId])
             );
         }
+        $errorInput = $this->getUpdateAddressInputError($addressInput);
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameter %1 is missing', [$errorInput])
+            );
+        }
         return $this->addressRepositoryInterface->save(
             $this->fillAddress($address, $addressInput)
         );
@@ -223,34 +241,35 @@ private function processCustomerAddressUpdate(CustomerInterface $customer, $addr
 
     /**
      * Process customer address delete
-     * @param CustomerInterface $customer
+     *
+     * @param int $customerId
      * @param int $addressId
      * @return bool
-     * @throws \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException
-     * @throws \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
      */
-    private function processCustomerAddressDelete(CustomerInterface $customer, $addressId)
+    private function processCustomerAddressDelete($customerId, $addressId)
     {
         try {
             /** @var AddressInterface $address */
             $address = $this->addressRepositoryInterface->getById($addressId);
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-            throw new \Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException(
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(
                 __('Address id %1 does not exist.', [$addressId])
             );
         }
-        if ($address->getCustomerId() != $customer->getId()) {
-            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
+        if ($customerId != $address->getCustomerId()) {
+            throw new GraphQlAuthorizationException(
                 __('Current customer does not have permission to delete address id %1', [$addressId])
             );
         }
         if ($address->isDefaultBilling()) {
-            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
+            throw new GraphQlAuthorizationException(
                 __('Customer Address %1 is set as default billing address and can not be deleted', [$addressId])
             );
         }
         if ($address->isDefaultShipping()) {
-            throw new \Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException(
+            throw new GraphQlAuthorizationException(
                 __('Customer Address %1 is set as default shipping address and can not be deleted', [$addressId])
             );
         }
diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json
index c26c83c95be38..f535dea6787a5 100644
--- a/app/code/Magento/CustomerGraphQl/composer.json
+++ b/app/code/Magento/CustomerGraphQl/composer.json
@@ -7,6 +7,7 @@
     "magento/module-customer": "*",
     "magento/module-authorization": "*",
     "magento/module-integration": "*",
+    "magento/module-eav": "*",
     "magento/framework": "*"
   },
   "suggest": {
diff --git a/app/code/Magento/CustomerGraphQl/etc/module.xml b/app/code/Magento/CustomerGraphQl/etc/module.xml
index bde93c6276500..659171ce80735 100644
--- a/app/code/Magento/CustomerGraphQl/etc/module.xml
+++ b/app/code/Magento/CustomerGraphQl/etc/module.xml
@@ -11,6 +11,7 @@
             <module name="Magento_Customer"/>
             <module name="Magento_Authorization"/>
             <module name="Magento_GraphQl"/>
+            <module name="Magento_Eav"/>
         </sequence>
     </module>
 </config>

From 888d02c8a2b9a8d2aee03b3ebd1e1de947c1282c Mon Sep 17 00:00:00 2001
From: Jayanka <jayan@codilar.com>
Date: Fri, 28 Sep 2018 23:48:49 +0530
Subject: [PATCH 036/932] cast formatted number to float

---
 app/code/Magento/Quote/Model/Quote/Address/Total.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 44a81b5011cf2..30ae186ad6230 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -56,7 +56,7 @@ public function __construct(
     public function setTotalAmount($code, $amount)
     {
         /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
-        $amount = is_float($amount) ? number_format($amount, 4) : $amount;
+        $amount = is_float($amount) ? (float)number_format($amount, 4) : $amount;
 
         $this->totalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
@@ -77,7 +77,7 @@ public function setTotalAmount($code, $amount)
     public function setBaseTotalAmount($code, $amount)
     {
         /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
-        $amount = is_float($amount) ? number_format($amount, 4) : $amount;
+        $amount = is_float($amount) ? (float)number_format($amount, 4) : $amount;
 
         $this->baseTotalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
@@ -173,9 +173,7 @@ public function getAllBaseTotalAmounts()
     //@codeCoverageIgnoreEnd
 
     /**
-     * Set the full info, which is used to capture tax related information.
-     *
-     * If a string is used, it is assumed to be serialized.
+     * Set the full info, which is used to capture tax related information. If a string is used, it is assumed to be serialized.
      *
      * @param array|string $info
      * @return $this

From 08ea73c66f41863dc5f75ec60a25e1ba517cbb6b Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Sun, 30 Sep 2018 21:28:54 +0800
Subject: [PATCH 037/932] Removed negative price from product options test
 file.

---
 .../Magento/Catalog/Api/_files/product_options.php   | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
index 955322929762d..e61e6061f4fc2 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
@@ -153,14 +153,4 @@
         'price_type' => 'fixed',
         'sku' => 'time option sku',
     ],
-    [
-        'title' => 'test negative price',
-        'type' => 'field',
-        'sort_order' => 1,
-        'is_require' => 1,
-        'price' => -10,
-        'price_type' => 'fixed',
-        'sku' => 'sku1',
-        'max_characters' => 10,
-    ],
-];
+];
\ No newline at end of file

From eb2be5fbf8df76be3f5eee7872dc30aeba8d6bbb Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Mon, 1 Oct 2018 12:40:36 +0400
Subject: [PATCH 038/932] MAGETWO-66872: Customer Address Attribute not being
 marked as required when the "Values Required" setting is overriden on Website
 scope

- Update automation test
---
 ...tCustomerAddressesFromAdminActionGroup.xml | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
index 402566c771928..9d918990c8172 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
@@ -8,21 +8,24 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="EditCustomerAddressesFromAdminActionGroup" >
+        <arguments>
+            <argument name="customerAddress"/>
+        </arguments>
         <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
         <click selector="{{AdminEditCustomerAddressesSection.addNewAddresses}}" stepKey="addNewAddresses"/>
-        <fillField  stepKey="fillPrefixName" userInput="{{CustomerAddressSimple.prefix}}" selector="{{AdminEditCustomerAddressesSection.prefixName}}"/>
-        <fillField  stepKey="fillFirstName" userInput="{{CustomerAddressSimple.firstname}}" selector="{{AdminEditCustomerAddressesSection.firstName}}"/>
-        <fillField  stepKey="fillMiddleName" userInput="{{CustomerAddressSimple.middlename}}" selector="{{AdminEditCustomerAddressesSection.middleName}}"/>
-        <fillField  stepKey="fillLastName" userInput="{{CustomerAddressSimple.lastname}}" selector="{{AdminEditCustomerAddressesSection.lastName}}"/>
-        <fillField  stepKey="fillSuffixName" userInput="{{CustomerAddressSimple.suffix}}" selector="{{AdminEditCustomerAddressesSection.suffixName}}"/>
-        <fillField  stepKey="fillCompany" userInput="{{CustomerAddressSimple.company}}" selector="{{AdminEditCustomerAddressesSection.company}}"/>
-        <fillField  stepKey="fillStreetAddress" userInput="{{CustomerAddressSimple.street}}" selector="{{AdminEditCustomerAddressesSection.streetAddress}}"/>
-        <fillField  stepKey="fillCity" userInput="{{CustomerAddressSimple.city}}" selector="{{AdminEditCustomerAddressesSection.city}}"/>
+        <fillField  stepKey="fillPrefixName" userInput="{{customerAddress.prefix}}" selector="{{AdminEditCustomerAddressesSection.prefixName}}"/>
+        <fillField  stepKey="fillFirstName" userInput="{{customerAddress.firstname}}" selector="{{AdminEditCustomerAddressesSection.firstName}}"/>
+        <fillField  stepKey="fillMiddleName" userInput="{{customerAddress.middlename}}" selector="{{AdminEditCustomerAddressesSection.middleName}}"/>
+        <fillField  stepKey="fillLastName" userInput="{{customerAddress.lastname}}" selector="{{AdminEditCustomerAddressesSection.lastName}}"/>
+        <fillField  stepKey="fillSuffixName" userInput="{{customerAddress.suffix}}" selector="{{AdminEditCustomerAddressesSection.suffixName}}"/>
+        <fillField  stepKey="fillCompany" userInput="{{customerAddress.company}}" selector="{{AdminEditCustomerAddressesSection.company}}"/>
+        <fillField  stepKey="fillStreetAddress" userInput="{{customerAddress.street}}" selector="{{AdminEditCustomerAddressesSection.streetAddress}}"/>
+        <fillField  stepKey="fillCity" userInput="{{customerAddress.city}}" selector="{{AdminEditCustomerAddressesSection.city}}"/>
         <selectOption stepKey="selectCountry" selector="{{AdminEditCustomerAddressesSection.country}}" userInput="{{US_Address_CA.country_id}}"/>
         <selectOption stepKey="selectState" selector="{{AdminEditCustomerAddressesSection.state}}" userInput="{{US_Address_CA.state}}"/>
-        <fillField  stepKey="fillZipCode" userInput="{{CustomerAddressSimple.postcode}}" selector="{{AdminEditCustomerAddressesSection.zipCode}}"/>
-        <fillField  stepKey="fillPhone" userInput="{{CustomerAddressSimple.telephone}}" selector="{{AdminEditCustomerAddressesSection.phone}}"/>
-        <fillField  stepKey="fillVAT" userInput="{{CustomerAddressSimple.vat_id}}" selector="{{AdminEditCustomerAddressesSection.vat}}"/>
+        <fillField  stepKey="fillZipCode" userInput="{{customerAddress.postcode}}" selector="{{AdminEditCustomerAddressesSection.zipCode}}"/>
+        <fillField  stepKey="fillPhone" userInput="{{customerAddress.telephone}}" selector="{{AdminEditCustomerAddressesSection.phone}}"/>
+        <fillField  stepKey="fillVAT" userInput="{{customerAddress.vat_id}}" selector="{{AdminEditCustomerAddressesSection.vat}}"/>
         <click selector="{{CustomerAccountSection.save}}" stepKey="saveAddress"/>
         <waitForPageLoad stepKey="waitForStorefrontPage"/>
         <click selector="{{CustomerAccountSection.save}}" stepKey="saveCustomer"/>

From cfc82be0b908fa444f79d14e90c3abe856ae8727 Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Mon, 1 Oct 2018 19:37:03 -0300
Subject: [PATCH 039/932] GraphQL-57: Refactor Address resolve and change
 functional test

---
 .../Model/Resolver/Address.php                | 278 --------------
 .../Address/AddressConfigProvider.php         |  76 ++++
 .../Model/Resolver/AddressCreate.php          | 134 +++++++
 .../Model/Resolver/AddressDelete.php          | 100 +++++
 .../Model/Resolver/AddressUpdate.php          | 148 ++++++++
 .../CustomerGraphQl/etc/schema.graphqls       |   6 +-
 .../Customer/CustomerAddressCreateTest.php    | 300 +++++++++++++++
 .../Customer/CustomerAddressDeleteTest.php    | 184 ++++++++++
 ...Test.php => CustomerAddressUpdateTest.php} | 342 ++++--------------
 9 files changed, 1013 insertions(+), 555 deletions(-)
 delete mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressDeleteTest.php
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/{CustomerAddressTest.php => CustomerAddressUpdateTest.php} (51%)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
deleted file mode 100644
index 773f084bd2bc2..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CustomerGraphQl\Model\Resolver;
-
-use Magento\Authorization\Model\UserContextInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\AddressMetadataManagementInterface;
-use Magento\Customer\Api\Data\AddressInterfaceFactory;
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\Framework\Api\DataObjectHelper;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\CustomerGraphQl\Model\Resolver\Address\AddressDataProvider;
-use Magento\Eav\Model\Config;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\Exception\NoSuchEntityException;
-
-/**
- * Customers Address, used for GraphQL request processing.
- */
-class Address implements ResolverInterface
-{
-    /**
-     * Mutation Address type
-     */
-    const MUTATION_ADDRESS_CREATE = 'customerAddressCreate';
-    const MUTATION_ADDRESS_UPDATE = 'customerAddressUpdate';
-    const MUTATION_ADDRESS_DELETE = 'customerAddressDelete';
-
-    /**
-     * @var AddressRepositoryInterface
-     */
-    private $addressRepositoryInterface;
-
-    /**
-     * @var AddressInterfaceFactory
-     */
-    private $addressInterfaceFactory;
-
-    /**
-     * @var Config
-     */
-    private $eavConfig;
-
-    /**
-     * @var AddressDataProvider
-     */
-    private $addressDataProvider;
-
-    /**
-     * @var DataObjectHelper
-     */
-    private $dataObjectHelper;
-
-    /**
-     * @var array
-     */
-    private $addressAttributes;
-
-    /**
-     * @param AddressRepositoryInterface $addressRepositoryInterface
-     * @param AddressInterfaceFactory $addressInterfaceFactory
-     * @param Config $eavConfig
-     * @param AddressDataProvider $addressDataProvider
-     * @param DataObjectHelper $dataObjectHelper
-     */
-    public function __construct(
-        AddressRepositoryInterface $addressRepositoryInterface,
-        AddressInterfaceFactory $addressInterfaceFactory,
-        Config $eavConfig,
-        AddressDataProvider $addressDataProvider,
-        DataObjectHelper $dataObjectHelper
-    ) {
-        $this->addressRepositoryInterface = $addressRepositoryInterface;
-        $this->addressInterfaceFactory = $addressInterfaceFactory;
-        $this->eavConfig = $eavConfig;
-        $this->addressDataProvider = $addressDataProvider;
-        $this->dataObjectHelper = $dataObjectHelper;
-        $this->addressAttributes = $this->eavConfig->getEntityAttributes(
-            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
-        );
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function resolve(
-        Field $field,
-        $context,
-        ResolveInfo $info,
-        array $value = null,
-        array $args = null
-    ) {
-        /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
-        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
-            throw new GraphQlAuthorizationException(
-                __(
-                    'Current customer does not have access to the resource "%1"',
-                    [AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS]
-                )
-            );
-        }
-        $customerId = $context->getUserId();
-        switch ($field->getName()) {
-            case self::MUTATION_ADDRESS_CREATE:
-                return $this->addressDataProvider->processCustomerAddress(
-                    $this->processCustomerAddressCreate($customerId, $args['input'])
-                );
-            case self::MUTATION_ADDRESS_UPDATE:
-                return $this->addressDataProvider->processCustomerAddress(
-                    $this->processCustomerAddressUpdate($customerId, $args['id'], $args['input'])
-                );
-            case self::MUTATION_ADDRESS_DELETE:
-                return $this->processCustomerAddressDelete($customerId, $args['id']);
-            default:
-                return [];
-        }
-    }
-
-    /**
-     * Get new address attribute input errors
-     *
-     * @param array $addressInput
-     * @return bool|string
-     */
-    private function getNewAddressInputError(array $addressInput)
-    {
-        foreach ($this->addressAttributes as $attributeName => $attributeInfo) {
-            if ($attributeInfo->getIsRequired()
-                && (!isset($addressInput[$attributeName]) || empty($addressInput[$attributeName]))) {
-                return $attributeName;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get update address attribute input errors
-     *
-     * @param array $addressInput
-     * @return bool|string
-     */
-    private function getUpdateAddressInputError(array $addressInput)
-    {
-        foreach ($this->addressAttributes as $attributeName => $attributeInfo) {
-            if ($attributeInfo->getIsRequired()
-                && (isset($addressInput[$attributeName]) && empty($addressInput[$attributeName]))) {
-                return $attributeName;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Add $addressInput array information to a $address object
-     *
-     * @param AddressInterface $address
-     * @param array $addressInput
-     * @return AddressInterface
-     */
-    private function fillAddress(AddressInterface $address, array $addressInput) : AddressInterface
-    {
-        $this->dataObjectHelper->populateWithArray(
-            $address,
-            $addressInput,
-            AddressInterface::class
-        );
-        return $address;
-    }
-
-    /**
-     * Process customer address create
-     *
-     * @param int $customerId
-     * @param array $addressInput
-     * @return AddressInterface
-     * @throws GraphQlInputException
-     */
-    private function processCustomerAddressCreate($customerId, array $addressInput) : AddressInterface
-    {
-        $errorInput = $this->getNewAddressInputError($addressInput);
-        if ($errorInput) {
-            throw new GraphQlInputException(
-                __('Required parameter %1 is missing', [$errorInput])
-            );
-        }
-        /** @var AddressInterface $newAddress */
-        $newAddress = $this->fillAddress(
-            $this->addressInterfaceFactory->create(),
-            $addressInput
-        );
-        $newAddress->setCustomerId($customerId);
-        return $this->addressRepositoryInterface->save($newAddress);
-    }
-
-    /**
-     * Process customer address update
-     *
-     * @param int $customerId
-     * @param int $addressId
-     * @param array $addressInput
-     * @return AddressInterface
-     * @throws GraphQlAuthorizationException
-     * @throws GraphQlNoSuchEntityException
-     * @throws GraphQlInputException
-     */
-    private function processCustomerAddressUpdate($customerId, $addressId, array $addressInput)
-    {
-        try {
-            /** @var AddressInterface $address */
-            $address = $this->addressRepositoryInterface->getById($addressId);
-        } catch (NoSuchEntityException $exception) {
-            throw new GraphQlNoSuchEntityException(
-                __('Address id %1 does not exist.', [$addressId])
-            );
-        }
-        if ($address->getCustomerId() != $customerId) {
-            throw new GraphQlAuthorizationException(
-                __('Current customer does not have permission to update address id %1', [$addressId])
-            );
-        }
-        $errorInput = $this->getUpdateAddressInputError($addressInput);
-        if ($errorInput) {
-            throw new GraphQlInputException(
-                __('Required parameter %1 is missing', [$errorInput])
-            );
-        }
-        return $this->addressRepositoryInterface->save(
-            $this->fillAddress($address, $addressInput)
-        );
-    }
-
-    /**
-     * Process customer address delete
-     *
-     * @param int $customerId
-     * @param int $addressId
-     * @return bool
-     * @throws GraphQlAuthorizationException
-     * @throws GraphQlNoSuchEntityException
-     */
-    private function processCustomerAddressDelete($customerId, $addressId)
-    {
-        try {
-            /** @var AddressInterface $address */
-            $address = $this->addressRepositoryInterface->getById($addressId);
-        } catch (NoSuchEntityException $exception) {
-            throw new GraphQlNoSuchEntityException(
-                __('Address id %1 does not exist.', [$addressId])
-            );
-        }
-        if ($customerId != $address->getCustomerId()) {
-            throw new GraphQlAuthorizationException(
-                __('Current customer does not have permission to delete address id %1', [$addressId])
-            );
-        }
-        if ($address->isDefaultBilling()) {
-            throw new GraphQlAuthorizationException(
-                __('Customer Address %1 is set as default billing address and can not be deleted', [$addressId])
-            );
-        }
-        if ($address->isDefaultShipping()) {
-            throw new GraphQlAuthorizationException(
-                __('Customer Address %1 is set as default shipping address and can not be deleted', [$addressId])
-            );
-        }
-        return $this->addressRepositoryInterface->delete($address);
-    }
-}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php
new file mode 100644
index 0000000000000..8f16d2890f5e1
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver\Address;
+
+use Magento\Customer\Api\AddressMetadataManagementInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Eav\Model\Config;
+
+/**
+ * Customers Address, used for GraphQL request processing.
+ */
+class AddressConfigProvider
+{
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var array
+     */
+    private $addressAttributes;
+
+    /**
+     * @param Config $eavConfig
+     * @param DataObjectHelper $dataObjectHelper
+     */
+    public function __construct(
+        Config $eavConfig,
+        DataObjectHelper $dataObjectHelper
+    ) {
+        $this->eavConfig = $eavConfig;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->addressAttributes = $this->eavConfig->getEntityAttributes(
+            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
+        );
+    }
+
+    /**
+     * Add $addressInput array information to a $address object
+     *
+     * @param AddressInterface $address
+     * @param array $addressInput
+     * @return AddressInterface
+     */
+    public function fillAddress(AddressInterface $address, array $addressInput) : AddressInterface
+    {
+        $this->dataObjectHelper->populateWithArray(
+            $address,
+            $addressInput,
+            AddressInterface::class
+        );
+        return $address;
+    }
+
+    /**
+     * Get address field configuration
+     *
+     * @return array
+     */
+    public function getAddressAttributes() : array
+    {
+        return $this->addressAttributes;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
new file mode 100644
index 0000000000000..0420a9d91049a
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\AddressMetadataManagementInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\CustomerGraphQl\Model\Resolver\Address\AddressDataProvider;
+use Magento\CustomerGraphQl\Model\Resolver\Address\AddressConfigProvider;
+
+/**
+ * Customers Address, used for GraphQL request processing.
+ */
+class AddressCreate implements ResolverInterface
+{
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepositoryInterface;
+
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $addressInterfaceFactory;
+
+    /**
+     * @var AddressDataProvider
+     */
+    private $addressDataProvider;
+
+    /**
+     * @var AddressConfigProvider
+     */
+    public $addressConfigProvider;
+
+    /**
+     * @param AddressRepositoryInterface $addressRepositoryInterface
+     * @param AddressInterfaceFactory $addressInterfaceFactory
+     * @param AddressDataProvider $addressDataProvider
+     * @param AddressConfigProvider $addressConfigProvider
+     */
+    public function __construct(
+        AddressRepositoryInterface $addressRepositoryInterface,
+        AddressInterfaceFactory $addressInterfaceFactory,
+        AddressDataProvider $addressDataProvider,
+        AddressConfigProvider $addressConfigProvider
+    ) {
+        $this->addressRepositoryInterface = $addressRepositoryInterface;
+        $this->addressInterfaceFactory = $addressInterfaceFactory;
+        $this->addressDataProvider = $addressDataProvider;
+        $this->addressConfigProvider = $addressConfigProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
+        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
+            throw new GraphQlAuthorizationException(
+                __(
+                    'Current customer does not have access to the resource "%1"',
+                    [AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS]
+                )
+            );
+        }
+        $customerId = $context->getUserId();
+        return $this->addressDataProvider->processCustomerAddress(
+            $this->processCustomerAddressCreate($customerId, $args['input'])
+        );
+    }
+
+    /**
+     * Get new address attribute input errors
+     *
+     * @param array $addressInput
+     * @return bool|string
+     */
+    public function getInputError(array $addressInput)
+    {
+        $attributes = $this->addressConfigProvider->getAddressAttributes();
+        foreach ($attributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (!isset($addressInput[$attributeName]) || empty($addressInput[$attributeName]))) {
+                return $attributeName;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Process customer address create
+     *
+     * @param int $customerId
+     * @param array $addressInput
+     * @return AddressInterface
+     * @throws GraphQlInputException
+     */
+    private function processCustomerAddressCreate($customerId, array $addressInput) : AddressInterface
+    {
+        $errorInput = $this->getInputError($addressInput);
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameter %1 is missing', [$errorInput])
+            );
+        }
+        /** @var AddressInterface $newAddress */
+        $newAddress = $this->addressConfigProvider->fillAddress(
+            $this->addressInterfaceFactory->create(),
+            $addressInput
+        );
+        $newAddress->setCustomerId($customerId);
+        return $this->addressRepositoryInterface->save($newAddress);
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php
new file mode 100644
index 0000000000000..540d7645cc657
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\AddressMetadataManagementInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Customers Address, used for GraphQL request processing.
+ */
+class AddressDelete implements ResolverInterface
+{
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepositoryInterface;
+
+    /**
+     * @param AddressRepositoryInterface $addressRepositoryInterface
+     */
+    public function __construct(
+        AddressRepositoryInterface $addressRepositoryInterface
+    ) {
+        $this->addressRepositoryInterface = $addressRepositoryInterface;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
+        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
+            throw new GraphQlAuthorizationException(
+                __(
+                    'Current customer does not have access to the resource "%1"',
+                    [AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS]
+                )
+            );
+        }
+        $customerId = $context->getUserId();
+        return $this->processCustomerAddressDelete($customerId, $args['id']);
+    }
+
+    /**
+     * Process customer address delete
+     *
+     * @param int $customerId
+     * @param int $addressId
+     * @return bool
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function processCustomerAddressDelete($customerId, $addressId)
+    {
+        try {
+            /** @var AddressInterface $address */
+            $address = $this->addressRepositoryInterface->getById($addressId);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(
+                __('Address id %1 does not exist.', [$addressId])
+            );
+        }
+        if ($customerId != $address->getCustomerId()) {
+            throw new GraphQlAuthorizationException(
+                __('Current customer does not have permission to delete address id %1', [$addressId])
+            );
+        }
+        if ($address->isDefaultBilling()) {
+            throw new GraphQlAuthorizationException(
+                __('Customer Address %1 is set as default billing address and can not be deleted', [$addressId])
+            );
+        }
+        if ($address->isDefaultShipping()) {
+            throw new GraphQlAuthorizationException(
+                __('Customer Address %1 is set as default shipping address and can not be deleted', [$addressId])
+            );
+        }
+        return $this->addressRepositoryInterface->delete($address);
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
new file mode 100644
index 0000000000000..800ba5f2804f4
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\AddressMetadataManagementInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\CustomerGraphQl\Model\Resolver\Address\AddressDataProvider;
+use Magento\CustomerGraphQl\Model\Resolver\Address\AddressConfigProvider;
+
+/**
+ * Customers Address, used for GraphQL request processing.
+ */
+class AddressUpdate implements ResolverInterface
+{
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepositoryInterface;
+
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $addressInterfaceFactory;
+
+    /**
+     * @var AddressDataProvider
+     */
+    private $addressDataProvider;
+
+    /**
+     * @var AddressConfigProvider
+     */
+    public $addressConfigProvider;
+
+    /**
+     * @param AddressRepositoryInterface $addressRepositoryInterface
+     * @param AddressInterfaceFactory $addressInterfaceFactory
+     * @param AddressDataProvider $addressDataProvider
+     * @param AddressConfigProvider $addressConfigProvider
+     */
+    public function __construct(
+        AddressRepositoryInterface $addressRepositoryInterface,
+        AddressInterfaceFactory $addressInterfaceFactory,
+        AddressDataProvider $addressDataProvider,
+        AddressConfigProvider $addressConfigProvider
+    ) {
+        $this->addressRepositoryInterface = $addressRepositoryInterface;
+        $this->addressInterfaceFactory = $addressInterfaceFactory;
+        $this->addressDataProvider = $addressDataProvider;
+        $this->addressConfigProvider = $addressConfigProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
+        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
+            throw new GraphQlAuthorizationException(
+                __(
+                    'Current customer does not have access to the resource "%1"',
+                    [AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS]
+                )
+            );
+        }
+        $customerId = $context->getUserId();
+        return $this->addressDataProvider->processCustomerAddress(
+            $this->processCustomerAddressUpdate($customerId, $args['id'], $args['input'])
+        );
+    }
+
+    /**
+     * Get update address attribute input errors
+     *
+     * @param array $addressInput
+     * @return bool|string
+     */
+    private function getInputError(array $addressInput)
+    {
+        $attributes = $this->addressConfigProvider->getAddressAttributes();
+        foreach ($attributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (isset($addressInput[$attributeName]) && empty($addressInput[$attributeName]))) {
+                return $attributeName;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Process customer address update
+     *
+     * @param int $customerId
+     * @param int $addressId
+     * @param array $addressInput
+     * @return AddressInterface
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlInputException
+     */
+    private function processCustomerAddressUpdate($customerId, $addressId, array $addressInput)
+    {
+        try {
+            /** @var AddressInterface $address */
+            $address = $this->addressRepositoryInterface->getById($addressId);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(
+                __('Address id %1 does not exist.', [$addressId])
+            );
+        }
+        if ($address->getCustomerId() != $customerId) {
+            throw new GraphQlAuthorizationException(
+                __('Current customer does not have permission to update address id %1', [$addressId])
+            );
+        }
+        $errorInput = $this->getInputError($addressInput);
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameter %1 is missing', [$errorInput])
+            );
+        }
+        return $this->addressRepositoryInterface->save(
+            $this->addressConfigProvider->fillAddress($address, $addressInput)
+        );
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index c53bfa645d807..3adc92a02d7db 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -8,9 +8,9 @@ type Query {
 type Mutation {
     generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\GenerateCustomerToken") @doc(description:"Retrieve Customer token")
     changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\ChangePassword") @doc(description:"Changes password for logged in customer")
-    customerAddressCreate(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Address") @doc(description: "Create customer address")
-    customerAddressUpdate(id: Int!, input: CustomerAddressInput): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Address") @doc(description: "Update customer address")
-    customerAddressDelete(id: Int!): Boolean @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\Address") @doc(description: "Delete customer address")
+    customerAddressCreate(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\AddressCreate") @doc(description: "Create customer address")
+    customerAddressUpdate(id: Int!, input: CustomerAddressInput): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\AddressUpdate") @doc(description: "Update customer address")
+    customerAddressDelete(id: Int!): Boolean @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\AddressDelete") @doc(description: "Delete customer address")
 }
 
 input CustomerAddressInput {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php
new file mode 100644
index 0000000000000..2db574c508827
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use PHPUnit\Framework\TestResult;
+
+class CustomerAddressCreateTest extends GraphQlAbstract
+{
+
+    /**
+     * Verify customers with valid credentials create new address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testAddCustomerAddressWithValidCredentials()
+    {
+        $newAddress = [
+            'region' => [
+                'region' => 'Alaska',
+                'region_id' => 4,
+                'region_code' => 'AK'
+            ],
+            'region_id' => 4,
+            'country_id' => 'US',
+            'street' => ['Line 1 Street', 'Line 2'],
+            'company' => 'Company name',
+            'telephone' => '123456789',
+            'fax' => '123123123',
+            'postcode' => '7777',
+            'city' => 'City Name',
+            'firstname' => 'Adam',
+            'lastname' => 'Phillis',
+            'middlename' => 'A',
+            'prefix' => 'Mr.',
+            'suffix' => 'Jr.',
+            'vat_id' => '1',
+            'default_shipping' => false,
+            'default_billing' => false
+        ];
+        $defaultShippingText = $newAddress['default_shipping'] ? "true": "false";
+        $defaultBillingText = $newAddress['default_billing'] ? "true": "false";
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressCreate(input: {
+    region: {
+        region: "{$newAddress['region']['region']}"
+        region_id: {$newAddress['region']['region_id']}
+        region_code: "{$newAddress['region']['region_code']}"
+    }
+    region_id: {$newAddress['region_id']}
+    country_id: {$newAddress['country_id']}
+    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
+    company: "{$newAddress['company']}"
+    telephone: "{$newAddress['telephone']}"
+    fax: "{$newAddress['fax']}"
+    postcode: "{$newAddress['postcode']}"
+    city: "{$newAddress['city']}"
+    firstname: "{$newAddress['firstname']}"
+    lastname: "{$newAddress['lastname']}"
+    middlename: "{$newAddress['middlename']}"
+    prefix: "{$newAddress['prefix']}"
+    suffix: "{$newAddress['suffix']}"
+    vat_id: "{$newAddress['vat_id']}"
+    default_shipping: {$defaultShippingText}
+    default_billing: {$defaultBillingText}
+  }) {
+    id
+    customer_id
+    region {
+      region
+      region_id
+      region_code
+    }
+    region_id
+    country_id
+    street
+    company
+    telephone
+    fax
+    postcode
+    city
+    firstname
+    lastname
+    middlename
+    prefix
+    suffix
+    vat_id
+    default_shipping
+    default_billing
+  }
+}
+MUTATION;
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->assertArrayHasKey('customerAddressCreate', $response);
+        $this->assertArrayHasKey('customer_id', $response['customerAddressCreate']);
+        $this->assertEquals($customer->getId(), $response['customerAddressCreate']['customer_id']);
+        $this->assertArrayHasKey('id', $response['customerAddressCreate']);
+        /** @var AddressRepositoryInterface $addressRepository */
+        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
+        $addressId = $response['customerAddressCreate']['id'];
+        $address = $addressRepository->getById($addressId);
+        $this->assertEquals($address->getId(), $response['customerAddressCreate']['id']);
+        $this->assertCustomerAddressesFields($address, $response['customerAddressCreate']);
+        $this->assertCustomerAddressesFields($address, $newAddress);
+    }
+
+    /**
+     * Verify customers without credentials create new address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testAddCustomerAddressWithoutCredentials()
+    {
+        $mutation
+            = <<<MUTATION
+mutation{
+  customerAddressCreate(input: {
+  	prefix: "Mr."
+    firstname: "John"
+    middlename: "A"
+    lastname: "Smith"
+    telephone: "123456789"
+    street: ["Line 1", "Line 2"]
+    city: "Test City"
+    region_id: 1
+    country_id: US
+    postcode: "9999"
+    default_shipping: true
+    default_billing: false
+  }) {
+    id
+    customer_id
+    firstname
+    lastname
+  }
+}
+MUTATION;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Current customer does not have access to the resource "customer_address"');
+        $this->graphQlQuery($mutation);
+    }
+
+    /**
+     * Verify customers with valid credentials create new address
+     * with missing required Firstname attribute
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testAddCustomerAddressWithMissingAttributeWithValidCredentials()
+    {
+        $newAddress = [
+            'region' => [
+                'region' => 'Alaska',
+                'region_id' => 4,
+                'region_code' => 'AK'
+            ],
+            'region_id' => 4,
+            'country_id' => 'US',
+            'street' => ['Line 1 Street', 'Line 2'],
+            'company' => 'Company name',
+            'telephone' => '123456789',
+            'fax' => '123123123',
+            'postcode' => '7777',
+            'city' => 'City Name',
+            'firstname' => '', //empty firstname
+            'lastname' => 'Phillis',
+            'middlename' => 'A',
+            'prefix' => 'Mr.',
+            'suffix' => 'Jr.',
+            'vat_id' => '1',
+            'default_shipping' => false,
+            'default_billing' => false
+        ];
+        $defaultShippingText = $newAddress['default_shipping'] ? "true": "false";
+        $defaultBillingText = $newAddress['default_billing'] ? "true": "false";
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressCreate(input: {
+    region: {
+        region: "{$newAddress['region']['region']}"
+        region_id: {$newAddress['region']['region_id']}
+        region_code: "{$newAddress['region']['region_code']}"
+    }
+    region_id: {$newAddress['region_id']}
+    country_id: {$newAddress['country_id']}
+    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
+    company: "{$newAddress['company']}"
+    telephone: "{$newAddress['telephone']}"
+    fax: "{$newAddress['fax']}"
+    postcode: "{$newAddress['postcode']}"
+    city: "{$newAddress['city']}"
+    firstname: "{$newAddress['firstname']}"
+    lastname: "{$newAddress['lastname']}"
+    middlename: "{$newAddress['middlename']}"
+    prefix: "{$newAddress['prefix']}"
+    suffix: "{$newAddress['suffix']}"
+    vat_id: "{$newAddress['vat_id']}"
+    default_shipping: {$defaultShippingText}
+    default_billing: {$defaultBillingText}
+  }) {
+    id
+    customer_id
+    region {
+      region
+      region_id
+      region_code
+    }
+    region_id
+    country_id
+    street
+    company
+    telephone
+    fax
+    postcode
+    city
+    firstname
+    lastname
+    middlename
+    prefix
+    suffix
+    vat_id
+    default_shipping
+    default_billing
+  }
+}
+MUTATION;
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Required parameter firstname is missing');
+        $this->graphQlQuery($mutation, [], '', $headerMap);
+    }
+
+    /**
+     * Verify the fields for Customer address
+     *
+     * @param \Magento\Customer\Api\Data\AddressInterface $address
+     * @param array $actualResponse
+     */
+    private function assertCustomerAddressesFields($address, $actualResponse)
+    {
+        /** @var  $addresses */
+        $assertionMap = [
+            ['response_field' => 'region_id', 'expected_value' => $address->getRegionId()],
+            ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
+            ['response_field' => 'street', 'expected_value' => $address->getStreet()],
+            ['response_field' => 'company', 'expected_value' => $address->getCompany()],
+            ['response_field' => 'telephone', 'expected_value' => $address->getTelephone()],
+            ['response_field' => 'fax', 'expected_value' => $address->getFax()],
+            ['response_field' => 'postcode', 'expected_value' => $address->getPostcode()],
+            ['response_field' => 'city', 'expected_value' => $address->getCity()],
+            ['response_field' => 'firstname', 'expected_value' => $address->getFirstname()],
+            ['response_field' => 'lastname', 'expected_value' => $address->getLastname()],
+            ['response_field' => 'middlename', 'expected_value' => $address->getMiddlename()],
+            ['response_field' => 'prefix', 'expected_value' => $address->getPrefix()],
+            ['response_field' => 'suffix', 'expected_value' => $address->getSuffix()],
+            ['response_field' => 'vat_id', 'expected_value' => $address->getVatId()],
+            ['response_field' => 'default_shipping', 'expected_value' => (bool)$address->isDefaultShipping()],
+            ['response_field' => 'default_billing', 'expected_value' => (bool)$address->isDefaultBilling()],
+        ];
+        $this->assertResponseFields($actualResponse, $assertionMap);
+        $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
+        $assertionRegionMap = [
+            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
+            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
+            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
+        ];
+        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressDeleteTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressDeleteTest.php
new file mode 100644
index 0000000000000..e1371e47aab4a
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressDeleteTest.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use PHPUnit\Framework\TestResult;
+
+class CustomerAddressDeleteTest extends GraphQlAbstract
+{
+    /**
+     * Verify customers with valid credentials with a customer bearer token
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteCustomerAddressWithValidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = end($addresses);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: {$addressId})
+}
+MUTATION;
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->assertArrayHasKey('customerAddressDelete', $response);
+        $this->assertEquals(true, $response['customerAddressDelete']);
+    }
+
+    /**
+     * Verify customers without credentials delete address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteCustomerAddressWithoutCredentials()
+    {
+        $userName = 'customer@example.com';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = current($addresses);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: {$addressId})
+}
+MUTATION;
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Current customer does not have access to the resource "customer_address"');
+        $this->graphQlQuery($mutation);
+    }
+
+    /**
+     * Verify customers with valid credentials delete default shipping address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteDefaultShippingCustomerAddressWithValidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = end($addresses);
+        $address->setIsDefaultShipping(true);
+        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
+        $addressRepository->save($address);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: {$addressId})
+}
+MUTATION;
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Customer Address ' . $addressId . ' is set as default shipping address and can not be deleted');
+        $this->graphQlQuery($mutation, [], '', $headerMap);
+    }
+
+    /**
+     * Verify customers with valid credentials delete default billing address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteDefaultBillingCustomerAddressWithValidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = end($addresses);
+        $address->setIsDefaultBilling(true);
+        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
+        $addressRepository->save($address);
+        $addressId = $address->getId();
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: {$addressId})
+}
+MUTATION;
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Customer Address ' . $addressId . ' is set as default billing address and can not be deleted');
+        $this->graphQlQuery($mutation, [], '', $headerMap);
+    }
+
+    /**
+     * Verify customers with valid credentials delete non exist address
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testDeleteNonExistCustomerAddressWithValidCredentials()
+    {
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $mutation
+            = <<<MUTATION
+mutation {
+  customerAddressDelete(id: 9999)
+}
+MUTATION;
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
+        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
+            'Address id 9999 does not exist.');
+        $this->graphQlQuery($mutation, [], '', $headerMap);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php
similarity index 51%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php
index 6a1ea8934bfa9..f8149c9067038 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php
@@ -14,18 +14,20 @@
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use PHPUnit\Framework\TestResult;
 
-class CustomerAddressTest extends GraphQlAbstract
+class CustomerAddressUpdateTest extends GraphQlAbstract
 {
-
     /**
-     * Verify customers with valid credentials create new address
+     * Verify customers with valid credentials update address
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testAddCustomerAddressWithValidCredentials()
+    public function testUpdateCustomerAddressWithValidCredentials()
     {
-        $newAddress = [
+        $userName = 'customer@example.com';
+        $password = 'password';
+        $updateAddress = [
             'region' => [
                 'region' => 'Alaska',
                 'region_id' => 4,
@@ -34,7 +36,7 @@ public function testAddCustomerAddressWithValidCredentials()
             'region_id' => 4,
             'country_id' => 'US',
             'street' => ['Line 1 Street', 'Line 2'],
-            'company' => 'Company name',
+            'company' => 'Company Name',
             'telephone' => '123456789',
             'fax' => '123123123',
             'postcode' => '7777',
@@ -45,34 +47,42 @@ public function testAddCustomerAddressWithValidCredentials()
             'prefix' => 'Mr.',
             'suffix' => 'Jr.',
             'vat_id' => '1',
-            'default_shipping' => false,
-            'default_billing' => false
+            'default_shipping' => true,
+            'default_billing' => true
         ];
-        $defaultShippingText = $newAddress['default_shipping'] ? "true": "false";
-        $defaultBillingText = $newAddress['default_billing'] ? "true": "false";
+        $defaultShippingText = $updateAddress['default_shipping'] ? "true": "false";
+        $defaultBillingText = $updateAddress['default_billing'] ? "true": "false";
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = current($addresses);
+        $addressId = $address->getId();
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressCreate(input: {
+  customerAddressUpdate(id: {$addressId}, input: {
     region: {
-        region: "{$newAddress['region']['region']}"
-        region_id: {$newAddress['region']['region_id']}
-        region_code: "{$newAddress['region']['region_code']}"
+        region: "{$updateAddress['region']['region']}"
+        region_id: {$updateAddress['region']['region_id']}
+        region_code: "{$updateAddress['region']['region_code']}"
     }
-    region_id: {$newAddress['region_id']}
-    country_id: {$newAddress['country_id']}
-    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
-    company: "{$newAddress['company']}"
-    telephone: "{$newAddress['telephone']}"
-    fax: "{$newAddress['fax']}"
-    postcode: "{$newAddress['postcode']}"
-    city: "{$newAddress['city']}"
-    firstname: "{$newAddress['firstname']}"
-    lastname: "{$newAddress['lastname']}"
-    middlename: "{$newAddress['middlename']}"
-    prefix: "{$newAddress['prefix']}"
-    suffix: "{$newAddress['suffix']}"
-    vat_id: "{$newAddress['vat_id']}"
+    region_id: {$updateAddress['region_id']}
+    country_id: {$updateAddress['country_id']}
+    street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
+    company: "{$updateAddress['company']}"
+    telephone: "{$updateAddress['telephone']}"
+    fax: "{$updateAddress['fax']}"
+    postcode: "{$updateAddress['postcode']}"
+    city: "{$updateAddress['city']}"
+    firstname: "{$updateAddress['firstname']}"
+    lastname: "{$updateAddress['lastname']}"
+    middlename: "{$updateAddress['middlename']}"
+    prefix: "{$updateAddress['prefix']}"
+    suffix: "{$updateAddress['suffix']}"
+    vat_id: "{$updateAddress['vat_id']}"
     default_shipping: {$defaultShippingText}
     default_billing: {$defaultBillingText}
   }) {
@@ -102,8 +112,6 @@ public function testAddCustomerAddressWithValidCredentials()
   }
 }
 MUTATION;
-        $userName = 'customer@example.com';
-        $password = 'password';
         /** @var CustomerTokenServiceInterface $customerTokenService */
         $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
         $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
@@ -112,65 +120,64 @@ public function testAddCustomerAddressWithValidCredentials()
         $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
         $customer = $customerRepository->get($userName);
         $response = $this->graphQlQuery($mutation, [], '', $headerMap);
-        $this->assertArrayHasKey('customerAddressCreate', $response);
-        $this->assertArrayHasKey('customer_id', $response['customerAddressCreate']);
-        $this->assertEquals($customer->getId(), $response['customerAddressCreate']['customer_id']);
-        $this->assertArrayHasKey('id', $response['customerAddressCreate']);
+        $this->assertArrayHasKey('customerAddressUpdate', $response);
+        $this->assertArrayHasKey('customer_id', $response['customerAddressUpdate']);
+        $this->assertEquals($customer->getId(), $response['customerAddressUpdate']['customer_id']);
+        $this->assertArrayHasKey('id', $response['customerAddressUpdate']);
         /** @var AddressRepositoryInterface $addressRepository */
         $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-        $addressId = $response['customerAddressCreate']['id'];
         $address = $addressRepository->getById($addressId);
-        $this->assertEquals($address->getId(), $response['customerAddressCreate']['id']);
-        $this->assertCustomerAddressesFields($address, $response['customerAddressCreate']);
-        $this->assertCustomerAddressesFields($address, $newAddress);
+        $this->assertEquals($address->getId(), $response['customerAddressUpdate']['id']);
+        $this->assertCustomerAddressesFields($address, $response['customerAddressUpdate']);
+        $this->assertCustomerAddressesFields($address, $updateAddress);
     }
 
     /**
-     * Verify customers without credentials create new address
+     * Verify customers without credentials update address
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testAddCustomerAddressWithoutCredentials()
+    public function testUpdateCustomerAddressWithoutCredentials()
     {
+        $userName = 'customer@example.com';
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get($userName);
+        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
+        $addresses = $customer->getAddresses();
+        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+        $address = current($addresses);
+        $addressId = $address->getId();
         $mutation
             = <<<MUTATION
-mutation{
-  customerAddressCreate(input: {
-  	prefix: "Mr."
-    firstname: "John"
-    middlename: "A"
-    lastname: "Smith"
-    telephone: "123456789"
-    street: ["Line 1", "Line 2"]
-    city: "Test City"
-    region_id: 1
-    country_id: US
-    postcode: "9999"
-    default_shipping: true
-    default_billing: false
+mutation {
+  customerAddressUpdate(id:{$addressId}, input: {
+  	city: "New City"
+    postcode: "5555"
   }) {
     id
     customer_id
-    firstname
-    lastname
+    postcode
   }
 }
 MUTATION;
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Current customer does not have access to the resource "customer"');
+            'Current customer does not have access to the resource "customer_address"');
         $this->graphQlQuery($mutation);
     }
 
     /**
-     * Verify customers with valid credentials update address
+     * Verify customers with credentials update address
+     * with missing required Firstname attribute
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testUpdateCustomerAddressWithValidCredentials()
+    public function testUpdateCustomerAddressWithMissingAttributeWithValidCredentials()
     {
         $userName = 'customer@example.com';
         $password = 'password';
@@ -188,7 +195,7 @@ public function testUpdateCustomerAddressWithValidCredentials()
             'fax' => '123123123',
             'postcode' => '7777',
             'city' => 'City Name',
-            'firstname' => 'Adam',
+            'firstname' => '', //empty name
             'lastname' => 'Phillis',
             'middlename' => 'A',
             'prefix' => 'Mr.',
@@ -258,219 +265,6 @@ public function testUpdateCustomerAddressWithValidCredentials()
     default_billing
   }
 }
-MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
-        $this->assertArrayHasKey('customerAddressUpdate', $response);
-        $this->assertArrayHasKey('customer_id', $response['customerAddressUpdate']);
-        $this->assertEquals($customer->getId(), $response['customerAddressUpdate']['customer_id']);
-        $this->assertArrayHasKey('id', $response['customerAddressUpdate']);
-        /** @var AddressRepositoryInterface $addressRepository */
-        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-        $address = $addressRepository->getById($addressId);
-        $this->assertEquals($address->getId(), $response['customerAddressUpdate']['id']);
-        $this->assertCustomerAddressesFields($address, $response['customerAddressUpdate']);
-        $this->assertCustomerAddressesFields($address, $updateAddress);
-    }
-
-    /**
-     * Verify customers without credentials update address
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testUpdateCustomerAddressWithoutCredentials()
-    {
-        $userName = 'customer@example.com';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = current($addresses);
-        $addressId = $address->getId();
-        $mutation
-            = <<<MUTATION
-mutation {
-  customerAddressUpdate(id:{$addressId}, input: {
-  	city: "New City"
-    postcode: "5555"
-  }) {
-    id
-    customer_id
-    postcode
-  }
-}
-MUTATION;
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Current customer does not have access to the resource "customer"');
-        $this->graphQlQuery($mutation);
-    }
-
-    /**
-     * Verify customers with valid credentials with a customer bearer token
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testDeleteCustomerAddressWithValidCredentials()
-    {
-        $userName = 'customer@example.com';
-        $password = 'password';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = end($addresses);
-        $addressId = $address->getId();
-        $mutation
-            = <<<MUTATION
-mutation {
-  customerAddressDelete(id: {$addressId})
-}
-MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
-        $this->assertArrayHasKey('customerAddressDelete', $response);
-        $this->assertEquals(true, $response['customerAddressDelete']);
-    }
-
-    /**
-     * Verify customers without credentials delete address
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testDeleteCustomerAddressWithoutCredentials()
-    {
-        $userName = 'customer@example.com';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = current($addresses);
-        $addressId = $address->getId();
-        $mutation
-            = <<<MUTATION
-mutation {
-  customerAddressDelete(id: {$addressId})
-}
-MUTATION;
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Current customer does not have access to the resource "customer"');
-        $this->graphQlQuery($mutation);
-    }
-
-    /**
-     * Verify customers with valid credentials delete default shipping address
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testDeleteDefaultShippingCustomerAddressWithValidCredentials()
-    {
-        $userName = 'customer@example.com';
-        $password = 'password';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = end($addresses);
-        $address->setIsDefaultShipping(true);
-        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-        $addressRepository->save($address);
-        $addressId = $address->getId();
-        $mutation
-            = <<<MUTATION
-mutation {
-  customerAddressDelete(id: {$addressId})
-}
-MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Customer Address ' . $addressId . ' is set as default shipping address and can not be deleted');
-        $this->graphQlQuery($mutation, [], '', $headerMap);
-    }
-
-    /**
-     * Verify customers with valid credentials delete default billing address
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testDeleteDefaultBillingCustomerAddressWithValidCredentials()
-    {
-        $userName = 'customer@example.com';
-        $password = 'password';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = end($addresses);
-        $address->setIsDefaultBilling(true);
-        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-        $addressRepository->save($address);
-        $addressId = $address->getId();
-        $mutation
-            = <<<MUTATION
-mutation {
-  customerAddressDelete(id: {$addressId})
-}
-MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Customer Address ' . $addressId . ' is set as default billing address and can not be deleted');
-        $this->graphQlQuery($mutation, [], '', $headerMap);
-    }
-
-    /**
-     * Verify customers with valid credentials delete non exist address
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testDeleteNonExistCustomerAddressWithValidCredentials()
-    {
-        $userName = 'customer@example.com';
-        $password = 'password';
-        $mutation
-            = <<<MUTATION
-mutation {
-  customerAddressDelete(id: 9999)
-}
 MUTATION;
         /** @var CustomerTokenServiceInterface $customerTokenService */
         $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
@@ -478,7 +272,7 @@ public function testDeleteNonExistCustomerAddressWithValidCredentials()
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Address id 9999 does not exist.');
+            'Required parameter firstname is missing');
         $this->graphQlQuery($mutation, [], '', $headerMap);
     }
 

From 6c6fdbcc1f959b0dfe2b85f1f814ce2590306514 Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Mon, 1 Oct 2018 21:43:03 -0300
Subject: [PATCH 040/932] GraphQL-57: Improve doc

---
 .../Model/Resolver/Address/AddressConfigProvider.php            | 2 +-
 .../Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php    | 2 +-
 .../Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php    | 2 +-
 .../Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php
index 8f16d2890f5e1..363071b7b860d 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php
@@ -13,7 +13,7 @@
 use Magento\Eav\Model\Config;
 
 /**
- * Customers Address, used for GraphQL request processing.
+ * Customers address configuration, used for GraphQL request processing.
  */
 class AddressConfigProvider
 {
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
index 0420a9d91049a..1737ae8018f0a 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
@@ -22,7 +22,7 @@
 use Magento\CustomerGraphQl\Model\Resolver\Address\AddressConfigProvider;
 
 /**
- * Customers Address, used for GraphQL request processing.
+ * Customers address create, used for GraphQL request processing.
  */
 class AddressCreate implements ResolverInterface
 {
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php
index 540d7645cc657..e636f3eceeed8 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php
@@ -20,7 +20,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
- * Customers Address, used for GraphQL request processing.
+ * Customers address delete, used for GraphQL request processing.
  */
 class AddressDelete implements ResolverInterface
 {
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
index 800ba5f2804f4..f0841adcf8127 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
@@ -24,7 +24,7 @@
 use Magento\CustomerGraphQl\Model\Resolver\Address\AddressConfigProvider;
 
 /**
- * Customers Address, used for GraphQL request processing.
+ * Customers address update, used for GraphQL request processing.
  */
 class AddressUpdate implements ResolverInterface
 {

From 1b085c963f49d6e11319ada0f3ed0533728fbad9 Mon Sep 17 00:00:00 2001
From: vprohorov <prohorov.vital@gmail.com>
Date: Tue, 2 Oct 2018 15:08:19 +0300
Subject: [PATCH 041/932] MAGETWO-94444: [2.3] Order total value is limited by
 8 round digits

- Changing precision in database schema
---
 app/code/Magento/Quote/etc/db_schema.xml |  36 +++---
 app/code/Magento/Sales/etc/db_schema.xml | 146 +++++++++++------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 725825e976ad7..b222fdad40598 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -37,9 +37,9 @@
                 comment="Store Currency Code"/>
         <column xsi:type="varchar" name="quote_currency_code" nullable="true" length="255"
                 comment="Quote Currency Code"/>
-        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Grand Total"/>
-        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Base Grand Total"/>
         <column xsi:type="varchar" name="checkout_method" nullable="true" length="255" comment="Checkout Method"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
@@ -68,19 +68,19 @@
         <column xsi:type="varchar" name="coupon_code" nullable="true" length="255" comment="Coupon Code"/>
         <column xsi:type="varchar" name="global_currency_code" nullable="true" length="255"
                 comment="Global Currency Code"/>
-        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base To Global Rate"/>
-        <column xsi:type="decimal" name="base_to_quote_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_to_quote_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base To Quote Rate"/>
         <column xsi:type="varchar" name="customer_taxvat" nullable="true" length="255" comment="Customer Taxvat"/>
         <column xsi:type="varchar" name="customer_gender" nullable="true" length="255" comment="Customer Gender"/>
-        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
-        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Subtotal"/>
-        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Subtotal With Discount"/>
-        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal With Discount"/>
         <column xsi:type="int" name="is_changed" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Is Changed"/>
@@ -143,13 +143,13 @@
                 comment="Shipping Description"/>
         <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="false" default="0"
                 comment="Weight"/>
-        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Subtotal"/>
-        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Base Subtotal"/>
-        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="subtotal_with_discount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Subtotal With Discount"/>
-        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Base Subtotal With Discount"/>
         <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
                 default="0" comment="Tax Amount"/>
@@ -167,9 +167,9 @@
                 default="0" comment="Discount Amount"/>
         <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
                 nullable="false" default="0" comment="Base Discount Amount"/>
-        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Grand Total"/>
-        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Base Grand Total"/>
         <column xsi:type="text" name="customer_notes" nullable="true" comment="Customer Notes"/>
         <column xsi:type="text" name="applied_taxes" nullable="true" comment="Applied Taxes"/>
@@ -179,9 +179,9 @@
                 nullable="true" comment="Shipping Discount Amount"/>
         <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Shipping Discount Amount"/>
-        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Incl Tax"/>
-        <column xsi:type="decimal" name="base_subtotal_total_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_subtotal_total_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Total Incl Tax"/>
         <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Amount"/>
@@ -372,9 +372,9 @@
                 comment="Base Cost"/>
         <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Price Incl Tax"/>
-        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Price Incl Tax"/>
-        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Row Total Incl Tax"/>
         <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Row Total Incl Tax"/>
diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
index fda6e75cf00c6..d09c5daa12edd 100644
--- a/app/code/Magento/Sales/etc/db_schema.xml
+++ b/app/code/Magento/Sales/etc/db_schema.xml
@@ -30,7 +30,7 @@
                 nullable="true" comment="Base Discount Invoiced"/>
         <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Discount Refunded"/>
-        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
         <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Shipping Amount"/>
@@ -44,13 +44,13 @@
                 nullable="true" comment="Base Shipping Tax Amount"/>
         <column xsi:type="decimal" name="base_shipping_tax_refunded" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Shipping Tax Refunded"/>
-        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Subtotal"/>
-        <column xsi:type="decimal" name="base_subtotal_canceled" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_subtotal_canceled" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Canceled"/>
-        <column xsi:type="decimal" name="base_subtotal_invoiced" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_subtotal_invoiced" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Invoiced"/>
-        <column xsi:type="decimal" name="base_subtotal_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_subtotal_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Refunded"/>
         <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Tax Amount"/>
@@ -62,23 +62,23 @@
                 comment="Base Tax Refunded"/>
         <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base To Global Rate"/>
-        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base To Order Rate"/>
-        <column xsi:type="decimal" name="base_total_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_total_canceled" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Total Canceled"/>
-        <column xsi:type="decimal" name="base_total_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_total_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Total Invoiced"/>
-        <column xsi:type="decimal" name="base_total_invoiced_cost" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_total_invoiced_cost" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Total Invoiced Cost"/>
-        <column xsi:type="decimal" name="base_total_offline_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_total_offline_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Total Offline Refunded"/>
-        <column xsi:type="decimal" name="base_total_online_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_total_online_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Total Online Refunded"/>
-        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Total Paid"/>
         <column xsi:type="decimal" name="base_total_qty_ordered" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Total Qty Ordered"/>
-        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Total Refunded"/>
         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Discount Amount"/>
@@ -88,7 +88,7 @@
                 comment="Discount Invoiced"/>
         <column xsi:type="decimal" name="discount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Discount Refunded"/>
-        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Grand Total"/>
         <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Shipping Amount"/>
@@ -106,13 +106,13 @@
                 comment="Store To Base Rate"/>
         <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Store To Order Rate"/>
-        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
-        <column xsi:type="decimal" name="subtotal_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal_canceled" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Canceled"/>
-        <column xsi:type="decimal" name="subtotal_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Invoiced"/>
-        <column xsi:type="decimal" name="subtotal_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Refunded"/>
         <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Tax Amount"/>
@@ -126,15 +126,15 @@
                 comment="Total Canceled"/>
         <column xsi:type="decimal" name="total_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Total Invoiced"/>
-        <column xsi:type="decimal" name="total_offline_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_offline_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Total Offline Refunded"/>
-        <column xsi:type="decimal" name="total_online_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_online_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Total Online Refunded"/>
-        <column xsi:type="decimal" name="total_paid" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="total_paid" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Total Paid"/>
         <column xsi:type="decimal" name="total_qty_ordered" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Total Qty Ordered"/>
-        <column xsi:type="decimal" name="total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Total Refunded"/>
         <column xsi:type="smallint" name="can_ship_partially" padding="5" unsigned="true" nullable="true"
                 identity="false" comment="Can Ship Partially"/>
@@ -173,17 +173,17 @@
                 nullable="true" comment="Base Adjustment Positive"/>
         <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Shipping Discount Amount"/>
-        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Incl Tax"/>
-        <column xsi:type="decimal" name="base_total_due" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_total_due" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Total Due"/>
-        <column xsi:type="decimal" name="payment_authorization_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="payment_authorization_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Payment Authorization Amount"/>
         <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Shipping Discount Amount"/>
-        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Incl Tax"/>
-        <column xsi:type="decimal" name="total_due" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="total_due" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Total Due"/>
         <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Weight"/>
@@ -304,13 +304,13 @@
         <column xsi:type="varchar" name="store_name" nullable="true" length="255" comment="Store Name"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Customer ID"/>
-        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
-        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_total_paid" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Total Paid"/>
-        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Grand Total"/>
-        <column xsi:type="decimal" name="total_paid" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="total_paid" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Total Paid"/>
         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
         <column xsi:type="varchar" name="base_currency_code" nullable="true" length="3" comment="Base Currency Code"/>
@@ -326,7 +326,7 @@
                 comment="Shipping Method Name"/>
         <column xsi:type="varchar" name="customer_email" nullable="true" length="255" comment="Customer Email"/>
         <column xsi:type="varchar" name="customer_group" nullable="true" length="255" comment="Customer Group"/>
-        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
         <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Shipping and handling amount"/>
@@ -929,7 +929,7 @@
                 comment="Entity ID"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
                 comment="Store ID"/>
-        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
         <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Shipping Tax Amount"/>
@@ -945,15 +945,15 @@
                 nullable="true" comment="Base Discount Amount"/>
         <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base To Order Rate"/>
-        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Grand Total"/>
         <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Shipping Amount"/>
-        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Incl Tax"/>
-        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Incl Tax"/>
-        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Store To Base Rate"/>
         <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Shipping Amount"/>
@@ -961,9 +961,9 @@
                 comment="Total Qty"/>
         <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base To Global Rate"/>
-        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
-        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Subtotal"/>
         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Discount Amount"/>
@@ -1006,7 +1006,7 @@
                 comment="Shipping Incl Tax"/>
         <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Shipping Incl Tax"/>
-        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Total Refunded"/>
         <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
                 comment="Discount Description"/>
@@ -1077,15 +1077,15 @@
         <column xsi:type="varchar" name="shipping_address" nullable="true" length="255" comment="Shipping Address"/>
         <column xsi:type="varchar" name="shipping_information" nullable="true" length="255"
                 comment="Shipping Method Name"/>
-        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
         <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Shipping and handling amount"/>
-        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Grand Total"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
-        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="entity_id"/>
@@ -1143,11 +1143,11 @@
                 comment="Base Price"/>
         <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Tax Amount"/>
-        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Row Total"/>
         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Discount Amount"/>
-        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Row Total"/>
         <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Discount Amount"/>
@@ -1230,15 +1230,15 @@
                 nullable="true" comment="Base Discount Amount"/>
         <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base To Order Rate"/>
-        <column xsi:type="decimal" name="grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Grand Total"/>
         <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Adjustment Negative"/>
-        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Incl Tax"/>
         <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Shipping Amount"/>
-        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Incl Tax"/>
         <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Adjustment Negative"/>
@@ -1250,15 +1250,15 @@
                 comment="Base To Global Rate"/>
         <column xsi:type="decimal" name="base_adjustment" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Adjustment"/>
-        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Subtotal"/>
         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Discount Amount"/>
-        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
         <column xsi:type="decimal" name="adjustment" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Adjustment"/>
-        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
         <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Adjustment Positive"/>
@@ -1362,7 +1362,7 @@
         <column xsi:type="varchar" name="billing_name" nullable="true" length="255" comment="Billing Name"/>
         <column xsi:type="int" name="state" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Status"/>
-        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
         <column xsi:type="varchar" name="order_status" nullable="true" length="32" comment="Order Status"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
@@ -1376,7 +1376,7 @@
         <column xsi:type="varchar" name="payment_method" nullable="true" length="32" comment="Payment Method"/>
         <column xsi:type="varchar" name="shipping_information" nullable="true" length="255"
                 comment="Shipping Method Name"/>
-        <column xsi:type="decimal" name="subtotal" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
         <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Shipping and handling amount"/>
@@ -1593,19 +1593,19 @@
                 default="0" comment="Total Qty Ordered"/>
         <column xsi:type="decimal" name="total_qty_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
                 default="0" comment="Total Qty Invoiced"/>
-        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Income Amount"/>
-        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Revenue Amount"/>
-        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Profit Amount"/>
-        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Invoiced Amount"/>
-        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Canceled Amount"/>
-        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Total Paid Amount"/>
-        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Refunded Amount"/>
         <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
                 default="0" comment="Total Tax Amount"/>
@@ -1647,19 +1647,19 @@
                 default="0" comment="Total Qty Ordered"/>
         <column xsi:type="decimal" name="total_qty_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
                 default="0" comment="Total Qty Invoiced"/>
-        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_income_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Income Amount"/>
-        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_revenue_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Revenue Amount"/>
-        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_profit_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Profit Amount"/>
-        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_invoiced_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Invoiced Amount"/>
-        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_canceled_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Canceled Amount"/>
-        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="total_paid_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Total Paid Amount"/>
-        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Refunded Amount"/>
         <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
                 default="0" comment="Total Tax Amount"/>
@@ -1737,11 +1737,11 @@
         <column xsi:type="varchar" name="order_status" nullable="false" length="50" comment="Order Status"/>
         <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Orders Count"/>
-        <column xsi:type="decimal" name="refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Refunded"/>
-        <column xsi:type="decimal" name="online_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="online_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Online Refunded"/>
-        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Offline Refunded"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="id"/>
@@ -1767,11 +1767,11 @@
         <column xsi:type="varchar" name="order_status" nullable="true" length="50" comment="Order Status"/>
         <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Orders Count"/>
-        <column xsi:type="decimal" name="refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Refunded"/>
-        <column xsi:type="decimal" name="online_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="online_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Online Refunded"/>
-        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="offline_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Offline Refunded"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="id"/>

From 6436bcb6100394faa8519a709199de550e6fbc7b Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Tue, 2 Oct 2018 10:09:19 -0300
Subject: [PATCH 042/932] GraphQL-57: Remove unused dependencies

---
 .../Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php     | 1 -
 .../Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
index 1737ae8018f0a..f336d8d73e567 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
@@ -8,7 +8,6 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
index f0841adcf8127..5a77ca8091104 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
@@ -8,7 +8,6 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;

From bfd4fc10b58326a8201b7ba051fc7e1fbb5254ce Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Tue, 2 Oct 2018 16:27:39 -0300
Subject: [PATCH 043/932] GraphQL-57: Refactor address update and data provider

---
 .../Resolver/Address/AddressDataProvider.php  | 37 ++++++++++--
 .../Model/Resolver/AddressUpdate.php          |  9 ---
 .../Customer/CustomerAddressCreateTest.php    | 58 ++++---------------
 .../Customer/CustomerAddressUpdateTest.php    | 48 +--------------
 4 files changed, 45 insertions(+), 107 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
index b794c4ef58794..5f93ad82a3760 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
@@ -8,7 +8,11 @@
 namespace Magento\CustomerGraphQl\Model\Resolver\Address;
 
 use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResourceModel;
+use Magento\Customer\Model\CustomerFactory;
 use Magento\Framework\Webapi\ServiceOutputProcessor;
 use Magento\Framework\Serialize\SerializerInterface;
 
@@ -27,16 +31,32 @@ class AddressDataProvider
      */
     private $jsonSerializer;
 
+    /**
+     * @var CustomerResourceModel
+     */
+    private $customerResourceModel;
+
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
+
     /**
      * @param ServiceOutputProcessor $serviceOutputProcessor
      * @param SerializerInterface $jsonSerializer
+     * @param CustomerResourceModel $customerResourceModel
+     * @param CustomerFactory $customerFactory
      */
     public function __construct(
         ServiceOutputProcessor $serviceOutputProcessor,
-        SerializerInterface $jsonSerializer
+        SerializerInterface $jsonSerializer,
+        CustomerResourceModel $customerResourceModel,
+        CustomerFactory $customerFactory
     ) {
         $this->serviceOutputProcessor = $serviceOutputProcessor;
         $this->jsonSerializer = $jsonSerializer;
+        $this->customerResourceModel = $customerResourceModel;
+        $this->customerFactory = $customerFactory;
     }
 
     /**
@@ -52,12 +72,19 @@ public function processCustomerAddress(AddressInterface $addressObject) : array
             AddressRepositoryInterface::class,
             'getById'
         );
-        if (isset($address['extension_attributes'])) {
-            $address = array_merge($address, $address['extension_attributes']);
+        $customerModel = $this->customerFactory->create();
+        $this->customerResourceModel->load($customerModel, $addressObject->getCustomerId());
+        $address[CustomerInterface::DEFAULT_BILLING] =
+            ($addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId()) ? true : false;
+        $address[CustomerInterface::DEFAULT_SHIPPING] =
+            ($addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId()) ? true : false;
+
+        if (isset($address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
+            $address = array_merge($address, $address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY]);
         }
         $customAttributes = [];
-        if (isset($address['custom_attributes'])) {
-            foreach ($address['custom_attributes'] as $attribute) {
+        if (isset($address[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES])) {
+            foreach ($address[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES] as $attribute) {
                 $isArray = false;
                 if (is_array($attribute['value'])) {
                     $isArray = true;
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
index 5a77ca8091104..63111138e3d73 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
@@ -10,7 +10,6 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
-use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -32,11 +31,6 @@ class AddressUpdate implements ResolverInterface
      */
     private $addressRepositoryInterface;
 
-    /**
-     * @var AddressInterfaceFactory
-     */
-    private $addressInterfaceFactory;
-
     /**
      * @var AddressDataProvider
      */
@@ -49,18 +43,15 @@ class AddressUpdate implements ResolverInterface
 
     /**
      * @param AddressRepositoryInterface $addressRepositoryInterface
-     * @param AddressInterfaceFactory $addressInterfaceFactory
      * @param AddressDataProvider $addressDataProvider
      * @param AddressConfigProvider $addressConfigProvider
      */
     public function __construct(
         AddressRepositoryInterface $addressRepositoryInterface,
-        AddressInterfaceFactory $addressInterfaceFactory,
         AddressDataProvider $addressDataProvider,
         AddressConfigProvider $addressConfigProvider
     ) {
         $this->addressRepositoryInterface = $addressRepositoryInterface;
-        $this->addressInterfaceFactory = $addressInterfaceFactory;
         $this->addressDataProvider = $addressDataProvider;
         $this->addressConfigProvider = $addressConfigProvider;
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php
index 2db574c508827..4e2d248b97eb9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php
@@ -45,7 +45,7 @@ public function testAddCustomerAddressWithValidCredentials()
             'prefix' => 'Mr.',
             'suffix' => 'Jr.',
             'vat_id' => '1',
-            'default_shipping' => false,
+            'default_shipping' => true,
             'default_billing' => false
         ];
         $defaultShippingText = $newAddress['default_shipping'] ? "true": "false";
@@ -172,56 +172,20 @@ public function testAddCustomerAddressWithoutCredentials()
      */
     public function testAddCustomerAddressWithMissingAttributeWithValidCredentials()
     {
-        $newAddress = [
-            'region' => [
-                'region' => 'Alaska',
-                'region_id' => 4,
-                'region_code' => 'AK'
-            ],
-            'region_id' => 4,
-            'country_id' => 'US',
-            'street' => ['Line 1 Street', 'Line 2'],
-            'company' => 'Company name',
-            'telephone' => '123456789',
-            'fax' => '123123123',
-            'postcode' => '7777',
-            'city' => 'City Name',
-            'firstname' => '', //empty firstname
-            'lastname' => 'Phillis',
-            'middlename' => 'A',
-            'prefix' => 'Mr.',
-            'suffix' => 'Jr.',
-            'vat_id' => '1',
-            'default_shipping' => false,
-            'default_billing' => false
-        ];
-        $defaultShippingText = $newAddress['default_shipping'] ? "true": "false";
-        $defaultBillingText = $newAddress['default_billing'] ? "true": "false";
         $mutation
             = <<<MUTATION
 mutation {
   customerAddressCreate(input: {
-    region: {
-        region: "{$newAddress['region']['region']}"
-        region_id: {$newAddress['region']['region_id']}
-        region_code: "{$newAddress['region']['region_code']}"
-    }
-    region_id: {$newAddress['region_id']}
-    country_id: {$newAddress['country_id']}
-    street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
-    company: "{$newAddress['company']}"
-    telephone: "{$newAddress['telephone']}"
-    fax: "{$newAddress['fax']}"
-    postcode: "{$newAddress['postcode']}"
-    city: "{$newAddress['city']}"
-    firstname: "{$newAddress['firstname']}"
-    lastname: "{$newAddress['lastname']}"
-    middlename: "{$newAddress['middlename']}"
-    prefix: "{$newAddress['prefix']}"
-    suffix: "{$newAddress['suffix']}"
-    vat_id: "{$newAddress['vat_id']}"
-    default_shipping: {$defaultShippingText}
-    default_billing: {$defaultBillingText}
+    region_id: 4
+    country_id: US
+    street: ["Line 1 Street","Line 2"]
+    company: "Company name"
+    telephone: "123456789"
+    fax: "123123123"
+    postcode: "7777"
+    city: "City Name"
+    firstname: ""
+    lastname: "Phillis"
   }) {
     id
     customer_id
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php
index f8149c9067038..3f2cad1039452 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php
@@ -181,31 +181,6 @@ public function testUpdateCustomerAddressWithMissingAttributeWithValidCredential
     {
         $userName = 'customer@example.com';
         $password = 'password';
-        $updateAddress = [
-            'region' => [
-                'region' => 'Alaska',
-                'region_id' => 4,
-                'region_code' => 'AK'
-            ],
-            'region_id' => 4,
-            'country_id' => 'US',
-            'street' => ['Line 1 Street', 'Line 2'],
-            'company' => 'Company Name',
-            'telephone' => '123456789',
-            'fax' => '123123123',
-            'postcode' => '7777',
-            'city' => 'City Name',
-            'firstname' => '', //empty name
-            'lastname' => 'Phillis',
-            'middlename' => 'A',
-            'prefix' => 'Mr.',
-            'suffix' => 'Jr.',
-            'vat_id' => '1',
-            'default_shipping' => true,
-            'default_billing' => true
-        ];
-        $defaultShippingText = $updateAddress['default_shipping'] ? "true": "false";
-        $defaultBillingText = $updateAddress['default_billing'] ? "true": "false";
         /** @var CustomerRepositoryInterface $customerRepository */
         $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
         $customer = $customerRepository->get($userName);
@@ -218,27 +193,8 @@ public function testUpdateCustomerAddressWithMissingAttributeWithValidCredential
             = <<<MUTATION
 mutation {
   customerAddressUpdate(id: {$addressId}, input: {
-    region: {
-        region: "{$updateAddress['region']['region']}"
-        region_id: {$updateAddress['region']['region_id']}
-        region_code: "{$updateAddress['region']['region_code']}"
-    }
-    region_id: {$updateAddress['region_id']}
-    country_id: {$updateAddress['country_id']}
-    street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
-    company: "{$updateAddress['company']}"
-    telephone: "{$updateAddress['telephone']}"
-    fax: "{$updateAddress['fax']}"
-    postcode: "{$updateAddress['postcode']}"
-    city: "{$updateAddress['city']}"
-    firstname: "{$updateAddress['firstname']}"
-    lastname: "{$updateAddress['lastname']}"
-    middlename: "{$updateAddress['middlename']}"
-    prefix: "{$updateAddress['prefix']}"
-    suffix: "{$updateAddress['suffix']}"
-    vat_id: "{$updateAddress['vat_id']}"
-    default_shipping: {$defaultShippingText}
-    default_billing: {$defaultBillingText}
+    firstname: ""
+    lastname: "Phillis"
   }) {
     id
     customer_id

From 71d242cd02e08818a816f25102f0792b723890d8 Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Tue, 2 Oct 2018 18:03:35 -0300
Subject: [PATCH 044/932] GraphQL-57: Fix cyclomatic complexity in
 addressDataProvider

---
 .../Resolver/Address/AddressDataProvider.php  | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
index 5f93ad82a3760..2b0cbe036ada7 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
@@ -59,6 +59,24 @@ public function __construct(
         $this->customerFactory = $customerFactory;
     }
 
+    /**
+     * Curate shipping and billing default options
+     *
+     * @param array $address
+     * @param AddressInterface $addressObject
+     * @return null
+     */
+    private function curateAddressDefaultValues(array $address, AddressInterface $addressObject) : array
+    {
+        $customerModel = $this->customerFactory->create();
+        $this->customerResourceModel->load($customerModel, $addressObject->getCustomerId());
+        $address[CustomerInterface::DEFAULT_BILLING] =
+            ($addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId()) ? true : false;
+        $address[CustomerInterface::DEFAULT_SHIPPING] =
+            ($addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId()) ? true : false;
+        return $address;
+    }
+
     /**
      * Transform single customer address data from object to in array format
      *
@@ -72,12 +90,7 @@ public function processCustomerAddress(AddressInterface $addressObject) : array
             AddressRepositoryInterface::class,
             'getById'
         );
-        $customerModel = $this->customerFactory->create();
-        $this->customerResourceModel->load($customerModel, $addressObject->getCustomerId());
-        $address[CustomerInterface::DEFAULT_BILLING] =
-            ($addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId()) ? true : false;
-        $address[CustomerInterface::DEFAULT_SHIPPING] =
-            ($addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId()) ? true : false;
+        $address = $this->curateAddressDefaultValues($address, $addressObject);
 
         if (isset($address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
             $address = array_merge($address, $address[CustomAttributesDataInterface::EXTENSION_ATTRIBUTES_KEY]);

From 4927e565cc54f9395ba8ef4bcf3d945cd3020052 Mon Sep 17 00:00:00 2001
From: Danny Verkade <danny@cream.nl>
Date: Wed, 3 Oct 2018 10:29:15 +0200
Subject: [PATCH 045/932] Fixed coding style errors.

---
 .../Magento/Catalog/Model/Product/Option/Validator/Select.php  | 3 +++
 .../testsuite/Magento/Catalog/Api/_files/product_options.php   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
index af37c16c4053e..209531f599811 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Validator/Select.php
@@ -8,6 +8,9 @@
 
 use Magento\Catalog\Model\Product\Option;
 
+/**
+ * Select validator class
+ */
 class Select extends DefaultValidator
 {
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
index e61e6061f4fc2..8a00de1be094f 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/_files/product_options.php
@@ -153,4 +153,4 @@
         'price_type' => 'fixed',
         'sku' => 'time option sku',
     ],
-];
\ No newline at end of file
+];

From 468b290efea26bb305ea9a81f80c8eca05ed4074 Mon Sep 17 00:00:00 2001
From: Pablo Fantini <paemfa@gmail.com>
Date: Fri, 5 Oct 2018 09:54:38 -0300
Subject: [PATCH 046/932] GraphQL-57: Curate address data on
 customerDataProvider

---
 .../Resolver/Address/AddressDataProvider.php  |  8 +++++---
 .../Customer/CustomerDataProvider.php         | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
index 2b0cbe036ada7..9726e8c0564a9 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
@@ -64,16 +64,18 @@ public function __construct(
      *
      * @param array $address
      * @param AddressInterface $addressObject
-     * @return null
+     * @return array
      */
     private function curateAddressDefaultValues(array $address, AddressInterface $addressObject) : array
     {
         $customerModel = $this->customerFactory->create();
         $this->customerResourceModel->load($customerModel, $addressObject->getCustomerId());
         $address[CustomerInterface::DEFAULT_BILLING] =
-            ($addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId()) ? true : false;
+            ($customerModel->getDefaultBillingAddress()
+                && $addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId()) ? true : false;
         $address[CustomerInterface::DEFAULT_SHIPPING] =
-            ($addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId()) ? true : false;
+            ($customerModel->getDefaultShippingAddress()
+                && $addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId()) ? true : false;
         return $address;
     }
 
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/CustomerDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/CustomerDataProvider.php
index 1a942a2ab149a..4f238c71cfc6b 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/CustomerDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer/CustomerDataProvider.php
@@ -67,6 +67,25 @@ public function getCustomerById(int $customerId) : array
         return $this->processCustomer($customerObject);
     }
 
+    /**
+     * Curate default shipping and default billing keys
+     *
+     * @param array $arrayAddress
+     * @return array
+     */
+    private function curateAddressData(array $arrayAddress) : array
+    {
+        foreach ($arrayAddress as $key => $address) {
+            if (!isset($address['default_shipping'])) {
+                $arrayAddress[$key]['default_shipping'] = false;
+            }
+            if (!isset($address['default_billing'])) {
+                $arrayAddress[$key]['default_billing'] = false;
+            }
+        }
+        return $arrayAddress;
+    }
+
     /**
      * Transform single customer data from object to in array format
      *
@@ -80,6 +99,7 @@ private function processCustomer(CustomerInterface $customerObject) : array
             CustomerRepositoryInterface::class,
             'get'
         );
+        $customer['addresses'] = $this->curateAddressData($customer['addresses']);
         if (isset($customer['extension_attributes'])) {
             $customer = array_merge($customer, $customer['extension_attributes']);
         }

From 935dfa867222d41bf231a31d06023fe2b4c637bb Mon Sep 17 00:00:00 2001
From: Jayanka <jayan@codilar.com>
Date: Sat, 6 Oct 2018 17:27:20 +0530
Subject: [PATCH 047/932] thousand separator removed from number format

---
 app/code/Magento/Quote/Model/Quote/Address/Total.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 30ae186ad6230..e45678ea2138c 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -56,7 +56,7 @@ public function __construct(
     public function setTotalAmount($code, $amount)
     {
         /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
-        $amount = is_float($amount) ? (float)number_format($amount, 4) : $amount;
+        $amount = is_float($amount) ? (float)number_format($amount, 4, ".", "") : $amount;
 
         $this->totalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
@@ -77,7 +77,7 @@ public function setTotalAmount($code, $amount)
     public function setBaseTotalAmount($code, $amount)
     {
         /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
-        $amount = is_float($amount) ? (float)number_format($amount, 4) : $amount;
+        $amount = is_float($amount) ? (float)number_format($amount, 4, ".", "") : $amount;
 
         $this->baseTotalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
@@ -173,7 +173,8 @@ public function getAllBaseTotalAmounts()
     //@codeCoverageIgnoreEnd
 
     /**
-     * Set the full info, which is used to capture tax related information. If a string is used, it is assumed to be serialized.
+     * Set the full info, which is used to capture tax related information.
+     * If a string is used, it is assumed to be serialized.
      *
      * @param array|string $info
      * @return $this

From 1f5b849f76c74340511905c7e4d46329448128f2 Mon Sep 17 00:00:00 2001
From: Jayanka <jayan@codilar.com>
Date: Sat, 6 Oct 2018 17:59:28 +0530
Subject: [PATCH 048/932] use round instead of number_format to round the total
 amount

---
 app/code/Magento/Quote/Model/Quote/Address/Total.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index e45678ea2138c..7b24e60f9749f 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -56,7 +56,7 @@ public function __construct(
     public function setTotalAmount($code, $amount)
     {
         /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
-        $amount = is_float($amount) ? (float)number_format($amount, 4, ".", "") : $amount;
+        $amount = is_float($amount) ? round($amount, 4) : $amount;
 
         $this->totalAmounts[$code] = $amount;
         if ($code != 'subtotal') {
@@ -77,7 +77,7 @@ public function setTotalAmount($code, $amount)
     public function setBaseTotalAmount($code, $amount)
     {
         /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
-        $amount = is_float($amount) ? (float)number_format($amount, 4, ".", "") : $amount;
+        $amount = is_float($amount) ? round($amount, 4) : $amount;
 
         $this->baseTotalAmounts[$code] = $amount;
         if ($code != 'subtotal') {

From 1e67f8b68f3eb418d3047e100f93dba52ad2f846 Mon Sep 17 00:00:00 2001
From: Wilko Nienhaus <wilko.nienhaus@vaimo.com>
Date: Mon, 8 Oct 2018 14:39:29 +0200
Subject: [PATCH 049/932] Added basic test for getServices method of Config
 class

---
 .../Test/Unit/Model/ConfigTest.php            | 90 +++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php

diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
new file mode 100644
index 0000000000000..9b25e3cac4a44
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Test\Unit\Model;
+
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Webapi\Model\Cache\Type\Webapi;
+use Magento\Webapi\Model\Config as WebapiConfig;
+use Magento\WebapiAsync\Model\Config;
+use Magento\Webapi\Model\Config\Converter;
+
+class ConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var Webapi|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $webapiCacheMock;
+
+    /**
+     * @var WebapiConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->webapiCacheMock = $this->createMock(\Magento\Webapi\Model\Cache\Type\Webapi::class);
+        $this->configMock = $this->createMock(WebapiConfig::class);
+        $this->serializerMock = $this->createMock(SerializerInterface::class);
+
+        $this->config = $objectManager->getObject(
+            Config::class,
+            [
+                'cache' => $this->webapiCacheMock,
+                'webApiConfig' => $this->configMock,
+                'serializer' => $this->serializerMock
+            ]
+        );
+    }
+
+    public function testGetServicesSetsTopicFromRoute()
+    {
+        $services = [
+            Converter::KEY_ROUTES => [
+                '/V1/products' => [
+                    'POST' => [
+                        'service' => [
+                            'class' => 'Magento\Catalog\Api\ProductRepositoryInterface',
+                            'method' => 'save',
+                        ]
+                    ]
+                ]
+            ]
+        ];
+        $this->configMock->expects($this->once())
+            ->method('getServices')
+            ->willReturn($services);
+
+        /* example of what $this->config->getServices() returns
+        $result = [
+            'async.V1.products.POST' => [
+                'interface' => 'Magento\Catalog\Api\ProductRepositoryInterface',
+                'method' => 'save',
+                'topic' => 'async.V1.products.POST',
+            ]
+        ];
+        */
+        $result = $this->config->getServices();
+
+        $expectedTopic = 'async.V1.products.POST';
+        $this->assertArrayHasKey($expectedTopic, $result);
+        $this->assertEquals($result[$expectedTopic]['topic'], $expectedTopic);
+    }
+}

From be94408ba0a2688b9883b7e0c9c2c4973572ae1f Mon Sep 17 00:00:00 2001
From: Wilko Nienhaus <wilko.nienhaus@vaimo.com>
Date: Mon, 8 Oct 2018 15:40:10 +0200
Subject: [PATCH 050/932] change topic generation to be based on service
 contract rather than route info

---
 app/code/Magento/WebapiAsync/Model/Config.php | 47 +++++++++++++++----
 .../Test/Unit/Model/ConfigTest.php            | 14 +++---
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/WebapiAsync/Model/Config.php b/app/code/Magento/WebapiAsync/Model/Config.php
index 92343027adcf6..723a5960b42d6 100644
--- a/app/code/Magento/WebapiAsync/Model/Config.php
+++ b/app/code/Magento/WebapiAsync/Model/Config.php
@@ -78,18 +78,18 @@ public function getServices()
     public function getTopicName($routeUrl, $httpMethod)
     {
         $services = $this->getServices();
-        $topicName = $this->generateTopicNameByRouteData(
+        $lookupKey = $this->generateLookupKeyByRouteData(
             $routeUrl,
             $httpMethod
         );
 
-        if (array_key_exists($topicName, $services) === false) {
+        if (array_key_exists($lookupKey, $services) === false) {
             throw new LocalizedException(
-                __('WebapiAsync config for "%topicName" does not exist.', ['topicName' => $topicName])
+                __('WebapiAsync config for "%lookupKey" does not exist.', ['lookupKey' => $lookupKey])
             );
         }
 
-        return $services[$topicName][self::SERVICE_PARAM_KEY_TOPIC];
+        return $services[$lookupKey][self::SERVICE_PARAM_KEY_TOPIC];
     }
 
     /**
@@ -105,11 +105,18 @@ private function generateTopicsDataFromWebapiConfig()
                     $serviceInterface = $httpMethodData[Converter::KEY_SERVICE][Converter::KEY_SERVICE_CLASS];
                     $serviceMethod = $httpMethodData[Converter::KEY_SERVICE][Converter::KEY_SERVICE_METHOD];
 
-                    $topicName = $this->generateTopicNameByRouteData(
+                    $lookupKey = $this->generateLookupKeyByRouteData(
                         $routeUrl,
                         $httpMethod
                     );
-                    $services[$topicName] = [
+
+                    $topicName = $this->generateTopicNameFromService(
+                        $serviceInterface,
+                        $serviceMethod,
+                        $httpMethod
+                    );
+
+                    $services[$lookupKey] = [
                         self::SERVICE_PARAM_KEY_INTERFACE => $serviceInterface,
                         self::SERVICE_PARAM_KEY_METHOD    => $serviceMethod,
                         self::SERVICE_PARAM_KEY_TOPIC     => $topicName,
@@ -122,7 +129,7 @@ private function generateTopicsDataFromWebapiConfig()
     }
 
     /**
-     * Generate topic name based on service type and method name.
+     * Generate lookup key name based on route and method
      *
      * Perform the following conversion:
      * self::TOPIC_PREFIX + /V1/products + POST => async.V1.products.POST
@@ -131,19 +138,39 @@ private function generateTopicsDataFromWebapiConfig()
      * @param string $httpMethod
      * @return string
      */
-    private function generateTopicNameByRouteData($routeUrl, $httpMethod)
+    private function generateLookupKeyByRouteData($routeUrl, $httpMethod)
     {
-        return self::TOPIC_PREFIX . $this->generateTopicName($routeUrl, $httpMethod, '/', false);
+        return self::TOPIC_PREFIX . $this->generateKey($routeUrl, $httpMethod, '/', false);
     }
 
     /**
+     * Generate topic name based on service type and method name.
+     *
+     * Perform the following conversion:
+     * self::TOPIC_PREFIX + Magento\Catalog\Api\ProductRepositoryInterface + save + POST
+     *   => async.magento.catalog.api.productrepositoryinterface.save.POST
+     *
+     * @param string $serviceMethod
+     * @param string $serviceInterface
+     * @param string $httpMethod
+     * @return string
+     */
+    private function generateTopicNameFromService($serviceInterface, $serviceMethod, $httpMethod)
+    {
+        $typeName = strtolower(sprintf('%s.%s', $serviceInterface, $serviceMethod));
+        return self::TOPIC_PREFIX . $this->generateKey($typeName, $httpMethod, '\\', false);
+    }
+
+    /**
+     * Join and simplify input type and method into a string that can be used as an array key
+     *
      * @param string $typeName
      * @param string $methodName
      * @param string $delimiter
      * @param bool $lcfirst
      * @return string
      */
-    private function generateTopicName($typeName, $methodName, $delimiter = '\\', $lcfirst = true)
+    private function generateKey($typeName, $methodName, $delimiter = '\\', $lcfirst = true)
     {
         $parts = explode($delimiter, ltrim($typeName, $delimiter));
         foreach ($parts as &$part) {
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
index 9b25e3cac4a44..3bf78aeb4008f 100644
--- a/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
@@ -54,7 +54,7 @@ protected function setUp()
         );
     }
 
-    public function testGetServicesSetsTopicFromRoute()
+    public function testGetServicesSetsTopicFromServiceContractName()
     {
         $services = [
             Converter::KEY_ROUTES => [
@@ -77,14 +77,14 @@ public function testGetServicesSetsTopicFromRoute()
             'async.V1.products.POST' => [
                 'interface' => 'Magento\Catalog\Api\ProductRepositoryInterface',
                 'method' => 'save',
-                'topic' => 'async.V1.products.POST',
+                'topic' => 'async.magento.catalog.api.productrepositoryinterface.save.POST',
             ]
         ];
         */
         $result = $this->config->getServices();
 
-        $expectedTopic = 'async.V1.products.POST';
-        $this->assertArrayHasKey($expectedTopic, $result);
-        $this->assertEquals($result[$expectedTopic]['topic'], $expectedTopic);
-    }
-}
+        $expectedTopic = 'async.magento.catalog.api.productrepositoryinterface.save.POST';
+        $lookupKey = 'async.V1.products.POST';
+        $this->assertArrayHasKey($lookupKey, $result);
+        $this->assertEquals($result[$lookupKey]['topic'], $expectedTopic);
+    }}

From ad50297e7bf4ea39db62f0969579a1ca8eb5f1a3 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Mon, 8 Oct 2018 15:25:11 +0100
Subject: [PATCH 051/932] Removed setFromByStore and replaced with default
 parameter to setFrom

---
 .../Sales/Model/Order/Email/SenderBuilder.php | 16 +----
 .../Model/Order/Email/SenderBuilderTest.php   | 25 ++++----
 .../Mail/Template/TransportBuilder.php        |  5 +-
 .../Mail/Template/TransportBuilderByStore.php | 54 ----------------
 .../Template/TransportBuilderByStoreTest.php  | 64 -------------------
 .../Unit/Template/TransportBuilderTest.php    |  5 +-
 6 files changed, 21 insertions(+), 148 deletions(-)
 delete mode 100644 lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
 delete mode 100644 lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php

diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index 7ec089b882972..e5c9c4b4afddc 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Sales\Model\Order\Email;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Mail\Template\TransportBuilder;
-use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
 use Magento\Sales\Model\Order\Email\Container\Template;
 
@@ -28,29 +26,19 @@ class SenderBuilder
      */
     protected $transportBuilder;
 
-    /**
-     * @var TransportBuilderByStore
-     */
-    private $transportBuilderByStore;
-
     /**
      * @param Template $templateContainer
      * @param IdentityInterface $identityContainer
      * @param TransportBuilder $transportBuilder
-     * @param TransportBuilderByStore $transportBuilderByStore
      */
     public function __construct(
         Template $templateContainer,
         IdentityInterface $identityContainer,
-        TransportBuilder $transportBuilder,
-        TransportBuilderByStore $transportBuilderByStore = null
+        TransportBuilder $transportBuilder
     ) {
         $this->templateContainer = $templateContainer;
         $this->identityContainer = $identityContainer;
         $this->transportBuilder = $transportBuilder;
-        $this->transportBuilderByStore = $transportBuilderByStore ?: ObjectManager::getInstance()->get(
-            TransportBuilderByStore::class
-        );
     }
 
     /**
@@ -110,7 +98,7 @@ protected function configureEmailTemplate()
         $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
         $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
         $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
-        $this->transportBuilderByStore->setFromByStore(
+        $this->transportBuilder->setFrom(
             $this->identityContainer->getEmailIdentity(),
             $this->identityContainer->getStore()->getId()
         );
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
index 38209bb22aef4..a3b7f6ef574dc 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order\Email;
 
-use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\SenderBuilder;
 
 class SenderBuilderTest extends \PHPUnit\Framework\TestCase
@@ -36,11 +35,6 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
      */
     private $storeMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $transportBuilderByStore;
-
     protected function setUp()
     {
         $templateId = 'test_template_id';
@@ -82,11 +76,10 @@ protected function setUp()
                 'setTemplateIdentifier',
                 'setTemplateOptions',
                 'setTemplateVars',
+                'setFrom',
             ]
         );
 
-        $this->transportBuilderByStore = $this->createMock(TransportBuilderByStore::class);
-
         $this->templateContainerMock->expects($this->once())
             ->method('getTemplateId')
             ->will($this->returnValue($templateId));
@@ -109,8 +102,8 @@ protected function setUp()
         $this->identityContainerMock->expects($this->once())
             ->method('getEmailIdentity')
             ->will($this->returnValue($emailIdentity));
-        $this->transportBuilderByStore->expects($this->once())
-            ->method('setFromByStore')
+        $this->transportBuilder->expects($this->once())
+            ->method('setFrom')
             ->with($this->equalTo($emailIdentity));
 
         $this->identityContainerMock->expects($this->once())
@@ -120,8 +113,7 @@ protected function setUp()
         $this->senderBuilder = new SenderBuilder(
             $this->templateContainerMock,
             $this->identityContainerMock,
-            $this->transportBuilder,
-            $this->transportBuilderByStore
+            $this->transportBuilder
         );
     }
 
@@ -129,6 +121,8 @@ public function testSend()
     {
         $customerName = 'test_name';
         $customerEmail = 'test_email';
+        $identity = 'email_identity_test';
+        
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
         );
@@ -151,6 +145,9 @@ public function testSend()
         $this->storeMock->expects($this->once())
             ->method('getId')
             ->willReturn(1);
+        $this->transportBuilder->expects($this->once())
+            ->method('setFrom')
+            ->with($identity, 1);
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo($customerEmail), $this->equalTo($customerName));
@@ -164,6 +161,7 @@ public function testSend()
 
     public function testSendCopyTo()
     {
+        $identity = 'email_identity_test';
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
         );
@@ -177,6 +175,9 @@ public function testSendCopyTo()
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
             ->with($this->equalTo('example@mail.com'));
+        $this->transportBuilder->expects($this->once())
+            ->method('setFrom')
+            ->with($identity, 1);
         $this->identityContainerMock->expects($this->once())
             ->method('getStore')
             ->willReturn($this->storeMock);
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index eac5d74c6e3dc..4a34f9abff340 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -176,11 +176,12 @@ public function setReplyTo($email, $name = null)
      * Set mail from address
      *
      * @param string|array $from
+     * @param string|int $store
      * @return $this
      */
-    public function setFrom($from)
+    public function setFrom($from, $store = null)
     {
-        $result = $this->_senderResolver->resolve($from);
+        $result = $this->_senderResolver->resolve($from, $store);
         $this->message->setFrom($result['email'], $result['name']);
         return $this;
     }
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
deleted file mode 100644
index 785c93824a57d..0000000000000
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Mail\Template;
-
-use Magento\Framework\Mail\MessageInterface;
-
-class TransportBuilderByStore
-{
-    /**
-     * Message.
-     *
-     * @var \Magento\Framework\Mail\Message
-     */
-    protected $message;
-
-    /**
-     * Sender resolver.
-     *
-     * @var \Magento\Framework\Mail\Template\SenderResolverInterface
-     */
-    private $senderResolver;
-
-    /**
-     * @param MessageInterface $message
-     * @param SenderResolverInterface $senderResolver
-     */
-    public function __construct(
-        MessageInterface $message,
-        SenderResolverInterface $senderResolver
-    ) {
-        $this->message = $message;
-        $this->senderResolver = $senderResolver;
-    }
-
-    /**
-     * Set mail from address by store.
-     *
-     * @param string|array $from
-     * @param string|int $store
-     *
-     * @return $this
-     */
-    public function setFromByStore($from, $store)
-    {
-        $result = $this->senderResolver->resolve($from, $store);
-        $this->message->setFrom($result['email'], $result['name']);
-
-        return $this;
-    }
-}
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
deleted file mode 100644
index 80df2887a3a93..0000000000000
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Mail\Test\Unit\Template;
-
-use Magento\Framework\Mail\Template\TransportBuilderByStore;
-
-class TransportBuilderByStoreTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var \Magento\Framework\Mail\Template\TransportBuilderByStore
-     */
-    protected $model;
-
-    /**
-     * @var \Magento\Framework\Mail\Message | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $messageMock;
-
-    /**
-     * @var \Magento\Framework\Mail\Template\SenderResolverInterface | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $senderResolverMock;
-
-    /**
-     * @return void
-     */
-    protected function setUp()
-    {
-        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->messageMock = $this->createMock(\Magento\Framework\Mail\Message::class);
-        $this->senderResolverMock = $this->createMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
-
-        $this->model = $objectManagerHelper->getObject(
-            TransportBuilderByStore::class,
-            [
-                'message' => $this->messageMock,
-                'senderResolver' => $this->senderResolverMock,
-            ]
-        );
-    }
-
-    /**
-     * @return void
-     */
-    public function testSetFromByStore()
-    {
-        $sender = ['email' => 'from@example.com', 'name' => 'name'];
-        $store = 1;
-        $this->senderResolverMock->expects($this->once())
-            ->method('resolve')
-            ->with($sender, $store)
-            ->willReturn($sender);
-        $this->messageMock->expects($this->once())
-            ->method('setFrom')
-            ->with('from@example.com', 'name')
-            ->willReturnSelf();
-
-        $this->model->setFromByStore($sender, $store);
-    }
-}
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index 596640480c823..59560b4cbe2da 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -170,16 +170,17 @@ public function getTransportDataProvider()
     public function testSetFrom()
     {
         $sender = ['email' => 'from@example.com', 'name' => 'name'];
+        $store = 1;
         $this->senderResolverMock->expects($this->once())
             ->method('resolve')
-            ->with($sender)
+            ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
             ->method('setFrom')
             ->with('from@example.com', 'name')
             ->willReturnSelf();
 
-        $this->builder->setFrom($sender);
+        $this->builder->setFrom($sender, $store);
     }
 
     /**

From e16ff74e4f5f24a4a2530b6aced6ef50032515e0 Mon Sep 17 00:00:00 2001
From: gwharton <30697781+gwharton@users.noreply.github.com>
Date: Tue, 9 Oct 2018 11:26:02 +0100
Subject: [PATCH 052/932] Added annotation block to Sender Builder

---
 app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index e5c9c4b4afddc..e09e13ccded24 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -9,6 +9,9 @@
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
 use Magento\Sales\Model\Order\Email\Container\Template;
 
+/**
+ * Sender Builder
+ */
 class SenderBuilder
 {
     /**

From 621d2cfeaf8e0a15e592cdc001c856385b3cbd83 Mon Sep 17 00:00:00 2001
From: gwharton <30697781+gwharton@users.noreply.github.com>
Date: Tue, 9 Oct 2018 11:27:08 +0100
Subject: [PATCH 053/932] Added short description to annotation block

---
 .../Magento/Framework/Mail/Template/TransportBuilder.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 4a34f9abff340..89f770cad4022 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -17,6 +17,8 @@
 use Magento\Framework\Phrase;
 
 /**
+ * TransportBuilder
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */

From de39e254481b35963d058ab5a89976f485def882 Mon Sep 17 00:00:00 2001
From: vprohorov <prohorov.vital@gmail.com>
Date: Fri, 12 Oct 2018 14:15:18 +0300
Subject: [PATCH 054/932] MAGETWO-94444: [2.3] Order total value is limited by
 8 round digits

- Changing precision in database schema
---
 app/code/Magento/SalesRule/etc/db_schema.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/SalesRule/etc/db_schema.xml b/app/code/Magento/SalesRule/etc/db_schema.xml
index 145ed0c96d95f..e84d92df168d6 100644
--- a/app/code/Magento/SalesRule/etc/db_schema.xml
+++ b/app/code/Magento/SalesRule/etc/db_schema.xml
@@ -208,17 +208,17 @@
         <column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
         <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Coupon Uses"/>
-        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Subtotal Amount"/>
         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
                 default="0" comment="Discount Amount"/>
-        <column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="total_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Total Amount"/>
-        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Subtotal Amount Actual"/>
         <column xsi:type="decimal" name="discount_amount_actual" scale="4" precision="12" unsigned="false"
                 nullable="false" default="0" comment="Discount Amount Actual"/>
-        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Amount Actual"/>
         <column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -250,17 +250,17 @@
         <column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
         <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Coupon Uses"/>
-        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Subtotal Amount"/>
         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
                 default="0" comment="Discount Amount"/>
-        <column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="total_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Total Amount"/>
-        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="subtotal_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Subtotal Amount Actual"/>
         <column xsi:type="decimal" name="discount_amount_actual" scale="4" precision="12" unsigned="false"
                 nullable="false" default="0" comment="Discount Amount Actual"/>
-        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Amount Actual"/>
         <column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -292,11 +292,11 @@
         <column xsi:type="varchar" name="coupon_code" nullable="true" length="50" comment="Coupon Code"/>
         <column xsi:type="int" name="coupon_uses" padding="11" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Coupon Uses"/>
-        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="subtotal_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Subtotal Amount"/>
         <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
                 default="0" comment="Discount Amount"/>
-        <column xsi:type="decimal" name="total_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="total_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Total Amount"/>
         <column xsi:type="varchar" name="rule_name" nullable="true" length="255" comment="Rule Name"/>
         <constraint xsi:type="primary" name="PRIMARY">

From b777343da3f63b8cf141404c759c9b9294f73a69 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Mon, 15 Oct 2018 22:13:01 +0200
Subject: [PATCH 055/932] Change a way how categori tree is fetched. Current
 problem that all childs are always coming to last parent. Rewritte way of
 tree generation

---
 .../ExtractDataFromCategoryTree.php           | 64 +++++++++++++++++--
 1 file changed, 59 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
index ac8d5709c85b3..2daf3649c131d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
@@ -15,11 +15,18 @@
  */
 class ExtractDataFromCategoryTree
 {
+    const START_CATEGORY_FETCH_LEVEL = 1;
+
     /**
      * @var Hydrator
      */
     private $categoryHydrator;
 
+    /**
+     * @var CategoryInterface;
+     */
+    private $iteratingCategory;
+
     /**
      * @param Hydrator $categoryHydrator
      */
@@ -42,14 +49,61 @@ public function execute(\Iterator $iterator): array
             /** @var CategoryInterface $category */
             $category = $iterator->current();
             $iterator->next();
-            $nextCategory = $iterator->current();
-            $tree[$category->getId()] = $this->categoryHydrator->hydrateCategory($category);
-            $tree[$category->getId()]['model'] = $category;
-            if ($nextCategory && (int) $nextCategory->getLevel() !== (int) $category->getLevel()) {
-                $tree[$category->getId()]['children'] = $this->execute($iterator);
+
+            $pathElements = explode("/", $category->getPath());
+            $this->iteratingCategory = $category;
+
+            $currentLevelTree = $this->generateLevelTree($pathElements, self::START_CATEGORY_FETCH_LEVEL);
+            if (empty($tree)) {
+                $tree = $currentLevelTree;
             }
+            $tree = $this->mergeCategoriesTrees($currentLevelTree, $tree);
         }
 
         return $tree;
     }
+
+    /**
+     * Merge together complex categories tree
+     *
+     * @param array $tree1
+     * @param array $tree2
+     * @return array
+     */
+    private function mergeCategoriesTrees(array &$tree1, array &$tree2): array
+    {
+        $mergedTree = $tree1;
+        foreach ($tree2 as $currentKey => &$value) {
+            if (is_array($value) && isset($mergedTree[$currentKey]) && is_array($mergedTree[$currentKey])) {
+                $mergedTree[$currentKey] = $this->mergeCategoriesTrees($mergedTree[$currentKey], $value);
+            } else {
+                $mergedTree[$currentKey] = $value;
+            }
+        }
+        return $mergedTree;
+    }
+
+    /**
+     * Recursive method to generate tree for one category path
+     *
+     * @param $elements
+     * @param $index
+     * @return array
+     */
+    private function generateLevelTree($elements, $index): array
+    {
+
+        $tree = [];
+        $tree[$elements[$index]]['id'] = $elements[$index];
+        if ($index === count($elements) - 1) {
+            $tree[$elements[$index]] = $this->categoryHydrator->hydrateCategory($this->iteratingCategory);
+            $tree[$elements[$index]]['model'] = $this->iteratingCategory;
+        }
+        $currentIndex = $index;
+        $index++;
+        if (isset($elements[$index])) {
+            $tree[$elements[$currentIndex]]['children'] = $this->generateLevelTree($elements, $index);
+        }
+        return $tree;
+    }
 }

From b6f9e48289119117df230b6578ac9ff3d69e4996 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Tue, 16 Oct 2018 09:39:17 +0100
Subject: [PATCH 056/932] Added new setFromByStore function and deprecated old
 function.

TODO : Rest of Magento codebase still uses deprecated setFrom
---
 .../Sales/Model/Order/Email/SenderBuilder.php   |  2 +-
 .../Model/Order/Email/SenderBuilderTest.php     | 10 +++++-----
 .../Mail/Template/TransportBuilder.php          | 17 ++++++++++++++++-
 .../Test/Unit/Template/TransportBuilderTest.php |  4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index e09e13ccded24..98bd942cd0b10 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -101,7 +101,7 @@ protected function configureEmailTemplate()
         $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
         $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
         $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
-        $this->transportBuilder->setFrom(
+        $this->transportBuilder->setFromByStore(
             $this->identityContainer->getEmailIdentity(),
             $this->identityContainer->getStore()->getId()
         );
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
index a3b7f6ef574dc..86d65cc476668 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -76,7 +76,7 @@ protected function setUp()
                 'setTemplateIdentifier',
                 'setTemplateOptions',
                 'setTemplateVars',
-                'setFrom',
+                'setFromByStore',
             ]
         );
 
@@ -103,8 +103,8 @@ protected function setUp()
             ->method('getEmailIdentity')
             ->will($this->returnValue($emailIdentity));
         $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
-            ->with($this->equalTo($emailIdentity));
+            ->method('setFromByStore')
+            ->with($this->equalTo($emailIdentity), 1);
 
         $this->identityContainerMock->expects($this->once())
             ->method('getEmailCopyTo')
@@ -146,7 +146,7 @@ public function testSend()
             ->method('getId')
             ->willReturn(1);
         $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
+            ->method('setFromByStore')
             ->with($identity, 1);
         $this->transportBuilder->expects($this->once())
             ->method('addTo')
@@ -176,7 +176,7 @@ public function testSendCopyTo()
             ->method('addTo')
             ->with($this->equalTo('example@mail.com'));
         $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
+            ->method('setFromByStore')
             ->with($identity, 1);
         $this->identityContainerMock->expects($this->once())
             ->method('getStore')
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 89f770cad4022..9343adfecf58d 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -177,8 +177,9 @@ public function setReplyTo($email, $name = null)
     /**
      * Set mail from address
      *
+     * @deprecated Use setFromByStore
+     * 
      * @param string|array $from
-     * @param string|int $store
      * @return $this
      */
     public function setFrom($from, $store = null)
@@ -188,6 +189,20 @@ public function setFrom($from, $store = null)
         return $this;
     }
 
+    /**
+     * Set mail from address by store
+     *
+     * @param string|array $from
+     * @param string|int $store
+     * @return $this
+     */
+    public function setFromByStore($from, $store = null)
+    {
+        $result = $this->_senderResolver->resolve($from, $store);
+        $this->message->setFrom($result['email'], $result['name']);
+        return $this;
+    }
+
     /**
      * Set template identifier
      *
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index 59560b4cbe2da..32bd536f96c9d 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -176,11 +176,11 @@ public function testSetFrom()
             ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
-            ->method('setFrom')
+            ->method('setFromByStore')
             ->with('from@example.com', 'name')
             ->willReturnSelf();
 
-        $this->builder->setFrom($sender, $store);
+        $this->builder->setFromByStore($sender, $store);
     }
 
     /**

From 0dc85785e522e2be8c72dfeaee7e9f5054195034 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Tue, 16 Oct 2018 10:13:30 +0100
Subject: [PATCH 057/932] Removed code duplication

---
 .../Framework/Mail/Template/TransportBuilder.php      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 9343adfecf58d..7d29500bcd983 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -177,16 +177,17 @@ public function setReplyTo($email, $name = null)
     /**
      * Set mail from address
      *
-     * @deprecated Use setFromByStore
+     * @deprecated This function sets the from address for the first store only.
+     * new function setFromByStore introduced to allow setting of from address
+     * based on store.
+     * @see setFromByStore()
      * 
      * @param string|array $from
      * @return $this
      */
-    public function setFrom($from, $store = null)
+    public function setFrom($from)
     {
-        $result = $this->_senderResolver->resolve($from, $store);
-        $this->message->setFrom($result['email'], $result['name']);
-        return $this;
+        return($this->setFromByStore($from));
     }
 
     /**

From 122019c953037df74ef97245a42b274eae2e6639 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Tue, 16 Oct 2018 10:22:04 +0100
Subject: [PATCH 058/932] Fixed TransportBuilderTest

---
 .../Mail/Test/Unit/Template/TransportBuilderTest.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index 32bd536f96c9d..5f20a790a2d32 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -167,7 +167,7 @@ public function getTransportDataProvider()
     /**
      * @return void
      */
-    public function testSetFrom()
+    public function testSetFromByStore()
     {
         $sender = ['email' => 'from@example.com', 'name' => 'name'];
         $store = 1;
@@ -176,7 +176,7 @@ public function testSetFrom()
             ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
-            ->method('setFromByStore')
+            ->method('setFrom')
             ->with('from@example.com', 'name')
             ->willReturnSelf();
 

From 193c6c2f6facf7276c1c8858d29ea3b847062ef5 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Tue, 16 Oct 2018 10:24:54 +0100
Subject: [PATCH 059/932] Fixed whitespace violations

---
 .../Magento/Framework/Mail/Template/TransportBuilder.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 7d29500bcd983..bb6727043f9b5 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -181,7 +181,7 @@ public function setReplyTo($email, $name = null)
      * new function setFromByStore introduced to allow setting of from address
      * based on store.
      * @see setFromByStore()
-     * 
+     *
      * @param string|array $from
      * @return $this
      */

From bd0aa57cc837918335015d051f08cf380dc186d0 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 17 Oct 2018 08:05:58 +0300
Subject: [PATCH 060/932] magento/magento2#18471 Alternative fix for Multi
 Store Emails issue

Fix small issue
---
 .../Magento/Framework/Mail/Template/TransportBuilder.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index bb6727043f9b5..3a9117deb4b17 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -187,7 +187,7 @@ public function setReplyTo($email, $name = null)
      */
     public function setFrom($from)
     {
-        return($this->setFromByStore($from));
+        return $this->setFromByStore($from, null);
     }
 
     /**

From 523b0464966f81f1f01aa13073092bfddf363219 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Thu, 18 Oct 2018 11:36:17 +0100
Subject: [PATCH 061/932] Reintroduced TransportBuilerByStore classes and
 marked deprecated

---
 .../Sales/Model/Order/Email/SenderBuilder.php |  7 +-
 .../Mail/Template/TransportBuilderByStore.php | 61 ++++++++++++++++++
 .../Template/TransportBuilderByStoreTest.php  | 64 +++++++++++++++++++
 3 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
 create mode 100644 lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php

diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
index 98bd942cd0b10..a7d749ec04c7d 100644
--- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
+++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -6,6 +6,7 @@
 namespace Magento\Sales\Model\Order\Email;
 
 use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Mail\Template\TransportBuilderByStore;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
 use Magento\Sales\Model\Order\Email\Container\Template;
 
@@ -30,14 +31,18 @@ class SenderBuilder
     protected $transportBuilder;
 
     /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     *
      * @param Template $templateContainer
      * @param IdentityInterface $identityContainer
      * @param TransportBuilder $transportBuilder
+     * @param TransportBuilderByStore $transportBuilderByStore
      */
     public function __construct(
         Template $templateContainer,
         IdentityInterface $identityContainer,
-        TransportBuilder $transportBuilder
+        TransportBuilder $transportBuilder,
+        TransportBuilderByStore $transportBuilderByStore = null
     ) {
         $this->templateContainer = $templateContainer;
         $this->identityContainer = $identityContainer;
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
new file mode 100644
index 0000000000000..baac867fd6ce8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Mail\Template;
+
+use Magento\Framework\Mail\MessageInterface;
+
+/**
+ * Class TransportBuilderByStore
+ *
+ * @deprecated The ability to set From address based on store is now available
+ * in the \Magento\Framework\Mail\Template\TransportBuilder class
+ * @see \Magento\Framework\Mail\Template\TransportBuilder::setFromByStore
+ */
+class TransportBuilderByStore
+{
+    /**
+     * Message.
+     *
+     * @var \Magento\Framework\Mail\Message
+     */
+    protected $message;
+
+    /**
+     * Sender resolver.
+     *
+     * @var \Magento\Framework\Mail\Template\SenderResolverInterface
+     */
+    private $senderResolver;
+
+    /**
+     * @param MessageInterface $message
+     * @param SenderResolverInterface $senderResolver
+     */
+    public function __construct(
+        MessageInterface $message,
+        SenderResolverInterface $senderResolver
+    ) {
+        $this->message = $message;
+        $this->senderResolver = $senderResolver;
+    }
+
+    /**
+     * Set mail from address by store.
+     *
+     * @param string|array $from
+     * @param string|int $store
+     *
+     * @return $this
+     */
+    public function setFromByStore($from, $store)
+    {
+        $result = $this->senderResolver->resolve($from, $store);
+        $this->message->setFrom($result['email'], $result['name']);
+
+        return $this;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
new file mode 100644
index 0000000000000..80df2887a3a93
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Mail\Test\Unit\Template;
+
+use Magento\Framework\Mail\Template\TransportBuilderByStore;
+
+class TransportBuilderByStoreTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Mail\Template\TransportBuilderByStore
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\Mail\Message | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $messageMock;
+
+    /**
+     * @var \Magento\Framework\Mail\Template\SenderResolverInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $senderResolverMock;
+
+    /**
+     * @return void
+     */
+    protected function setUp()
+    {
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->messageMock = $this->createMock(\Magento\Framework\Mail\Message::class);
+        $this->senderResolverMock = $this->createMock(\Magento\Framework\Mail\Template\SenderResolverInterface::class);
+
+        $this->model = $objectManagerHelper->getObject(
+            TransportBuilderByStore::class,
+            [
+                'message' => $this->messageMock,
+                'senderResolver' => $this->senderResolverMock,
+            ]
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testSetFromByStore()
+    {
+        $sender = ['email' => 'from@example.com', 'name' => 'name'];
+        $store = 1;
+        $this->senderResolverMock->expects($this->once())
+            ->method('resolve')
+            ->with($sender, $store)
+            ->willReturn($sender);
+        $this->messageMock->expects($this->once())
+            ->method('setFrom')
+            ->with('from@example.com', 'name')
+            ->willReturnSelf();
+
+        $this->model->setFromByStore($sender, $store);
+    }
+}

From c32ca7a0d58cbc57276349b26eb5ecd38451fd2d Mon Sep 17 00:00:00 2001
From: gwharton <30697781+gwharton@users.noreply.github.com>
Date: Sat, 20 Oct 2018 14:13:29 +0100
Subject: [PATCH 062/932] Fixed Whitespace issue

---
 .../Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
index 86d65cc476668..759d60d9e6613 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -122,7 +122,7 @@ public function testSend()
         $customerName = 'test_name';
         $customerEmail = 'test_email';
         $identity = 'email_identity_test';
-        
+
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
         );

From 0fe2795ca78f76487bce35df6e0010b2d2302003 Mon Sep 17 00:00:00 2001
From: Wilko Nienhaus <wilko.nienhaus@vaimo.com>
Date: Sun, 21 Oct 2018 19:32:13 +0200
Subject: [PATCH 063/932] fix integration tests to use the new topic naming

---
 .../Magento/AsynchronousOperations/Model/MassScheduleTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
index 305c3550269da..85bea246c3bda 100644
--- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
@@ -128,7 +128,7 @@ public function sendBulk($products)
         }
         $this->clearProducts();
 
-        $result = $this->massSchedule->publishMass('async.V1.products.POST', $products);
+        $result = $this->massSchedule->publishMass('async.magento.catalog.api.productrepositoryinterface.save.POST', $products);
 
         //assert bulk accepted with no errors
         $this->assertFalse($result->isErrors());
@@ -206,7 +206,7 @@ public function testScheduleMassOneEntityFailure($products)
 
             $expectedErrorMessage = "Data item corresponding to \"product\" " .
                 "must be specified in the message with topic " .
-                "\"async.V1.products.POST\".";
+                "\"async.magento.catalog.api.productrepositoryinterface.save.POST\".";
             $this->assertEquals(
                 $expectedErrorMessage,
                 $reasonException->getMessage()

From 456f431e8a86fcc5d28404c5e6c13b431b043510 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 24 Oct 2018 12:18:09 +0300
Subject: [PATCH 064/932] MAGETWO-95820: Order placed by new customer before
 they registered is displayed in the admin under the name Guest

- Fixed issue with missing customer data in order when account was created after order placing;
---
 .../Observer/AssignOrderToCustomerObserver.php    | 15 +++++++++++----
 .../AssignOrderToCustomerObserverTest.php         | 11 +++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php b/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
index cade86d18e935..5883bde175101 100644
--- a/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
+++ b/app/code/Magento/Sales/Observer/AssignOrderToCustomerObserver.php
@@ -31,7 +31,7 @@ public function __construct(OrderRepositoryInterface $orderRepository)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute(Observer $observer)
     {
@@ -44,9 +44,16 @@ public function execute(Observer $observer)
             $orderId = $delegateData['__sales_assign_order_id'];
             $order = $this->orderRepository->get($orderId);
             if (!$order->getCustomerId()) {
-                //if customer ID wasn't already assigned then assigning.
-                $order->setCustomerId($customer->getId());
-                $order->setCustomerIsGuest(0);
+                //assign customer info to order after customer creation.
+                $order->setCustomerId($customer->getId())
+                    ->setCustomerIsGuest(0)
+                    ->setCustomerEmail($customer->getEmail())
+                    ->setCustomerFirstname($customer->getFirstname())
+                    ->setCustomerLastname($customer->getLastname())
+                    ->setCustomerMiddlename($customer->getMiddlename())
+                    ->setCustomerPrefix($customer->getPrefix())
+                    ->setCustomerSuffix($customer->getSuffix())
+                    ->setCustomerGroupId($customer->getGroupId());
                 $this->orderRepository->save($order);
             }
         }
diff --git a/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php b/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
index c6e02151b9bc1..e919b45667f24 100644
--- a/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Observer/AssignOrderToCustomerObserverTest.php
@@ -69,6 +69,17 @@ public function testAssignOrderToCustomerAfterGuestOrder($customerId)
         $orderMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
         $this->orderRepositoryMock->expects($this->once())->method('get')->with($orderId)
             ->willReturn($orderMock);
+
+        $orderMock->expects($this->once())->method('setCustomerId')->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('setCustomerIsGuest')->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('setCustomerEmail')->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('setCustomerFirstname')->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('setCustomerLastname')->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('setCustomerMiddlename')->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('setCustomerPrefix')->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('setCustomerSuffix')->willReturn($orderMock);
+        $orderMock->expects($this->once())->method('setCustomerGroupId')->willReturn($orderMock);
+
         if (!$customerId) {
             $this->orderRepositoryMock->expects($this->once())->method('save')->with($orderMock);
             $this->sut->execute($observerMock);

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 065/932] 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 c06e0de13a1844cd5f1ef28da2ba069eed25d272 Mon Sep 17 00:00:00 2001
From: Lusine <lusine_papyan@epam.com>
Date: Fri, 26 Oct 2018 14:38:36 +0400
Subject: [PATCH 066/932] MAGETWO-95812: Required RMA Attributes are not
 validated while Customer submits a return

- Add automated test
---
 .../ActionGroup/OrderAndReturnActionGroup.xml | 36 +++++++
 .../SalesEnableRMAStorefrontConfigData.xml    | 23 +++++
 .../Metadata/sales_enable_rma_config-meta.xml | 20 ++++
 .../Page/StorefrontCreateNewReturnPage.xml    | 14 +++
 .../Page/StorefrontOrderInformationPage.xml   | 14 +++
 .../Page/StorefrontOrdersAndReturnsPage.xml   | 15 +++
 .../Section/CreateNewReturnMainSection.xml    | 18 ++++
 .../OrderAndReturnInformationSection.xml      | 20 ++++
 .../Section/OrderInformationMainSection.xml   | 15 +++
 ...lidationWhileCustomerSubmitsReturnTest.xml | 99 +++++++++++++++++++
 10 files changed, 274 insertions(+)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Section/CreateNewReturnMainSection.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Section/OrderAndReturnInformationSection.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Section/OrderInformationMainSection.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml
new file mode 100644
index 0000000000000..69f6637301bd0
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Fill order information fields and click continue-->
+    <actionGroup name="fillOrderInformationActionGroup">
+        <arguments>
+            <argument name="orderId" type="string"/>
+            <argument name="orderLastName"/>
+            <argument name="orderEmail"/>
+        </arguments>
+        <amOnPage url="{{StorefrontOrdersAndReturnsPage.url}}" stepKey="navigateToOrderAndReturnPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField selector="{{OrderAndReturnInformationSection.orderId}}" userInput="{{orderId}}" stepKey="fillOrderId"/>
+        <fillField selector="{{OrderAndReturnInformationSection.bilingLastName}}" userInput="{{orderLastName}}" stepKey="fillBillingLastName"/>
+        <fillField selector="{{OrderAndReturnInformationSection.email}}" userInput="{{orderEmail}}" stepKey="fillEmail"/>
+        <click selector="{{OrderAndReturnInformationSection.continueButton}}" stepKey="clickContinue"/>
+        <waitForPageLoad stepKey="waitForOrderInformationPageLoad"/>
+        <seeInCurrentUrl url="{{StorefrontOrderInformationPage.url}}" stepKey="seeOrderInformationUrl"/>
+    </actionGroup>
+
+    <!--Enter quantity to return and submit-->
+    <actionGroup name="fillQuantityToReturnActionGroup">
+        <click selector="{{OrderInformationMainSection.return}}" stepKey="gotToCreateNewReturnPage"/>
+        <waitForPageLoad stepKey="waitForReturnPageLoad"/>
+        <fillField selector="{{CreateNewReturnMainSection.quantityToReturn}}" userInput="1" stepKey="fillQuantityToReturn"/>
+        <click selector="{{CreateNewReturnMainSection.submit}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml
new file mode 100644
index 0000000000000..76ff20813483e
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/SalesEnableRMAStorefrontConfigData.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableRMA" type="sales_rma_config">
+        <requiredEntity type="enabled">EnableRMAStorefront</requiredEntity>
+    </entity>
+    <entity name="EnableRMAStorefront" type="enabled">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DisableRMA" type="sales_rma_config">
+        <requiredEntity type="enabled">DisableRMAStorefront</requiredEntity>
+    </entity>
+    <entity name="DisableRMAStorefront" type="enabled">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
new file mode 100644
index 0000000000000..3c63fc0a63e8b
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="SalesRMAConfig" dataType="sales_rma_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST">
+        <object key="groups" dataType="sales_rma_config">
+            <object key="magento_rma" dataType="sales_rma_config">
+                <object key="fields" dataType="sales_rma_config">
+                    <object key="enabled" dataType="enabled">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml
new file mode 100644
index 0000000000000..f578626156fee
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCreateNewReturnPage" url="rma/guest/create/order_id/" area="guest" module="Magento_Sales">
+        <section name="CreateNewReturnMainSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
new file mode 100644
index 0000000000000..e18a80eb45fb1
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontOrderInformationPage" url="sales/guest/view" area="guest" module="Magento_Sales">
+        <section name="OrderInformationMainSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
new file mode 100644
index 0000000000000..32d94c3175807
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrdersAndReturnsPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontOrdersAndReturnsPage" url="sales/guest/form" area="guest" module="Magento_Sales">
+        <section name="OrderAndReturnsMainSection"/>
+        <section name="OrderInformationSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/CreateNewReturnMainSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/CreateNewReturnMainSection.xml
new file mode 100644
index 0000000000000..e1349520e2742
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/CreateNewReturnMainSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CreateNewReturnMainSection">
+        <element name="quantityToReturn" type="input" selector="#items:qty_requested0"/>
+        <element name="submit" type="submit" selector="//span[contains(text(), 'Submit')]"/>
+        <element name="resolutionError" type="text" selector="//*[@id='items:resolution0']/following-sibling::div[contains(text(),'Please select an option')]"/>
+        <element name="conditionError" type="text" selector="//*[@id='items:condition0']/following-sibling::div[contains(text(),'Please select an option')]"/>
+        <element name="reasonError" type="text" selector="//*[@id='items:reason0']/following-sibling::div[contains(text(),'Please select an option')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrderAndReturnInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrderAndReturnInformationSection.xml
new file mode 100644
index 0000000000000..65f7f8c701d72
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/OrderAndReturnInformationSection.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="OrderAndReturnInformationSection">
+        <element name="orderId" type="input" selector="#oar-order-id"/>
+        <element name="bilingLastName" type="input" selector="#oar-billing-lastname"/>
+        <element name="findOrderBy" type="select" selector="#quick-search-type-id"/>
+        <element name="email" type="input" selector="#oar_email"/>
+        <element name="bilingZipCode" type="input" selector="//input[@id='oar_zip']"/>
+        <element name="continueButton" type="submit" selector="//button[@title='Continue']"/>
+        <element name="ordersAndReturnsTitle" type="span" selector="//span[@id='page-title-wrapper']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrderInformationMainSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrderInformationMainSection.xml
new file mode 100644
index 0000000000000..b5c21db09332d
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/OrderInformationMainSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="OrderInformationMainSection">
+        <element name="orderTitle" type="span" selector="#page-title-wrapper"/>
+        <element name="return" type="span" selector="//span[contains(text(), 'Return')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest.xml
new file mode 100644
index 0000000000000..e3b2352c4c810
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest.xml
@@ -0,0 +1,99 @@
+<?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="RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest">
+        <annotations>
+            <features value="Sales"/>
+            <stories value="MAGETWO-95812: Required RMA Attributes are not validated while Customer submits a return"/>
+            <title value="Required RMA Attributes Validation While Customer Submits A Return"/>
+            <description value="Required RMA Attributes Validation While Customer Submits A Return"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95864"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <!-- log in as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Enabled RMA On Storefront-->
+            <createData entity="EnableRMA" stepKey="enabledRMAOnStorefront"/>
+            <!-- create new product -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+
+        <!-- Place an order from frontend -->
+
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="checkoutProductFromCart"/>
+
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne" />
+            <argument name="customerAddressVar" value="CustomerAddressSimple" />
+        </actionGroup>
+
+        <!-- place for order -->
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <waitForPageLoad stepKey="waitForPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+
+        <!--Complete the order from admin bay creating Invoice and then Shipment-->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersIndexPage"/>
+        <waitForPageLoad stepKey="waitForOrderIndexPage"/>
+
+        <!-- Open Order -->
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForCreatedOrderPageOpened"/>
+
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl"/>
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
+
+        <!--Goes to Orders and Returns -->
+        <amOnPage url="{{StorefrontOrdersAndReturnsPage.url}}" stepKey="goToOrderAndReturnPage"/>
+        <waitForPageLoad stepKey="waitForOrdersAndReturnsPageLoad"/>
+        <seeInCurrentUrl url="{{StorefrontOrdersAndReturnsPage.url}}" stepKey="seeOrdersAndReturnsUrl"/>
+
+        <actionGroup ref="fillOrderInformationActionGroup" stepKey="fillOrderInformationAndContinue">
+            <argument name="orderId" value="$grabOrderNumber"/>
+            <argument name="orderLastName" value="CustomerEntityOne.lastname"/>
+            <argument name="orderEmail" value="CustomerEntityOne.email"/>
+        </actionGroup>
+
+        <click selector="{{OrderInformationMainSection.return}}" stepKey="clickOnReturn"/>
+        <actionGroup ref="fillQuantityToReturnActionGroup" stepKey="fillQuantityToReturn"/>
+
+        <seeElement selector="{{CreateNewReturnMainSection.resolutionError}}" stepKey="AssertResolutionError" />
+        <seeElement selector="{{CreateNewReturnMainSection.conditionError}}" stepKey="AssertConditionError" />
+        <seeElement selector="{{CreateNewReturnMainSection.reasonError}}" stepKey="AssertReasonError" />
+
+        <after>
+            <!--Disable RMA On Storefront-->
+            <createData entity="DisableRMA" stepKey="disableRMAOnStorefront"/>
+
+            <!--Delete the created product-->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>

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 067/932] 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 0288d57b0f040bef1966b7358c97d0ea5a6a324a Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Fri, 26 Oct 2018 16:47:19 +0300
Subject: [PATCH 068/932] MAGETWO-95813: Only two bundle options are added to
 the cart

- Bug fix.
---
 app/code/Magento/Bundle/Model/Product/Type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 92bada8094c7e..2eec13d291390 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -822,7 +822,7 @@ private function multiToFlatArray(array $array)
         $flatArray = [];
         foreach ($array as $key => $value) {
             if (is_array($value)) {
-                $flatArray = array_merge($flatArray, $this->multiToFlatArray($value));
+                $flatArray = $flatArray + $this->multiToFlatArray($value);
             } else {
                 $flatArray[$key] = $value;
             }

From 679fc6166bae7f19e3cc382b10e4f578e4b17330 Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Fri, 26 Oct 2018 21:16:17 +0300
Subject: [PATCH 069/932] MAGETWO-95819: Customer registration fields not
 translated

- Added store id to attribute metadata cache key
---
 .../Model/Metadata/AttributeMetadataCache.php | 26 +++++++++++----
 .../Metadata/AttributeMetadataCacheTest.php   | 33 ++++++++++++++++---
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php b/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php
index 5a46fdb9defc4..8e64fba4a9b08 100644
--- a/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php
+++ b/app/code/Magento/Customer/Model/Metadata/AttributeMetadataCache.php
@@ -12,6 +12,7 @@
 use Magento\Framework\App\Cache\StateInterface;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Cache for attribute metadata
@@ -53,6 +54,11 @@ class AttributeMetadataCache
      */
     private $serializer;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Constructor
      *
@@ -60,17 +66,21 @@ class AttributeMetadataCache
      * @param StateInterface $state
      * @param SerializerInterface $serializer
      * @param AttributeMetadataHydrator $attributeMetadataHydrator
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         CacheInterface $cache,
         StateInterface $state,
         SerializerInterface $serializer,
-        AttributeMetadataHydrator $attributeMetadataHydrator
+        AttributeMetadataHydrator $attributeMetadataHydrator,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->cache = $cache;
         $this->state = $state;
         $this->serializer = $serializer;
         $this->attributeMetadataHydrator = $attributeMetadataHydrator;
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
     }
 
     /**
@@ -82,11 +92,12 @@ public function __construct(
      */
     public function load($entityType, $suffix = '')
     {
-        if (isset($this->attributes[$entityType . $suffix])) {
-            return $this->attributes[$entityType . $suffix];
+        $storeId = $this->storeManager->getStore()->getId();
+        if (isset($this->attributes[$entityType . $suffix . $storeId])) {
+            return $this->attributes[$entityType . $suffix . $storeId];
         }
         if ($this->isEnabled()) {
-            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
             $serializedData = $this->cache->load($cacheKey);
             if ($serializedData) {
                 $attributesData = $this->serializer->unserialize($serializedData);
@@ -94,7 +105,7 @@ public function load($entityType, $suffix = '')
                 foreach ($attributesData as $key => $attributeData) {
                     $attributes[$key] = $this->attributeMetadataHydrator->hydrate($attributeData);
                 }
-                $this->attributes[$entityType . $suffix] = $attributes;
+                $this->attributes[$entityType . $suffix . $storeId] = $attributes;
                 return $attributes;
             }
         }
@@ -111,9 +122,10 @@ public function load($entityType, $suffix = '')
      */
     public function save($entityType, array $attributes, $suffix = '')
     {
-        $this->attributes[$entityType . $suffix] = $attributes;
+        $storeId = $this->storeManager->getStore()->getId();
+        $this->attributes[$entityType . $suffix . $storeId] = $attributes;
         if ($this->isEnabled()) {
-            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+            $cacheKey = self::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
             $attributesData = [];
             foreach ($attributes as $key => $attribute) {
                 $attributesData[$key] = $this->attributeMetadataHydrator->extract($attribute);
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
index 658472d13ab93..83915731ea5a9 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AttributeMetadataCacheTest.php
@@ -15,7 +15,14 @@
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * AttributeMetadataCache Test
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -43,6 +50,16 @@ class AttributeMetadataCacheTest extends \PHPUnit\Framework\TestCase
      */
     private $attributeMetadataCache;
 
+    /**
+     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+    
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -50,13 +67,18 @@ protected function setUp()
         $this->stateMock = $this->createMock(StateInterface::class);
         $this->serializerMock = $this->createMock(SerializerInterface::class);
         $this->attributeMetadataHydratorMock = $this->createMock(AttributeMetadataHydrator::class);
+        $this->storeMock = $this->createMock(StoreInterface::class);
+        $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
+        $this->storeManagerMock->method('getStore')->willReturn($this->storeMock);
+        $this->storeMock->method('getId')->willReturn(1);
         $this->attributeMetadataCache = $objectManager->getObject(
             AttributeMetadataCache::class,
             [
                 'cache' => $this->cacheMock,
                 'state' => $this->stateMock,
                 'serializer' => $this->serializerMock,
-                'attributeMetadataHydrator' => $this->attributeMetadataHydratorMock
+                'attributeMetadataHydrator' => $this->attributeMetadataHydratorMock,
+                'storeManager' => $this->storeManagerMock
             ]
         );
     }
@@ -80,7 +102,8 @@ public function testLoadNoCache()
     {
         $entityType = 'EntityType';
         $suffix = 'none';
-        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+        $storeId = 1;
+        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
         $this->stateMock->expects($this->once())
             ->method('isEnabled')
             ->with(Type::TYPE_IDENTIFIER)
@@ -96,7 +119,8 @@ public function testLoad()
     {
         $entityType = 'EntityType';
         $suffix = 'none';
-        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+        $storeId = 1;
+        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
         $serializedString = 'serialized string';
         $attributeMetadataOneData = [
             'attribute_code' => 'attribute_code',
@@ -156,7 +180,8 @@ public function testSave()
     {
         $entityType = 'EntityType';
         $suffix = 'none';
-        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix;
+        $storeId = 1;
+        $cacheKey = AttributeMetadataCache::ATTRIBUTE_METADATA_CACHE_PREFIX . $entityType . $suffix . $storeId;
         $serializedString = 'serialized string';
         $attributeMetadataOneData = [
             'attribute_code' => 'attribute_code',

From 1e3dcd554d5f4f6e00ac88aaecc858aeb295ef2a Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Mon, 29 Oct 2018 15:30:05 +0400
Subject: [PATCH 070/932] MAGETWO-95813: Only two bundle options are added to
 the cart

- Add automated test.
---
 .../CreateBundleProductActionGroup.xml        |  70 +++++++++
 .../Mftf/Data/BundleProductsSummaryData.xml   |  17 +++
 .../Mftf/Section/StorefrontBundledSection.xml |   2 +
 .../StorefrontAddBundleOptionsToCartTest.xml  | 140 ++++++++++++++++++
 4 files changed, 229 insertions(+)
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Data/BundleProductsSummaryData.xml
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
index 72e729111948f..d86d720ed7f5d 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/CreateBundleProductActionGroup.xml
@@ -56,4 +56,74 @@
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '0')}}" userInput="50" stepKey="fillQuantity1"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '1')}}" userInput="50" stepKey="fillQuantity2"/>
     </actionGroup>
+
+    <actionGroup name="addBundleOptionWithOneProduct" extends="addBundleOptionWithTwoProducts">
+        <remove keyForRemoval="openProductFilters2"/>
+        <remove keyForRemoval="fillProductSkuFilter2"/>
+        <remove keyForRemoval="clickApplyFilters2"/>
+        <remove keyForRemoval="waitForFilteredGridLoad2"/>
+        <remove keyForRemoval="selectProduct2"/>
+        <remove keyForRemoval="selectProduct2"/>
+        <remove keyForRemoval="fillQuantity1"/>
+        <remove keyForRemoval="fillQuantity2"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '0')}}" userInput="1" stepKey="fillQuantity" after="clickAddButton1"/>
+    </actionGroup>
+
+    <actionGroup name="addBundleOptionWithTreeProducts" extends="addBundleOptionWithTwoProducts">
+        <arguments>
+            <argument name="prodTreeSku" type="string"/>
+        </arguments>
+        <remove keyForRemoval="fillQuantity1"/>
+        <remove keyForRemoval="fillQuantity2"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters3" after="selectProduct2"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters3" after="clickClearFilters3"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodTreeSku}}" stepKey="fillProductSkuFilter3" after="openProductFilters3"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters3" after="fillProductSkuFilter3"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad3" time="30" after="clickApplyFilters3"/>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct3" after="waitForFilteredGridLoad3"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '0')}}" userInput="1" stepKey="fillQuantity1" after="clickAddButton1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '1')}}" userInput="1" stepKey="fillQuantity2" after="fillQuantity1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '2')}}" userInput="1" stepKey="fillQuantity3" after="fillQuantity2"/>
+    </actionGroup>
+
+    <actionGroup name="addBundleOptionWithSixProducts" extends="addBundleOptionWithTwoProducts">
+        <arguments>
+            <argument name="prodTreeSku" type="string"/>
+            <argument name="prodFourSku" type="string"/>
+            <argument name="prodFiveSku" type="string"/>
+            <argument name="prodSixSku" type="string"/>
+        </arguments>
+        <remove keyForRemoval="fillQuantity1"/>
+        <remove keyForRemoval="fillQuantity2"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters3" after="selectProduct2"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters3" after="clickClearFilters3"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodTreeSku}}" stepKey="fillProductSkuFilter3" after="openProductFilters3"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters3" after="fillProductSkuFilter3"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad3" time="30" after="clickApplyFilters3"/>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct3" after="waitForFilteredGridLoad3"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters4" after="selectProduct3"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters4" after="clickClearFilters4"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodFourSku}}" stepKey="fillProductSkuFilter4" after="openProductFilters4"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters4" after="fillProductSkuFilter4"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad4" time="30" after="clickApplyFilters4"/>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct4" after="clickApplyFilters4"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters5" after="selectProduct4"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters5" after="clickClearFilters5"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodFiveSku}}" stepKey="fillProductSkuFilter5" after="openProductFilters5"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters5" after="fillProductSkuFilter5"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad5" time="30" after="clickApplyFilters5"/>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct5" after="waitForFilteredGridLoad5"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters6" after="selectProduct5"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters6" after="clickClearFilters6"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{prodSixSku}}" stepKey="fillProductSkuFilter6" after="openProductFilters6"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters6" after="fillProductSkuFilter6"/>
+        <waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad6" time="30" after="clickApplyFilters6"/>
+        <checkOption selector="{{AdminAddProductsToOptionPanel.firstCheckbox}}" stepKey="selectProduct6" after="waitForFilteredGridLoad6"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '0')}}" userInput="2" stepKey="fillQuantity1" after="clickAddButton1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '1')}}" userInput="2" stepKey="fillQuantity2" after="fillQuantity1"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '2')}}" userInput="2" stepKey="fillQuantity3" after="fillQuantity2"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '3')}}" userInput="2" stepKey="fillQuantity4" after="fillQuantity3"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '4')}}" userInput="2" stepKey="fillQuantity5" after="fillQuantity4"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity(x, '5')}}" userInput="2" stepKey="fillQuantity6" after="fillQuantity5"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductsSummaryData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductsSummaryData.xml
new file mode 100644
index 0000000000000..5cd286c0c6aa1
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/BundleProductsSummaryData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="BundleProductsSummary" type="Quote">
+        <data key="subtotal">1,968.00</data>
+        <data key="shipping">5.00</data>
+        <data key="total">1,973.00</data>
+        <data key="shippingMethod">Flat Rate - Fixed</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
index 8d9f29814f762..05550f0cd1e3a 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
@@ -9,6 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontBundledSection">
+        <element name="productCheckbox" type="select" selector="//*[@id='customizeTitle']/following-sibling::div[{{arg1}}]//div[{{arg2}}][@class='field choice']/input" parameterized="true"/>
+        <element name="bundleProductsPrice" type="text" selector="//*[@class='bundle-info']//*[contains(@id,'product-price')]/span"/>
         <element name="nthBundledOption" type="input" selector=".option:nth-of-type({{numOption}}) .choice:nth-of-type({{numOptionSelect}}) input" parameterized="true"/>
         <element name="addToCart" type="button" selector="#bundle-slide" timeout="30"/>
         <element name="addToCartConfigured" type="button" selector="#product-addtocart-button" timeout="30"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
new file mode 100644
index 0000000000000..6ea5a2842470b
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
@@ -0,0 +1,140 @@
+<?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="StorefrontAddBundleOptionsToCartTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="MAGETWO-95813: Only two bundle options are added to the cart"/>
+            <title value="Checking adding of bundle options to the cart"/>
+            <description value="Verifying adding of bundle options to the cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95933"/>
+            <group value="Bundle"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct3"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct4"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct5"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct6"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct7"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct8"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct9"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct10"/>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
+            <deleteData createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
+            <deleteData createDataKey="simpleProduct6" stepKey="deleteSimpleProduct6"/>
+            <deleteData createDataKey="simpleProduct7" stepKey="deleteSimpleProduct7"/>
+            <deleteData createDataKey="simpleProduct8" stepKey="deleteSimpleProduct8"/>
+            <deleteData createDataKey="simpleProduct9" stepKey="deleteSimpleProduct9"/>
+            <deleteData createDataKey="simpleProduct10" stepKey="deleteSimpleProduct10"/>
+            <!--delete created bundle product-->
+            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+                <argument name="sku" value="{{BundleProduct.sku}}"/>
+            </actionGroup>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
+                              dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Start creating a bundle product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+
+        <!-- Add Option One, a "Checkbox" type option, with tree products -->
+        <actionGroup ref="addBundleOptionWithTreeProducts" stepKey="addBundleOptionWithTreeProducts">
+            <argument name="x" value="0"/>
+            <argument name="n" value="1"/>
+            <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+            <argument name="prodTreeSku" value="$$simpleProduct3.sku$$"/>
+            <argument name="optionTitle" value="Option One"/>
+            <argument name="inputType" value="checkbox"/>
+        </actionGroup>
+
+        <!-- Add Option Two, a "Radio Buttons" type option, with one product -->
+        <actionGroup ref="addBundleOptionWithOneProduct" stepKey="addBundleOptionWithOneProduct">
+            <argument name="x" value="1"/>
+            <argument name="n" value="2"/>
+            <argument name="prodOneSku" value="$$simpleProduct4.sku$$"/>
+            <argument name="prodTwoSku" value=""/>
+            <argument name="optionTitle" value="Option Two"/>
+            <argument name="inputType" value="radio"/>
+        </actionGroup>
+
+        <!-- Add Option Tree, a "Checkbox" type option, with six products -->
+        <actionGroup ref="addBundleOptionWithSixProducts" stepKey="addBundleOptionWithSixProducts">
+            <argument name="x" value="2"/>
+            <argument name="n" value="3"/>
+            <argument name="prodOneSku" value="$$simpleProduct5.sku$$"/>
+            <argument name="prodTwoSku" value="$$simpleProduct6.sku$$"/>
+            <argument name="prodTreeSku" value="$$simpleProduct7.sku$$"/>
+            <argument name="prodFourSku" value="$$simpleProduct8.sku$$"/>
+            <argument name="prodFiveSku" value="$$simpleProduct9.sku$$"/>
+            <argument name="prodSixSku" value="$$simpleProduct10.sku$$"/>
+            <argument name="optionTitle" value="Option Tree"/>
+            <argument name="inputType" value="checkbox"/>
+        </actionGroup>
+
+        <!-- Save product-->
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Go to Storefront and open Bundle Product page-->
+        <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+
+        <!--Click "Customize and Add to Cart" button-->
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+
+        <!--Assert Bundle Product Price-->
+        <grabTextFrom selector="{{StorefrontBundledSection.bundleProductsPrice}}" stepKey="grabProductsPrice"/>
+        <assertEquals expected='$123.00' expectedType="string" actual="$grabProductsPrice" message="ExpectedPrice" stepKey="assertBundleProductPrice"/>
+
+        <!--Chose all products from 1st & 3rd options -->
+        <click stepKey="selectProduct1" selector="{{StorefrontBundledSection.productCheckbox('1','1')}}"/>
+        <click stepKey="selectProduct2" selector="{{StorefrontBundledSection.productCheckbox('1','2')}}"/>
+        <click stepKey="selectProduct3" selector="{{StorefrontBundledSection.productCheckbox('1','3')}}"/>
+        <click stepKey="selectProduct5" selector="{{StorefrontBundledSection.productCheckbox('3','1')}}"/>
+        <click stepKey="selectProduct6" selector="{{StorefrontBundledSection.productCheckbox('3','2')}}"/>
+        <click stepKey="selectProduct7" selector="{{StorefrontBundledSection.productCheckbox('3','3')}}"/>
+        <click stepKey="selectProduct8" selector="{{StorefrontBundledSection.productCheckbox('3','4')}}"/>
+        <click stepKey="selectProduct9" selector="{{StorefrontBundledSection.productCheckbox('3','5')}}"/>
+        <click stepKey="selectProduct10" selector="{{StorefrontBundledSection.productCheckbox('3','6')}}"/>
+
+        <!--Click "Add to Cart" button-->
+        <click selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="clickAddBundleProductToCart"/>
+        <waitForPageLoad time="30" stepKey="waitForAddBundleProductPageLoad"/>
+
+        <!--Click "mini cart" icon-->
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
+        <waitForPageLoad stepKey="waitForDetailsOpen"/>
+
+        <!--Check all products and Cart Subtotal -->
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert" after="waitForDetailsOpen">
+            <argument name="subtotal" value="BundleProductsSummary.subtotal"/>
+            <argument name="shipping" value="BundleProductsSummary.shipping"/>
+            <argument name="shippingMethod" value="BundleProductsSummary.shippingMethod"/>
+            <argument name="total" value="BundleProductsSummary.total"/>
+        </actionGroup>
+    </test>
+</tests>

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 071/932] 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 44770feab4fb0ea65ab5fc10c5de077df31c8e35 Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Mon, 29 Oct 2018 17:54:16 +0300
Subject: [PATCH 072/932] MAGETWO-95819: Customer registration fields not
 translated

- Added retrieving store labels of attributes in customer widgets
---
 .../Magento/Customer/Block/Widget/Dob.php     | 27 ++++++++++++++++++-
 .../Magento/Customer/Block/Widget/Gender.php  | 16 +++++++++++
 .../Magento/Customer/Block/Widget/Taxvat.php  | 13 +++++++++
 .../view/frontend/templates/widget/dob.phtml  |  2 +-
 .../frontend/templates/widget/gender.phtml    |  4 +--
 .../frontend/templates/widget/taxvat.phtml    |  4 +--
 6 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index 936563d519823..55101fb82afd0 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -61,7 +61,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     public function _construct()
     {
@@ -70,6 +70,8 @@ public function _construct()
     }
 
     /**
+     * Check if dob attribute enabled in system
+     *
      * @return bool
      */
     public function isEnabled()
@@ -79,6 +81,8 @@ public function isEnabled()
     }
 
     /**
+     * Check if dob attribute marked as required
+     *
      * @return bool
      */
     public function isRequired()
@@ -88,6 +92,8 @@ public function isRequired()
     }
 
     /**
+     * Set date
+     *
      * @param string $date
      * @return $this
      */
@@ -135,6 +141,8 @@ protected function applyOutputFilter($value)
     }
 
     /**
+     * Get day
+     *
      * @return string|bool
      */
     public function getDay()
@@ -143,6 +151,8 @@ public function getDay()
     }
 
     /**
+     * Get month
+     *
      * @return string|bool
      */
     public function getMonth()
@@ -151,6 +161,8 @@ public function getMonth()
     }
 
     /**
+     * Get year
+     *
      * @return string|bool
      */
     public function getYear()
@@ -168,6 +180,19 @@ public function getLabel()
         return __('Date of Birth');
     }
 
+    /**
+     * Retrieve store attribute label
+     *
+     * @param string $attributeCode
+     *
+     * @return string
+     */
+    public function getStoreLabel($attributeCode)
+    {
+        $attribute = $this->_getAttribute($attributeCode);
+        return $attribute ? __($attribute->getStoreLabel()) : '';
+    }
+
     /**
      * Create correct date field
      *
diff --git a/app/code/Magento/Customer/Block/Widget/Gender.php b/app/code/Magento/Customer/Block/Widget/Gender.php
index d03c64a54fb94..9df3f1072ce0c 100644
--- a/app/code/Magento/Customer/Block/Widget/Gender.php
+++ b/app/code/Magento/Customer/Block/Widget/Gender.php
@@ -64,6 +64,7 @@ public function _construct()
 
     /**
      * Check if gender attribute enabled in system
+     *
      * @return bool
      */
     public function isEnabled()
@@ -73,6 +74,7 @@ public function isEnabled()
 
     /**
      * Check if gender attribute marked as required
+     *
      * @return bool
      */
     public function isRequired()
@@ -80,6 +82,19 @@ public function isRequired()
         return $this->_getAttribute('gender') ? (bool)$this->_getAttribute('gender')->isRequired() : false;
     }
 
+    /**
+     * Retrieve store attribute label
+     *
+     * @param string $attributeCode
+     *
+     * @return string
+     */
+    public function getStoreLabel($attributeCode)
+    {
+        $attribute = $this->_getAttribute($attributeCode);
+        return $attribute ? __($attribute->getStoreLabel()) : '';
+    }
+
     /**
      * Get current customer from session
      *
@@ -92,6 +107,7 @@ public function getCustomer()
 
     /**
      * Returns options from gender attribute
+     *
      * @return OptionInterface[]
      */
     public function getGenderOptions()
diff --git a/app/code/Magento/Customer/Block/Widget/Taxvat.php b/app/code/Magento/Customer/Block/Widget/Taxvat.php
index e5c9c01dc3ac5..e35f04f592a43 100644
--- a/app/code/Magento/Customer/Block/Widget/Taxvat.php
+++ b/app/code/Magento/Customer/Block/Widget/Taxvat.php
@@ -63,4 +63,17 @@ public function isRequired()
     {
         return $this->_getAttribute('taxvat') ? (bool)$this->_getAttribute('taxvat')->isRequired() : false;
     }
+
+    /**
+     * Retrieve store attribute label
+     *
+     * @param string $attributeCode
+     *
+     * @return string
+     */
+    public function getStoreLabel($attributeCode)
+    {
+        $attribute = $this->_getAttribute($attributeCode);
+        return $attribute ? __($attribute->getStoreLabel()) : '';
+    }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
index 0a37896b810c4..31510a65ef741 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
@@ -29,7 +29,7 @@ $fieldCssClass = 'field date field-' . $block->getHtmlId();
 $fieldCssClass .= $block->isRequired() ? ' required' : '';
 ?>
 <div class="<?= $block->escapeHtmlAttr($fieldCssClass) ?>">
-    <label class="label" for="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"><span><?= $block->escapeHtml($block->getLabel()) ?></span></label>
+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('dob')) ?></span></label>
     <div class="control customer-dob">
         <?= $block->getFieldHtml() ?>
         <?php if ($_message = $block->getAdditionalDescription()) : ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
index d60f0968ad4fe..8b45618a891ef 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
@@ -9,9 +9,9 @@
 /** @var \Magento\Customer\Block\Widget\Gender $block */
 ?>
 <div class="field gender<?php if ($block->isRequired()) echo ' required' ?>">
-    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>"><span><?= $block->escapeHtml(__('Gender')) ?></span></label>
+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('gender')) ?></span></label>
     <div class="control">
-        <select id="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('gender')) ?>" title="<?= $block->escapeHtmlAttr(__('Gender')) ?>"<?php if ($block->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?>>
+        <select id="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('gender')) ?>" title="<?= $block->escapeHtmlAttr($block->getStoreLabel('gender')) ?>"<?php if ($block->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?>>
             <?php $options = $block->getGenderOptions(); ?>
             <?php $value = $block->getGender();?>
             <?php foreach ($options as $option):?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
index 4b3681d4d8fd3..bb60845a64e6d 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
@@ -9,8 +9,8 @@
 /** @var \Magento\Customer\Block\Widget\Taxvat $block */
 ?>
 <div class="field taxvat<?php if ($block->isRequired()) echo ' required'; ?>">
-    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>"><span><?= $block->escapeHtml(__('Tax/VAT number')) ?></span></label>
+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('taxvat')) ?></span></label>
     <div class="control">
-        <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('taxvat')) ?>" value="<?= $block->escapeHtmlAttr($block->getTaxvat()) ?>" title="<?= $block->escapeHtmlAttr(__('Tax/VAT number')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat')) ?>" <?php if ($block->isRequired()) echo ' data-validate="{required:true}"' ?>>
+        <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('taxvat')) ?>" value="<?= $block->escapeHtmlAttr($block->getTaxvat()) ?>" title="<?= $block->escapeHtmlAttr($block->getStoreLabel('taxvat')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat')) ?>" <?php if ($block->isRequired()) echo ' data-validate="{required:true}"' ?>>
     </div>
 </div>

From ee77a82947630ea422ebf3d960c6e9ca1a9d4808 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 29 Oct 2018 17:15:21 +0200
Subject: [PATCH 073/932] MAGETWO-95945: Add a code mess rule for improper
 session and cookies usages

---
 .../Block/Account/AuthenticationPopup.php     |  14 +-
 .../Customer/Controller/Account/Confirm.php   |   2 +-
 .../Ui/Component/DataProvider/Document.php    |  13 +-
 .../Action/Plugin/BackendAuthentication.php   |  13 +-
 .../Rule/Design/CookieAndSessionMisuse.php    | 169 ++++++++++++++++++
 .../resources/rulesets/design.xml             |  29 +++
 .../Magento/Test/Php/_files/phpmd/ruleset.xml |   1 +
 7 files changed, 234 insertions(+), 7 deletions(-)
 create mode 100644 dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php

diff --git a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
index 07e0704ee6e43..648ff392e2486 100644
--- a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
+++ b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
@@ -6,6 +6,7 @@
 namespace Magento\Customer\Block\Account;
 
 use Magento\Customer\Model\Form;
+use Magento\Customer\Model\Session;
 use Magento\Store\Model\ScopeInterface;
 
 /**
@@ -24,21 +25,29 @@ class AuthenticationPopup extends \Magento\Framework\View\Element\Template
      */
     private $serializer;
 
+    /**
+     * @var Session|null
+     */
+    private $session;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param Session|null $session
      * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         array $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        Session $session = null
     ) {
         parent::__construct($context, $data);
         $this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->session = $session;
     }
 
     /**
@@ -60,7 +69,8 @@ public function getConfig()
             'autocomplete' => $this->escapeHtml($this->isAutocompleteEnabled()),
             'customerRegisterUrl' => $this->escapeUrl($this->getCustomerRegisterUrlUrl()),
             'customerForgotPasswordUrl' => $this->escapeUrl($this->getCustomerForgotPasswordUrl()),
-            'baseUrl' => $this->escapeUrl($this->getBaseUrl())
+            'baseUrl' => $this->escapeUrl($this->getBaseUrl()),
+            'tst' => $this->session->getData('somedata')
         ];
     }
 
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index 2b3cb9aa61ab5..5299ce8c3efe4 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -167,7 +167,7 @@ public function execute()
             $resultRedirect->setUrl($this->getSuccessRedirect());
             return $resultRedirect;
         } catch (StateException $e) {
-            $this->messageManager->addException($e, __('This confirmation key is invalid or has expired.'));
+            $this->messageManager->addException($e, __('This confirmation key is invalid or has expired.TEST'));
         } catch (\Exception $e) {
             $this->messageManager->addException($e, __('There was an error confirming the account'));
         }
diff --git a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
index 468a9e7946f2d..86ec19d43b0ac 100644
--- a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
+++ b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\Cookie\CookieReaderInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -70,6 +71,11 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
      */
     private $scopeConfig;
 
+    /**
+     * @var CookieReaderInterface
+     */
+    private $cookie;
+
     /**
      * Document constructor.
      *
@@ -78,19 +84,22 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
      * @param CustomerMetadataInterface $customerMetadata
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
+     * @param CookieReaderInterface|null $cookie
      */
     public function __construct(
         AttributeValueFactory $attributeValueFactory,
         GroupRepositoryInterface $groupRepository,
         CustomerMetadataInterface $customerMetadata,
         StoreManagerInterface $storeManager,
-        ScopeConfigInterface $scopeConfig = null
+        ScopeConfigInterface $scopeConfig = null,
+        CookieReaderInterface $cookie = null
     ) {
         parent::__construct($attributeValueFactory);
         $this->customerMetadata = $customerMetadata;
         $this->groupRepository = $groupRepository;
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->create(ScopeConfigInterface::class);
+        $this->cookie = $cookie;
     }
 
     /**
@@ -129,7 +138,7 @@ private function setGenderValue()
         $value = $this->getData(self::$genderAttributeCode);
         
         if (!$value) {
-            $this->setCustomAttribute(self::$genderAttributeCode, 'N/A');
+            $this->setCustomAttribute(self::$genderAttributeCode, $this->cookie->getCookie('NA'));
             return;
         }
 
diff --git a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
index 5351bee8b5d56..f8eec0858890d 100644
--- a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
+++ b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
@@ -8,6 +8,7 @@
 namespace Magento\Rss\App\Action\Plugin;
 
 use Magento\Backend\App\AbstractAction;
+use Magento\Backend\Model\Session;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Exception\AuthenticationException;
@@ -39,6 +40,11 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
      */
     protected $aclResources;
 
+    /**
+     * @var Session
+     */
+    private $session;
+
     /**
      * @param \Magento\Backend\Model\Auth $auth
      * @param \Magento\Backend\Model\UrlInterface $url
@@ -53,6 +59,7 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param array $aclResources
+     * @param Session $session
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -68,12 +75,14 @@ public function __construct(
         \Magento\Framework\HTTP\Authentication $httpAuthentication,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\AuthorizationInterface $authorization,
-        array $aclResources
+        array $aclResources,
+        Session $session
     ) {
         $this->httpAuthentication = $httpAuthentication;
         $this->logger = $logger;
         $this->authorization = $authorization;
         $this->aclResources = $aclResources;
+        $this->session = $session;
         parent::__construct(
             $auth,
             $url,
@@ -106,7 +115,7 @@ public function aroundDispatch(AbstractAction $subject, \Closure $proceed, Reque
                 : $this->aclResources[$request->getControllerName()]
             : null;
 
-        $type = $request->getParam('type');
+        $type = $request->getParam('type'.$this->session->getName());
         $resourceType = isset($this->aclResources[$type]) ? $this->aclResources[$type] : null;
 
         if (!$resource || !$resourceType) {
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
new file mode 100644
index 0000000000000..fd1e4238258ab
--- /dev/null
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CodeMessDetector\Rule\Design;
+
+use PDepend\Source\AST\ASTClass;
+use PHPMD\AbstractNode;
+use PHPMD\AbstractRule;
+use PHPMD\Node\ClassNode;
+use PHPMD\Rule\ClassAware;
+
+/**
+ * Session and Cookies must be used only in HTML Presentation layer.
+ */
+class CookieAndSessionMisuse extends AbstractRule implements ClassAware
+{
+    /**
+     * Is given class a controller?
+     *
+     * @param \ReflectionClass $class
+     * @return bool
+     */
+    private function isController(\ReflectionClass $class): bool
+    {
+        return $class->isSubclassOf(\Magento\Framework\App\ActionInterface::class);
+    }
+
+    /**
+     * Is given class a block?
+     *
+     * @param \ReflectionClass $class
+     * @return bool
+     */
+    private function isBlock(\ReflectionClass $class): bool
+    {
+        return $class->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class);
+    }
+
+    /**
+     * Is given class an HTML UI data provider?
+     *
+     * @param \ReflectionClass $class
+     * @return bool
+     */
+    private function isUiDataProvider(\ReflectionClass $class): bool
+    {
+        return $class->isSubclassOf(
+            \Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface::class
+        );
+    }
+
+    /**
+     * Is given class an HTML UI Document?
+     *
+     * @param \ReflectionClass $class
+     * @return bool
+     */
+    private function isUiDocument(\ReflectionClass $class): bool
+    {
+        return $class->isSubclassOf(\Magento\Framework\View\Element\UiComponent\DataProvider\Document::class)
+            || $class->getName() === \Magento\Framework\View\Element\UiComponent\DataProvider\Document::class;
+    }
+
+    /**
+     * Is given class a plugin for controllers?
+     *
+     * @param \ReflectionClass $class
+     * @return bool
+     */
+    private function isControllerPlugin(\ReflectionClass $class): bool
+    {
+        try {
+            foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+                if (preg_match('/^(after|around|before).+/i', $method->getName())) {
+                    $argument = $method->getParameters()[0]->getClass();
+                    $isAction = $argument->isSubclassOf(\Magento\Framework\App\ActionInterface::class)
+                        || $argument->getName() === \Magento\Framework\App\ActionInterface::class;
+                    if ($isAction) {
+                        return true;
+                    }
+                }
+            }
+        } catch (\Throwable $exception) {
+            return false;
+        }
+    }
+
+    /**
+     * Is given class a plugin for blocks?
+     *
+     * @param \ReflectionClass $class
+     * @return bool
+     */
+    private function isBlockPlugin(\ReflectionClass $class): bool
+    {
+        try {
+            foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+                if (preg_match('/^(after|around|before).+/i', $method->getName())) {
+                    $argument = $method->getParameters()[0]->getClass();
+                    $isBlock = $argument->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class)
+                        || $argument->getName() === \Magento\Framework\View\Element\BlockInterface::class;
+                    if ($isBlock) {
+                        return true;
+                    }
+                }
+            }
+        } catch (\Throwable $exception) {
+            return false;
+        }
+    }
+
+    /**
+     * Whether given class depends on classes to pay attention to.
+     *
+     * @param \ReflectionClass $class
+     * @return bool
+     */
+    private function doesUseRestrictedClasses(\ReflectionClass $class): bool
+    {
+        $constructor = $class->getConstructor();
+        if ($constructor) {
+            foreach ($constructor->getParameters() as $argument) {
+                if ($class = $argument->getClass()) {
+                    if ($class->isSubclassOf(\Magento\Framework\Session\SessionManagerInterface::class)
+                        || $class->getName() === \Magento\Framework\Session\SessionManagerInterface::class
+                        || $class->isSubclassOf(\Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class)
+                        || $class->getName() === \Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class
+                    ) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @param ClassNode|ASTClass $node
+     */
+    public function apply(AbstractNode $node)
+    {
+        try {
+            $class = new \ReflectionClass($node->getFullQualifiedName());
+        } catch (\Throwable $exception) {
+            //Failed to load class, nothing we can do
+            return;
+        }
+
+        if ($this->doesUseRestrictedClasses($class)) {
+            if (!$this->isController($class)
+                && !$this->isBlock($class)
+                && !$this->isUiDataProvider($class)
+                && !$this->isUiDocument($class)
+                && !$this->isControllerPlugin($class)
+                && !$this->isBlockPlugin($class)
+            ) {
+                $this->addViolation($node, [$node->getFullQualifiedName()]);
+            }
+        }
+    }
+}
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
index c9bfe4fe6e308..79622331fe5e7 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
@@ -54,6 +54,35 @@ class PostOrder implements ActionInterface
         ...
         return $response;
     }
+}
+            ]]>
+        </example>
+    </rule>
+    <rule name="CookieAndSessionMisuse"
+          class="Magento\CodeMessDetector\Rule\Design\CookieAndSessionMisuse"
+          message= "The class {0} uses sessions or cookies while not being a part of HTML Presentation layer">
+        <description>
+            <![CDATA[
+Sessions and cookies must only be used in classes directly responsible for HTML presentation because Web APIs do not
+rely on cookies and sessions
+            ]]>
+        </description>
+        <priority>2</priority>
+        <properties />
+        <example>
+            <![CDATA[
+class OrderProcessor
+{
+    public function __construct(SessionManagerInterface $session) {
+        $this->session = $session;
+    }
+
+    public function place(OrderInterface $order)
+    {
+        //Will not be present if processing a WebAPI request
+        $currentOrder = $this->session->get('current_order');
+        ...
+    }
 }
             ]]>
         </example>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
index fddb1e6fdfc14..7a402818eb0b9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
@@ -48,5 +48,6 @@
     <!-- Magento Specific Rules -->
     <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/FinalImplementation" />
     <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/AllPurposeAction" />
+    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/CookieAndSessionMisuse" />
 
 </ruleset>

From b7a8be5a33030c279da996c1f794fe5ad4d4f4f7 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 29 Oct 2018 17:38:47 +0200
Subject: [PATCH 074/932] MAGETWO-95945: Add a code mess rule for improper
 session and cookies usages

---
 .../Block/Account/AuthenticationPopup.php      |  4 ++++
 .../Customer/Controller/Account/Confirm.php    |  3 ++-
 .../Customer/Model/CustomerManagement.php      | 17 ++++++++++++++---
 .../Magento/Customer/Model/FileProcessor.php   | 18 ++++++++++++++++--
 .../Action/Plugin/BackendAuthentication.php    |  2 ++
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
index 648ff392e2486..4e4811546a5f9 100644
--- a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
+++ b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
@@ -10,6 +10,8 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
+ * Popup.
+ *
  * @api
  * @since 100.0.2
  */
@@ -51,6 +53,8 @@ public function __construct(
     }
 
     /**
+     * JS layout.
+     *
      * @return string
      */
     public function getJsLayout()
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index 5299ce8c3efe4..7459e263177d9 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Model\Url;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
@@ -24,7 +25,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Confirm extends \Magento\Customer\Controller\AbstractAccount
+class Confirm extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
diff --git a/app/code/Magento/Customer/Model/CustomerManagement.php b/app/code/Magento/Customer/Model/CustomerManagement.php
index a9f5c3b7631a5..7da87a829d8e0 100644
--- a/app/code/Magento/Customer/Model/CustomerManagement.php
+++ b/app/code/Magento/Customer/Model/CustomerManagement.php
@@ -7,7 +7,11 @@
 
 use Magento\Customer\Api\CustomerManagementInterface;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
+use Magento\Framework\Stdlib\Cookie\PhpCookieReader;
 
+/**
+ * Class CustomerManagement
+ */
 class CustomerManagement implements CustomerManagementInterface
 {
     /**
@@ -15,21 +19,28 @@ class CustomerManagement implements CustomerManagementInterface
      */
     protected $customersFactory;
 
+    /**
+     * @var PhpCookieReader
+     */
+    private $cookie;
+
     /**
      * @param CollectionFactory $customersFactory
+     * @param PhpCookieReader $cookie
      */
-    public function __construct(CollectionFactory $customersFactory)
+    public function __construct(CollectionFactory $customersFactory, PhpCookieReader $cookie)
     {
         $this->customersFactory = $customersFactory;
+        $this->cookie = $cookie;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getCount()
     {
         $customers = $this->customersFactory->create();
         /** @var \Magento\Customer\Model\ResourceModel\Customer\Collection $customers */
-        return $customers->getSize();
+        return $customers->getSize() || $this->cookie->getCookie('tst');
     }
 }
diff --git a/app/code/Magento/Customer/Model/FileProcessor.php b/app/code/Magento/Customer/Model/FileProcessor.php
index 6a8472758c169..09c72a3dbed74 100644
--- a/app/code/Magento/Customer/Model/FileProcessor.php
+++ b/app/code/Magento/Customer/Model/FileProcessor.php
@@ -5,6 +5,12 @@
  */
 namespace Magento\Customer\Model;
 
+use Magento\Framework\Session\SessionManagerInterface;
+
+/**
+ * Class FileProcessor
+ * @package Magento\Customer\Model
+ */
 class FileProcessor
 {
     /**
@@ -47,6 +53,11 @@ class FileProcessor
      */
     private $mime;
 
+    /**
+     * @var SessionManagerInterface
+     */
+    private $session;
+
     /**
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\MediaStorage\Model\File\UploaderFactory $uploaderFactory
@@ -55,6 +66,7 @@ class FileProcessor
      * @param string $entityTypeCode
      * @param \Magento\Framework\File\Mime $mime
      * @param array $allowedExtensions
+     * @param SessionManagerInterface|null $session
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -63,7 +75,8 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         $entityTypeCode,
         \Magento\Framework\File\Mime $mime,
-        array $allowedExtensions = []
+        array $allowedExtensions = [],
+        SessionManagerInterface $session = null
     ) {
         $this->mediaDirectory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
         $this->uploaderFactory = $uploaderFactory;
@@ -72,6 +85,7 @@ public function __construct(
         $this->entityTypeCode = $entityTypeCode;
         $this->mime = $mime;
         $this->allowedExtensions = $allowedExtensions;
+        $this->session = $session;
     }
 
     /**
@@ -244,7 +258,7 @@ public function moveTemporaryFile($fileName)
      */
     public function removeUploadedFile($fileName)
     {
-        $filePath = $this->entityTypeCode . '/' . ltrim($fileName, '/');
+        $filePath = $this->entityTypeCode . '/' . ltrim($fileName, '/').$this->session->getName();
 
         $result = $this->mediaDirectory->delete($filePath);
         return $result;
diff --git a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
index f8eec0858890d..18e0863cade03 100644
--- a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
+++ b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
@@ -14,6 +14,8 @@
 use Magento\Framework\Exception\AuthenticationException;
 
 /**
+ * Backend auth.
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2

From 9f92a455fdf127bccd949418bfd6e615456a09f0 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 29 Oct 2018 17:50:38 +0200
Subject: [PATCH 075/932] MAGETWO-95945: Add a code mess rule for improper
 session and cookies usages

---
 .../Rule/Design/CookieAndSessionMisuse.php    | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
index fd1e4238258ab..2cf88834b4793 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
@@ -77,7 +77,12 @@ private function isControllerPlugin(\ReflectionClass $class): bool
         try {
             foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
                 if (preg_match('/^(after|around|before).+/i', $method->getName())) {
-                    $argument = $method->getParameters()[0]->getClass();
+                    try {
+                        $argument = $method->getParameters()[0]->getClass();
+                    } catch (\ReflectionException $exception) {
+                        //Non-existing class (autogenerated perhaps)
+                        continue;
+                    }
                     $isAction = $argument->isSubclassOf(\Magento\Framework\App\ActionInterface::class)
                         || $argument->getName() === \Magento\Framework\App\ActionInterface::class;
                     if ($isAction) {
@@ -101,7 +106,12 @@ private function isBlockPlugin(\ReflectionClass $class): bool
         try {
             foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
                 if (preg_match('/^(after|around|before).+/i', $method->getName())) {
-                    $argument = $method->getParameters()[0]->getClass();
+                    try {
+                        $argument = $method->getParameters()[0]->getClass();
+                    } catch (\ReflectionException $exception) {
+                        //Non-existing class (autogenerated perhaps)
+                        continue;
+                    }
                     $isBlock = $argument->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class)
                         || $argument->getName() === \Magento\Framework\View\Element\BlockInterface::class;
                     if ($isBlock) {
@@ -125,14 +135,19 @@ private function doesUseRestrictedClasses(\ReflectionClass $class): bool
         $constructor = $class->getConstructor();
         if ($constructor) {
             foreach ($constructor->getParameters() as $argument) {
-                if ($class = $argument->getClass()) {
-                    if ($class->isSubclassOf(\Magento\Framework\Session\SessionManagerInterface::class)
-                        || $class->getName() === \Magento\Framework\Session\SessionManagerInterface::class
-                        || $class->isSubclassOf(\Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class)
-                        || $class->getName() === \Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class
-                    ) {
-                        return true;
+                try {
+                    if ($class = $argument->getClass()) {
+                        if ($class->isSubclassOf(\Magento\Framework\Session\SessionManagerInterface::class)
+                            || $class->getName() === \Magento\Framework\Session\SessionManagerInterface::class
+                            || $class->isSubclassOf(\Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class)
+                            || $class->getName() === \Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class
+                        ) {
+                            return true;
+                        }
                     }
+                } catch (\ReflectionException $exception) {
+                    //Failed to load the argument's class information
+                    continue;
                 }
             }
         }

From 32993d2fa49833d1837346523d6594554dec4059 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 29 Oct 2018 17:56:46 +0200
Subject: [PATCH 076/932] MAGETWO-95945: Add a code mess rule for improper
 session and cookies usages

---
 .../Magento/Customer/Model/FileProcessor.php  |  1 -
 .../Rule/Design/CookieAndSessionMisuse.php    | 60 +++++++++----------
 2 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Customer/Model/FileProcessor.php b/app/code/Magento/Customer/Model/FileProcessor.php
index 09c72a3dbed74..c035af0f7c551 100644
--- a/app/code/Magento/Customer/Model/FileProcessor.php
+++ b/app/code/Magento/Customer/Model/FileProcessor.php
@@ -9,7 +9,6 @@
 
 /**
  * Class FileProcessor
- * @package Magento\Customer\Model
  */
 class FileProcessor
 {
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
index 2cf88834b4793..f95eeeb5640e1 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
@@ -74,25 +74,23 @@ private function isUiDocument(\ReflectionClass $class): bool
      */
     private function isControllerPlugin(\ReflectionClass $class): bool
     {
-        try {
-            foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
-                if (preg_match('/^(after|around|before).+/i', $method->getName())) {
-                    try {
-                        $argument = $method->getParameters()[0]->getClass();
-                    } catch (\ReflectionException $exception) {
-                        //Non-existing class (autogenerated perhaps)
-                        continue;
-                    }
-                    $isAction = $argument->isSubclassOf(\Magento\Framework\App\ActionInterface::class)
-                        || $argument->getName() === \Magento\Framework\App\ActionInterface::class;
-                    if ($isAction) {
-                        return true;
-                    }
+        foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+            if (preg_match('/^(after|around|before).+/i', $method->getName())) {
+                try {
+                    $argument = $method->getParameters()[0]->getClass();
+                } catch (\ReflectionException $exception) {
+                    //Non-existing class (autogenerated perhaps)
+                    continue;
+                }
+                $isAction = $argument->isSubclassOf(\Magento\Framework\App\ActionInterface::class)
+                    || $argument->getName() === \Magento\Framework\App\ActionInterface::class;
+                if ($isAction) {
+                    return true;
                 }
             }
-        } catch (\Throwable $exception) {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -103,25 +101,23 @@ private function isControllerPlugin(\ReflectionClass $class): bool
      */
     private function isBlockPlugin(\ReflectionClass $class): bool
     {
-        try {
-            foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
-                if (preg_match('/^(after|around|before).+/i', $method->getName())) {
-                    try {
-                        $argument = $method->getParameters()[0]->getClass();
-                    } catch (\ReflectionException $exception) {
-                        //Non-existing class (autogenerated perhaps)
-                        continue;
-                    }
-                    $isBlock = $argument->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class)
-                        || $argument->getName() === \Magento\Framework\View\Element\BlockInterface::class;
-                    if ($isBlock) {
-                        return true;
-                    }
+        foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+            if (preg_match('/^(after|around|before).+/i', $method->getName())) {
+                try {
+                    $argument = $method->getParameters()[0]->getClass();
+                } catch (\ReflectionException $exception) {
+                    //Non-existing class (autogenerated perhaps)
+                    continue;
+                }
+                $isBlock = $argument->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class)
+                    || $argument->getName() === \Magento\Framework\View\Element\BlockInterface::class;
+                if ($isBlock) {
+                    return true;
                 }
             }
-        } catch (\Throwable $exception) {
-            return false;
         }
+
+        return false;
     }
 
     /**

From 7ea1bc5125d94697d9027c3dfb96261b8011bf25 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 29 Oct 2018 18:39:09 +0200
Subject: [PATCH 077/932] MAGETWO-95945: Add a code mess rule for improper
 session and cookies usages

---
 .../Magento/CodeMessDetector/resources/rulesets/design.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
index 79622331fe5e7..73354c46d76b2 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
@@ -64,7 +64,7 @@ class PostOrder implements ActionInterface
         <description>
             <![CDATA[
 Sessions and cookies must only be used in classes directly responsible for HTML presentation because Web APIs do not
-rely on cookies and sessions
+rely on cookies and sessions. If you need to get current user use Magento\Authorization\Model\UserContextInterface
             ]]>
         </description>
         <priority>2</priority>

From c10ec6237a0ab0ac49152f9b994e32d264742d0f Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 29 Oct 2018 18:41:53 +0200
Subject: [PATCH 078/932] MAGETWO-95945: Add a code mess rule for improper
 session and cookies usages

---
 .../Block/Account/AuthenticationPopup.php      | 18 ++----------------
 .../Customer/Controller/Account/Confirm.php    |  5 ++---
 .../Customer/Model/CustomerManagement.php      | 17 +++--------------
 .../Magento/Customer/Model/FileProcessor.php   | 17 ++---------------
 .../Ui/Component/DataProvider/Document.php     | 13 ++-----------
 .../Action/Plugin/BackendAuthentication.php    | 15 ++-------------
 6 files changed, 13 insertions(+), 72 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
index 4e4811546a5f9..07e0704ee6e43 100644
--- a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
+++ b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
@@ -6,12 +6,9 @@
 namespace Magento\Customer\Block\Account;
 
 use Magento\Customer\Model\Form;
-use Magento\Customer\Model\Session;
 use Magento\Store\Model\ScopeInterface;
 
 /**
- * Popup.
- *
  * @api
  * @since 100.0.2
  */
@@ -27,34 +24,24 @@ class AuthenticationPopup extends \Magento\Framework\View\Element\Template
      */
     private $serializer;
 
-    /**
-     * @var Session|null
-     */
-    private $session;
-
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @param Session|null $session
      * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         array $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        Session $session = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         parent::__construct($context, $data);
         $this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
-        $this->session = $session;
     }
 
     /**
-     * JS layout.
-     *
      * @return string
      */
     public function getJsLayout()
@@ -73,8 +60,7 @@ public function getConfig()
             'autocomplete' => $this->escapeHtml($this->isAutocompleteEnabled()),
             'customerRegisterUrl' => $this->escapeUrl($this->getCustomerRegisterUrlUrl()),
             'customerForgotPasswordUrl' => $this->escapeUrl($this->getCustomerForgotPasswordUrl()),
-            'baseUrl' => $this->escapeUrl($this->getBaseUrl()),
-            'tst' => $this->session->getData('somedata')
+            'baseUrl' => $this->escapeUrl($this->getBaseUrl())
         ];
     }
 
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index 7459e263177d9..2b3cb9aa61ab5 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -9,7 +9,6 @@
 use Magento\Customer\Model\Url;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session;
-use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
@@ -25,7 +24,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Confirm extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
+class Confirm extends \Magento\Customer\Controller\AbstractAccount
 {
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
@@ -168,7 +167,7 @@ public function execute()
             $resultRedirect->setUrl($this->getSuccessRedirect());
             return $resultRedirect;
         } catch (StateException $e) {
-            $this->messageManager->addException($e, __('This confirmation key is invalid or has expired.TEST'));
+            $this->messageManager->addException($e, __('This confirmation key is invalid or has expired.'));
         } catch (\Exception $e) {
             $this->messageManager->addException($e, __('There was an error confirming the account'));
         }
diff --git a/app/code/Magento/Customer/Model/CustomerManagement.php b/app/code/Magento/Customer/Model/CustomerManagement.php
index 7da87a829d8e0..a9f5c3b7631a5 100644
--- a/app/code/Magento/Customer/Model/CustomerManagement.php
+++ b/app/code/Magento/Customer/Model/CustomerManagement.php
@@ -7,11 +7,7 @@
 
 use Magento\Customer\Api\CustomerManagementInterface;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
-use Magento\Framework\Stdlib\Cookie\PhpCookieReader;
 
-/**
- * Class CustomerManagement
- */
 class CustomerManagement implements CustomerManagementInterface
 {
     /**
@@ -19,28 +15,21 @@ class CustomerManagement implements CustomerManagementInterface
      */
     protected $customersFactory;
 
-    /**
-     * @var PhpCookieReader
-     */
-    private $cookie;
-
     /**
      * @param CollectionFactory $customersFactory
-     * @param PhpCookieReader $cookie
      */
-    public function __construct(CollectionFactory $customersFactory, PhpCookieReader $cookie)
+    public function __construct(CollectionFactory $customersFactory)
     {
         $this->customersFactory = $customersFactory;
-        $this->cookie = $cookie;
     }
 
     /**
-     * @inheritDoc
+     * {@inheritdoc}
      */
     public function getCount()
     {
         $customers = $this->customersFactory->create();
         /** @var \Magento\Customer\Model\ResourceModel\Customer\Collection $customers */
-        return $customers->getSize() || $this->cookie->getCookie('tst');
+        return $customers->getSize();
     }
 }
diff --git a/app/code/Magento/Customer/Model/FileProcessor.php b/app/code/Magento/Customer/Model/FileProcessor.php
index c035af0f7c551..6a8472758c169 100644
--- a/app/code/Magento/Customer/Model/FileProcessor.php
+++ b/app/code/Magento/Customer/Model/FileProcessor.php
@@ -5,11 +5,6 @@
  */
 namespace Magento\Customer\Model;
 
-use Magento\Framework\Session\SessionManagerInterface;
-
-/**
- * Class FileProcessor
- */
 class FileProcessor
 {
     /**
@@ -52,11 +47,6 @@ class FileProcessor
      */
     private $mime;
 
-    /**
-     * @var SessionManagerInterface
-     */
-    private $session;
-
     /**
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\MediaStorage\Model\File\UploaderFactory $uploaderFactory
@@ -65,7 +55,6 @@ class FileProcessor
      * @param string $entityTypeCode
      * @param \Magento\Framework\File\Mime $mime
      * @param array $allowedExtensions
-     * @param SessionManagerInterface|null $session
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
@@ -74,8 +63,7 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         $entityTypeCode,
         \Magento\Framework\File\Mime $mime,
-        array $allowedExtensions = [],
-        SessionManagerInterface $session = null
+        array $allowedExtensions = []
     ) {
         $this->mediaDirectory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
         $this->uploaderFactory = $uploaderFactory;
@@ -84,7 +72,6 @@ public function __construct(
         $this->entityTypeCode = $entityTypeCode;
         $this->mime = $mime;
         $this->allowedExtensions = $allowedExtensions;
-        $this->session = $session;
     }
 
     /**
@@ -257,7 +244,7 @@ public function moveTemporaryFile($fileName)
      */
     public function removeUploadedFile($fileName)
     {
-        $filePath = $this->entityTypeCode . '/' . ltrim($fileName, '/').$this->session->getName();
+        $filePath = $this->entityTypeCode . '/' . ltrim($fileName, '/');
 
         $result = $this->mediaDirectory->delete($filePath);
         return $result;
diff --git a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
index 86ec19d43b0ac..468a9e7946f2d 100644
--- a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
+++ b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
@@ -12,7 +12,6 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Stdlib\Cookie\CookieReaderInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -71,11 +70,6 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
      */
     private $scopeConfig;
 
-    /**
-     * @var CookieReaderInterface
-     */
-    private $cookie;
-
     /**
      * Document constructor.
      *
@@ -84,22 +78,19 @@ class Document extends \Magento\Framework\View\Element\UiComponent\DataProvider\
      * @param CustomerMetadataInterface $customerMetadata
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
-     * @param CookieReaderInterface|null $cookie
      */
     public function __construct(
         AttributeValueFactory $attributeValueFactory,
         GroupRepositoryInterface $groupRepository,
         CustomerMetadataInterface $customerMetadata,
         StoreManagerInterface $storeManager,
-        ScopeConfigInterface $scopeConfig = null,
-        CookieReaderInterface $cookie = null
+        ScopeConfigInterface $scopeConfig = null
     ) {
         parent::__construct($attributeValueFactory);
         $this->customerMetadata = $customerMetadata;
         $this->groupRepository = $groupRepository;
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->create(ScopeConfigInterface::class);
-        $this->cookie = $cookie;
     }
 
     /**
@@ -138,7 +129,7 @@ private function setGenderValue()
         $value = $this->getData(self::$genderAttributeCode);
         
         if (!$value) {
-            $this->setCustomAttribute(self::$genderAttributeCode, $this->cookie->getCookie('NA'));
+            $this->setCustomAttribute(self::$genderAttributeCode, 'N/A');
             return;
         }
 
diff --git a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
index 18e0863cade03..5351bee8b5d56 100644
--- a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
+++ b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
@@ -8,14 +8,11 @@
 namespace Magento\Rss\App\Action\Plugin;
 
 use Magento\Backend\App\AbstractAction;
-use Magento\Backend\Model\Session;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Exception\AuthenticationException;
 
 /**
- * Backend auth.
- *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -42,11 +39,6 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
      */
     protected $aclResources;
 
-    /**
-     * @var Session
-     */
-    private $session;
-
     /**
      * @param \Magento\Backend\Model\Auth $auth
      * @param \Magento\Backend\Model\UrlInterface $url
@@ -61,7 +53,6 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param array $aclResources
-     * @param Session $session
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -77,14 +68,12 @@ public function __construct(
         \Magento\Framework\HTTP\Authentication $httpAuthentication,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\AuthorizationInterface $authorization,
-        array $aclResources,
-        Session $session
+        array $aclResources
     ) {
         $this->httpAuthentication = $httpAuthentication;
         $this->logger = $logger;
         $this->authorization = $authorization;
         $this->aclResources = $aclResources;
-        $this->session = $session;
         parent::__construct(
             $auth,
             $url,
@@ -117,7 +106,7 @@ public function aroundDispatch(AbstractAction $subject, \Closure $proceed, Reque
                 : $this->aclResources[$request->getControllerName()]
             : null;
 
-        $type = $request->getParam('type'.$this->session->getName());
+        $type = $request->getParam('type');
         $resourceType = isset($this->aclResources[$type]) ? $this->aclResources[$type] : null;
 
         if (!$resource || !$resourceType) {

From 5902f1e80c0884b513dbc310845ffe8f6f09aa87 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Tue, 30 Oct 2018 14:20:01 +0300
Subject: [PATCH 079/932] MAGETWO-95822: Layered Navigation shows options not
 available

- Add observer for filter
---
 .../Mysql/Aggregation/DataProvider.php        | 23 ++++++++++++++++---
 .../Model/Layer/Filter/Attribute.php          |  8 +++++++
 .../Mysql/Aggregation/DataProviderTest.php    | 12 +++++++++-
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
index 15856bbee7461..66f5ad7a7192b 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
@@ -16,8 +16,11 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
 use Magento\Framework\Search\Request\BucketInterface;
+use Magento\Framework\Event\Manager;
 
 /**
+ * Data Provider for catalog search.
+ *
  * @deprecated
  * @see \Magento\ElasticSearch
  */
@@ -43,12 +46,18 @@ class DataProvider implements DataProviderInterface
      */
     private $selectBuilderForAttribute;
 
+    /**
+     * @var Manager
+     */
+    private $eventManager;
+
     /**
      * @param Config $eavConfig
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
      * @param null $customerSession @deprecated
      * @param SelectBuilderForAttribute|null $selectBuilderForAttribute
+     * @param Manager|null $eventManager
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -57,17 +66,19 @@ public function __construct(
         ResourceConnection $resource,
         ScopeResolverInterface $scopeResolver,
         $customerSession,
-        SelectBuilderForAttribute $selectBuilderForAttribute = null
+        SelectBuilderForAttribute $selectBuilderForAttribute = null,
+        Manager $eventManager = null
     ) {
         $this->eavConfig = $eavConfig;
         $this->connection = $resource->getConnection();
         $this->scopeResolver = $scopeResolver;
         $this->selectBuilderForAttribute = $selectBuilderForAttribute
             ?: ObjectManager::getInstance()->get(SelectBuilderForAttribute::class);
+        $this->eventManager = $eventManager ?: ObjectManager::getInstance()->get(Manager::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getDataSet(
         BucketInterface $bucket,
@@ -83,13 +94,17 @@ public function getDataSet(
             'main_table.entity_id  = entities.entity_id',
             []
         );
+        $this->eventManager->dispatch(
+            'catalogsearch_query_add_filter_after',
+            ['bucket' => $bucket, 'select' => $select]
+        );
         $select = $this->selectBuilderForAttribute->build($select, $attribute, $currentScope);
 
         return $select;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute(Select $select)
     {
@@ -97,6 +112,8 @@ public function execute(Select $select)
     }
 
     /**
+     * Get select.
+     *
      * @return Select
      */
     private function getSelect()
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index 7aac6e98fc044..ea0c74a401cbc 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -156,4 +156,12 @@ private function getOptionCount($value, $optionsFacetedData)
             ? (int)$optionsFacetedData[$value]['count']
             : 0;
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function isOptionReducesResults($optionCount, $totalSize)
+    {
+        return $optionCount <= $totalSize;
+    }
 }
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
index 85b1b136e78d2..e3cc3e1d18377 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
@@ -20,6 +20,7 @@
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\Event\Manager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -64,6 +65,11 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $selectBuilderForAttribute;
 
+    /**
+     * @var Manager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $eventManager;
+
     protected function setUp()
     {
         $this->eavConfigMock = $this->createMock(Config::class);
@@ -73,12 +79,14 @@ protected function setUp()
         $this->adapterMock = $this->createMock(AdapterInterface::class);
         $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($this->adapterMock);
         $this->selectBuilderForAttribute = $this->createMock(SelectBuilderForAttribute::class);
+        $this->eventManager = $this->createMock(Manager::class);
         $this->model = new DataProvider(
             $this->eavConfigMock,
             $this->resourceConnectionMock,
             $this->scopeResolverMock,
             $this->sessionMock,
-            $this->selectBuilderForAttribute
+            $this->selectBuilderForAttribute,
+            $this->eventManager
         );
     }
 
@@ -102,6 +110,7 @@ public function testGetDataSetUsesFrontendPriceIndexerTableIfAttributeIsPrice()
 
         $selectMock = $this->createMock(Select::class);
         $this->adapterMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
+        $this->eventManager->expects($this->once())->method('dispatch')->willReturn($selectMock);
         $tableMock = $this->createMock(Table::class);
 
         $this->model->getDataSet($bucketMock, ['scope' => $dimensionMock], $tableMock);
@@ -129,6 +138,7 @@ public function testGetDataSetUsesFrontendPriceIndexerTableForDecimalAttributes(
         $selectMock = $this->createMock(Select::class);
         $this->selectBuilderForAttribute->expects($this->once())->method('build')->willReturn($selectMock);
         $this->adapterMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
+        $this->eventManager->expects($this->once())->method('dispatch')->willReturn($selectMock);
         $tableMock = $this->createMock(Table::class);
         $this->model->getDataSet($bucketMock, ['scope' => $dimensionMock], $tableMock);
     }

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 080/932] 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 853225e2222c62fc44166c212f8f648c66c777e5 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Tue, 30 Oct 2018 17:22:08 +0400
Subject: [PATCH 081/932] MAGETWO-95820: Order placed by new customer before
 they registered is displayed in the admin under the name Guest

- Add automated test
---
 .../CheckoutSuccessRegisterSection.xml        |  1 +
 ...ontCheckCustomerInfoCreatedByGuestTest.xml | 62 +++++++++++++++++++
 .../Test/Mftf/Data/AllowGuestCheckoutData.xml | 24 +++++++
 .../Metadata/allow_guest_checkout-meta.xml    | 21 +++++++
 .../Sales/Test/Mftf/Page/AdminOrderPage.xml   | 13 ++++
 5 files changed, 121 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Page/AdminOrderPage.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
index d0ef8d347efb5..0d692e4ab143e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessRegisterSection.xml
@@ -12,5 +12,6 @@
         <element name="registerMessage" type="text" selector="#registration p:nth-child(1)"/>
         <element name="customerEmail" type="text" selector="#registration p:nth-child(2)"/>
         <element name="createAccountButton" type="button" selector="#registration form input[type='submit']" timeout="30"/>
+        <element name="orderNumber" type="text" selector="//p[text()='Your order # is: ']//span"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
new file mode 100644
index 0000000000000..2e2dee82a6eaf
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -0,0 +1,62 @@
+<?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="StoreFrontCheckCustomerInfoCreatedByGuestTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Check customer information created by guest"/>
+            <title value="Check Customer Information Created By Guest"/>
+            <description value="Check customer information after placing the order as the guest who created an account"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95820"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="category"/>
+            <createData entity="_defaultProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="EnableAllowGuestCheckout" stepKey="enableGuestCheckout"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="product" stepKey="deleteProduct" />
+            <deleteData createDataKey="category" stepKey="deleteCategory" />
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <amOnPage url="$$product.name$$.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$product.name$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne"/>
+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
+        </actionGroup>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+        <grabTextFrom selector="{{CheckoutSuccessRegisterSection.orderNumber}}" stepKey="grabOrderNumber"/>
+        <click selector="{{CustomerAccountSection.createAccount}}" stepKey="clickToCreateAccount"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CustomerData.password}}" stepKey="TypePassword"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CustomerData.password}}" stepKey="TypeConfirmationPassword"/>
+        <click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickOnCreateAccount"/>
+        <see userInput="Thank you for registering" stepKey="verifyAccountCreated"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>
+        <amOnPage url="{{AdminOrderPage.url({$grabOrderNumber})}}" stepKey="navigateToOrderPage"/>
+        <waitForPageLoad stepKey="waitForCreatedOrderPage"/>
+        <see stepKey="seeCustomerName" userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminShipmentOrderInformationSection.customerName}}"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml b/app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml
new file mode 100644
index 0000000000000..f89cdf1a87b31
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/AllowGuestCheckoutData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="EnableAllowGuestCheckout" type="allow_guest_checkout_config">
+        <requiredEntity type="guest_checkout">AllowGuestCheckoutYes</requiredEntity>
+    </entity>
+    <entity name="AllowGuestCheckoutYes" type="guest_checkout">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DisableAllowGuestCheckout" type="allow_guest_checkout_config">
+        <requiredEntity type="guest_checkout">AllowGuestCheckoutNo</requiredEntity>
+    </entity>
+    <entity name="AllowGuestCheckoutNo" type="guest_checkout">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml
new file mode 100644
index 0000000000000..052d9b6574774
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/allow_guest_checkout-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="AllowGuestCheckoutConfig" dataType="allow_guest_checkout_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/checkout/" method="POST">
+        <object key="groups" dataType="allow_guest_checkout_config">
+            <object key="options" dataType="allow_guest_checkout_config">
+                <object key="fields" dataType="allow_guest_checkout_config">
+                    <object key="guest_checkout" dataType="guest_checkout">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderPage.xml
new file mode 100644
index 0000000000000..6abe265a37b79
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/AdminOrderPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminOrderPage" url="sales/order/view/order_id/{{var1}}" area="admin" module="Magento_Sales" parameterized="true">
+    </page>
+</pages>

From 1b14b277e13ac05489b69caf75c0068c9dba6518 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Thu, 25 Oct 2018 15:37:41 +0300
Subject: [PATCH 082/932] MAGETWO-95823: Order Sales Report includes canceled
 orders

- Bug fix.
---
 .../Block/Adminhtml/Sales/Sales/Grid.php      | 67 ++++++++++++++++++-
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
index 9f5f784df677f..25a4aa1b88ca4 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
@@ -6,23 +6,58 @@
 
 namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
 
+use Magento\Framework\DataObject;
 use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency;
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Model\Order\ConfigFactory;
+use Magento\Sales\Model\Order;
 
 /**
  * Adminhtml sales report grid block
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
 class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
 {
     /**
-     * GROUP BY criteria
-     *
      * @var string
      */
     protected $_columnGroupBy = 'period';
 
+    /**
+     * @var ConfigFactory
+     */
+    private $configFactory;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Backend\Helper\Data $backendHelper
+     * @param \Magento\Reports\Model\ResourceModel\Report\Collection\Factory $resourceFactory
+     * @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
+     * @param \Magento\Reports\Helper\Data $reportsData
+     * @param array $data
+     * @param ConfigFactory|null $configFactory
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Backend\Helper\Data $backendHelper,
+        \Magento\Reports\Model\ResourceModel\Report\Collection\Factory $resourceFactory,
+        \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory,
+        \Magento\Reports\Helper\Data $reportsData,
+        array $data = [],
+        ConfigFactory $configFactory = null
+    ) {
+        parent::__construct(
+            $context,
+            $backendHelper,
+            $resourceFactory,
+            $collectionFactory,
+            $reportsData,
+            $data
+        );
+        $this->configFactory = $configFactory ?: ObjectManager::getInstance()->get(ConfigFactory::class);
+    }
+
     /**
      * Reports grid constructor
      *
@@ -331,4 +366,30 @@ protected function _prepareColumns()
 
         return parent::_prepareColumns();
     }
+
+    /**
+     * @inheritdoc
+     *
+     * Filter canceled statuses for orders.
+     *
+     * @return Grid
+     */
+    protected function _prepareCollection()
+    {
+        /** @var DataObject $filterData */
+        $filterData = $this->getData('filter_data');
+        if (!$filterData->hasData('order_statuses')) {
+            $orderConfig = $this->configFactory->create();
+            $statusValues = [];
+            $canceledStatuses = $orderConfig->getStateStatuses(Order::STATE_CANCELED);
+            $statusCodes = array_keys($orderConfig->getStatuses());
+            foreach ($statusCodes as $code) {
+                if (!isset($canceledStatuses[$code])) {
+                    $statusValues[] = $code;
+                }
+            }
+            $filterData->setData('order_statuses', $statusValues);
+        }
+        return parent::_prepareCollection();
+    }
 }

From 3fb69e263708564fad87a8b0f718cca677503383 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Tue, 30 Oct 2018 18:39:16 +0300
Subject: [PATCH 083/932] MAGETWO-58212: [GITHUB] Magento 2.1 CE, Cannot change
 attribute set for bundled product #5999

- Bug fix.
---
 .../Product/Form/Modifier/BundlePanel.php     | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
index 98fd96c52ccd9..ee6b76b609c8a 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
@@ -14,6 +14,7 @@
 use Magento\Framework\UrlInterface;
 use Magento\Ui\Component\Container;
 use Magento\Ui\Component\Form;
+use Magento\Ui\Component\Form\Fieldset;
 use Magento\Ui\Component\Modal;
 
 /**
@@ -69,13 +70,27 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
+     * Change metadata of the component.
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
     {
         $meta = $this->removeFixedTierPrice($meta);
-        $path = $this->arrayManager->findPath(static::CODE_BUNDLE_DATA, $meta, null, 'children');
+
+        $groupCode = static::CODE_BUNDLE_DATA;
+        $path = $this->arrayManager->findPath($groupCode, $meta, null, 'children');
+        if (empty($path)) {
+            $meta[$groupCode]['children'] = [];
+            $meta[$groupCode]['arguments']['data']['config'] = [
+                'componentType' => Fieldset::NAME,
+                'label' => __('Bundle Items'),
+                'collapsible' => true
+            ];
+
+            $path = $this->arrayManager->findPath($groupCode, $meta, null, 'children');
+        }
 
         $meta = $this->arrayManager->merge(
             $path,
@@ -220,7 +235,9 @@ private function removeFixedTierPrice(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
+     * Modify UI data.
      */
     public function modifyData(array $data)
     {

From 101b0cbc71d7e6c923811ba2ac11e0d761f98759 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Wed, 31 Oct 2018 13:09:35 +0300
Subject: [PATCH 084/932] MAGETWO-58212: [GITHUB] Magento 2.1 CE, Cannot change
 attribute set for bundled product #5999

- Fix after review.
---
 .../Ui/DataProvider/Product/Form/Modifier/BundlePanel.php      | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
index ee6b76b609c8a..ad6fc12712c17 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
@@ -72,7 +72,6 @@ public function __construct(
     /**
      * @inheritdoc
      *
-     * Change metadata of the component.
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
@@ -236,8 +235,6 @@ private function removeFixedTierPrice(array $meta)
 
     /**
      * @inheritdoc
-     *
-     * Modify UI data.
      */
     public function modifyData(array $data)
     {

From f886f15f327f4e62ab65ba235a5cff4b67d30306 Mon Sep 17 00:00:00 2001
From: Lusine <lusine_papyan@epam.com>
Date: Thu, 1 Nov 2018 15:42:16 +0400
Subject: [PATCH 085/932] MAGETWO-95823: Order Sales Report includes canceled
 orders

- Add automated test.
---
 .../GenerateOrderReportActionGroup.xml        | 22 +++++
 .../Test/Mftf/Page/OrdersReportPage.xml       | 14 ++++
 .../Mftf/Section/OrderReportMainSection.xml   | 28 +++++++
 .../CancelOrdersInOrderSalesReportTest.xml    | 80 +++++++++++++++++++
 .../ActionGroup/AdminOrderActionGroup.xml     | 24 +++++-
 5 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Page/OrdersReportPage.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml

diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
new file mode 100644
index 0000000000000..b96a367903ac8
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/GenerateOrderReportActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="GenerateOrderReportActionGroup">
+        <arguments>
+            <argument name="orderFromDate" type="string"/>
+            <argument name="orderToDate" type="string"/>
+        </arguments>
+        <click selector="{{OrderReportMainSection.here}}" stepKey="clickOnHere" />
+        <fillField selector="{{OrderReportFilterSection.dateFrom}}" userInput="{{orderFromDate}}" stepKey="fillFromDate"/>
+        <fillField selector="{{OrderReportFilterSection.dateTo}}" userInput="{{orderToDate}}" stepKey="fillToDate"/>
+        <selectOption selector="{{OrderReportFilterSection.orderStatus}}" userInput="Any" stepKey="selectAnyOption" />
+        <click selector="{{OrderReportMainSection.showReport}}" stepKey="showReport" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Reports/Test/Mftf/Page/OrdersReportPage.xml b/app/code/Magento/Reports/Test/Mftf/Page/OrdersReportPage.xml
new file mode 100644
index 0000000000000..46509089b97ba
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Page/OrdersReportPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="OrdersReportPage" url="reports/report_sales/sales/" area="admin" module="Reports">
+        <section name="OrderReportFilterSection"/>
+        <section name="OrderReportMainSection"/>
+        <section name="GeneratedReportSection" />
+    </page>
+</pages>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml
new file mode 100644
index 0000000000000..fb71a67da87dc
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/OrderReportMainSection.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="OrderReportMainSection">
+        <element name="showReport" type="button" selector="#filter_form_submit"/>
+        <element name="here" type="text" selector="//a[contains(text(), 'here')]"/>
+    </section>
+
+    <section name="OrderReportFilterSection">
+        <element name="dateFrom" type="input" selector="#sales_report_from"/>
+        <element name="dateTo" type="input" selector="#sales_report_to"/>
+        <element name="orderStatus" type="select" selector="#sales_report_show_order_statuses"/>
+        <element name="optionAny" type="option" selector="//select[@id='sales_report_show_order_statuses']/option[contains(text(), 'Any')]"/>
+        <element name="optionSpecified" type="option" selector="//select[@id='sales_report_show_order_statuses']/option[contains(text(), 'Specified')]"/>
+    </section>
+
+    <section name="GeneratedReportSection">
+        <element name="ordersCount" type="text" selector="//tr[@class='totals']/th[@class=' col-orders col-orders_count col-number']"/>
+        <element name="canceledOrders" type="text" selector="//tr[@class='totals']/th[@class=' col-canceled col-total_canceled_amount a-right']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
new file mode 100644
index 0000000000000..967b0f3caf515
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
@@ -0,0 +1,80 @@
+<?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="CancelOrdersInOrderSalesReportTest">
+        <annotations>
+            <features value="Reports"/>
+            <stories value="MAGETWO-95823: Order Sales Report includes canceled orders"/>
+            <group value="reports"/>
+            <title value="Canceled orders in order sales report"/>
+            <description value="Verify canceling of orders in order sales report"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95960"/>
+        </annotations>
+
+        <before>
+            <!-- log in as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- create new product -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- create new customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+
+        <!-- Create completed order -->
+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrderd">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
+        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl"/>
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
+
+        <!-- Create Order -->
+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Cancel order -->
+        <actionGroup ref="cancelPendingOrder" stepKey="cancelOrder"/>
+
+        <!-- Generate Order report -->
+        <amOnPage url="{{OrdersReportPage.url}}" stepKey="goToOrdersReportPage1"/>
+        <!-- Get date -->
+        <generateDate stepKey="generateEndDate" date="+0 day" format="m/d/Y"/>
+        <generateDate stepKey="generateStartDate" date="-1 day" format="m/d/Y"/>
+        <actionGroup ref="GenerateOrderReportActionGroup" stepKey="generateReportAfterCancelOrder">
+            <argument name="orderFromDate" value="$generateStartDate"/>
+            <argument name="orderToDate" value="$generateEndDate"/>
+        </actionGroup>
+        <waitForElement selector="{{GeneratedReportSection.ordersCount}}" stepKey="waitForOrdersCount"/>
+        <grabTextFrom selector="{{GeneratedReportSection.canceledOrders}}" stepKey="grabCanceledOrdersPrice"/>
+
+        <!-- Compare canceled orders price -->
+        <assertEquals expected="$0.00" expectedType="string" actual="{$grabCanceledOrdersPrice}" actualType="string"  stepKey="assertEquals"/>
+
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index 53dc52ca58fa7..7df9fb6552f19 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -296,4 +296,26 @@
         <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
+
+    <!-- Create Order -->
+    <actionGroup name="CreateOrderActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="customer"/>
+        </arguments>
+        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
+        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
+        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
+        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
+        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
+        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethods"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
+    </actionGroup>
+</actionGroups>

From f3920b4c7dd4d50782f6f39415dc33ad4ea2c6aa Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 1 Nov 2018 16:28:05 +0400
Subject: [PATCH 086/932] MAGETWO-95812: Required RMA Attributes are not
 validated while Customer submits a return

- Updated automated test
---
 ...lidationWhileCustomerSubmitsReturnTest.xml | 99 -------------------
 1 file changed, 99 deletions(-)
 delete mode 100644 app/code/Magento/Sales/Test/Mftf/Test/RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest.xml
deleted file mode 100644
index e3b2352c4c810..0000000000000
--- a/app/code/Magento/Sales/Test/Mftf/Test/RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="RequiredRMAAttributesValidationWhileCustomerSubmitsReturnTest">
-        <annotations>
-            <features value="Sales"/>
-            <stories value="MAGETWO-95812: Required RMA Attributes are not validated while Customer submits a return"/>
-            <title value="Required RMA Attributes Validation While Customer Submits A Return"/>
-            <description value="Required RMA Attributes Validation While Customer Submits A Return"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-95864"/>
-            <group value="sales"/>
-        </annotations>
-        <before>
-            <!-- log in as admin -->
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <!--Enabled RMA On Storefront-->
-            <createData entity="EnableRMA" stepKey="enabledRMAOnStorefront"/>
-            <!-- create new product -->
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-        </before>
-
-        <!-- Place an order from frontend -->
-
-        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
-            <argument name="product" value="$$createSimpleProduct$$"/>
-        </actionGroup>
-
-        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="checkoutProductFromCart"/>
-
-        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
-            <argument name="customerVar" value="CustomerEntityOne" />
-            <argument name="customerAddressVar" value="CustomerAddressSimple" />
-        </actionGroup>
-
-        <!-- place for order -->
-        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
-        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
-        <waitForPageLoad stepKey="waitForPlaceOrder"/>
-        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-
-        <!--Complete the order from admin bay creating Invoice and then Shipment-->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersIndexPage"/>
-        <waitForPageLoad stepKey="waitForOrderIndexPage"/>
-
-        <!-- Open Order -->
-        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
-            <argument name="orderId" value="$grabOrderNumber"/>
-        </actionGroup>
-        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
-        <waitForPageLoad stepKey="waitForCreatedOrderPageOpened"/>
-
-        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
-        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-
-        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
-        <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl"/>
-        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
-
-        <!--Goes to Orders and Returns -->
-        <amOnPage url="{{StorefrontOrdersAndReturnsPage.url}}" stepKey="goToOrderAndReturnPage"/>
-        <waitForPageLoad stepKey="waitForOrdersAndReturnsPageLoad"/>
-        <seeInCurrentUrl url="{{StorefrontOrdersAndReturnsPage.url}}" stepKey="seeOrdersAndReturnsUrl"/>
-
-        <actionGroup ref="fillOrderInformationActionGroup" stepKey="fillOrderInformationAndContinue">
-            <argument name="orderId" value="$grabOrderNumber"/>
-            <argument name="orderLastName" value="CustomerEntityOne.lastname"/>
-            <argument name="orderEmail" value="CustomerEntityOne.email"/>
-        </actionGroup>
-
-        <click selector="{{OrderInformationMainSection.return}}" stepKey="clickOnReturn"/>
-        <actionGroup ref="fillQuantityToReturnActionGroup" stepKey="fillQuantityToReturn"/>
-
-        <seeElement selector="{{CreateNewReturnMainSection.resolutionError}}" stepKey="AssertResolutionError" />
-        <seeElement selector="{{CreateNewReturnMainSection.conditionError}}" stepKey="AssertConditionError" />
-        <seeElement selector="{{CreateNewReturnMainSection.reasonError}}" stepKey="AssertReasonError" />
-
-        <after>
-            <!--Disable RMA On Storefront-->
-            <createData entity="DisableRMA" stepKey="disableRMAOnStorefront"/>
-
-            <!--Delete the created product-->
-            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-    </test>
-</tests>

From a70e8144aaf6a84e61415287a2c37cbac12181b8 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Fri, 2 Nov 2018 12:14:25 +0400
Subject: [PATCH 087/932] MAGETWO-95819: Customer registration fields not
 translated

- Add automated test
---
 .../Mftf/Section/StorefrontHeaderSection.xml  | 13 -----
 .../StorefrontCustomerCreateFormSection.xml   |  1 +
 .../Test/StoreFrontSwitchStoreViewTest.xml    | 53 +++++++++++++++++++
 .../AdminDeleteStoreViewActionGroup.xml       |  2 +-
 .../StorefrontSwitchStoreViewActionGroup.xml  |  2 +-
 .../Store/Test/Mftf/Data/StoreGroupData.xml   | 13 +++++
 .../Mftf/Section/StorefrontHeaderSection.xml  |  1 +
 7 files changed, 70 insertions(+), 15 deletions(-)
 delete mode 100644 app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
 create mode 100644 app/code/Magento/Eav/Test/Mftf/Test/StoreFrontSwitchStoreViewTest.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
deleted file mode 100644
index d26f7d83616d5..0000000000000
--- a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontHeaderSection.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="StorefrontHeaderSection">
-    </section>
-</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
index 2b5662cdd623e..961784c9fa027 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -11,6 +11,7 @@
     <section name="StorefrontCustomerCreateFormSection">
         <element name="firstnameField" type="input" selector="#firstname"/>
         <element name="lastnameField" type="input" selector="#lastname"/>
+        <element name="lastnameLabel" type="text" selector="//label[@for='lastname']"/>
         <element name="emailField" type="input" selector="#email_address"/>
         <element name="passwordField" type="input" selector="#password"/>
         <element name="confirmPasswordField" type="input" selector="#password-confirmation"/>
diff --git a/app/code/Magento/Eav/Test/Mftf/Test/StoreFrontSwitchStoreViewTest.xml b/app/code/Magento/Eav/Test/Mftf/Test/StoreFrontSwitchStoreViewTest.xml
new file mode 100644
index 0000000000000..518ca92b8789c
--- /dev/null
+++ b/app/code/Magento/Eav/Test/Mftf/Test/StoreFrontSwitchStoreViewTest.xml
@@ -0,0 +1,53 @@
+<?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="StoreFrontSwitchStoreViewTest">
+        <annotations>
+            <title value="Managing labels for customer attribute while creation new account"/>
+            <description value="Managing labels for customer attribute while creation new account"/>
+            <features value="Module/ Eav"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-95997"/>
+            <stories value="Guest should be able to switch store view"/>
+            <group value="eav"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSwedishStoreView">
+                <argument name="customStore" value="swedishStoreGroup"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFinnishStoreView">
+                <argument name="customStore" value="finnishStoreGroup"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteSwedishStoreView">
+                <argument name="customStore" value="swedishStoreGroup"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteFinnishStoreView">
+                <argument name="customStore" value="finnishStoreGroup"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{CustomerAttributesLastNamePage.url}}" stepKey="amOnPageCustomerAttributePage"/>
+        <see stepKey="seeLastNamePage" userInput="Last Name"/>
+        <click stepKey="clickOnManageLabelTab" selector="{{AdminCustomerAttributeSection.manageLabel}}"/>
+        <fillField stepKey="fillSwedishLastName" selector="{{AdminCustomerLastNameAttributeSection.secondLastNameInput}}" userInput="{{AttributeLastName.swedish}}"/>
+        <fillField stepKey="fillFinnishLastName" selector="{{AdminCustomerLastNameAttributeSection.thirdLastNameInput}}" userInput="{{AttributeLastName.finnish}}"/>
+        <click stepKey="save" selector="{{CustomerAccountSection.save}}"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <amOnPage url="{{StorefrontCustomerCreatePage.url}}" stepKey="goToStoreFront"/>
+        <waitForPageLoad stepKey="waitForAccountCreationPage"/>
+        <reloadPage stepKey="refreshPage"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStoreView">
+            <argument name="storeView" value="swedishStoreGroup"/>
+        </actionGroup>
+        <see stepKey="seeLastNameInSwedish" selector="{{StorefrontCustomerCreateFormSection.lastnameLabel}}" userInput="{{AttributeLastName.swedish}}"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
index 849dc91efedb7..58e1781d69eab 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml
@@ -23,7 +23,7 @@
         <click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewAgain"/>
         <waitForElementVisible selector="{{AdminConfirmationModalSection.title}}" stepKey="waitingForWarningModal"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreDelete"/>
-        <wait time="10" stepKey="extraWait"/>
+        <waitForPageLoad stepKey="waitForSuccessMessage"/>
         <see userInput="You deleted the store view." stepKey="seeDeleteMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
index cfcd25086e067..85d7215ae8bfb 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
@@ -14,7 +14,7 @@
         </arguments>
         <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
         <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown"/>
-        <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.name)}}" stepKey="clickSelectStoreView"/>
+        <click selector="{{StorefrontHeaderSection.storeView(storeView.name)}}" stepKey="clickSelectStoreView"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
index 7b31623f237e9..cbbfdb0d9414d 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
@@ -27,6 +27,19 @@
         <data key="root_category_id">2</data>
         <data key="website_id">1</data>
     </entity>
+    <entity name="finnishStoreGroup" type="group">
+        <data key="name">Finnish</data>
+        <data key="code">fin</data>
+        <data key="root_category_id">2</data>
+        <data key="website_id">1</data>
+    </entity>
+    <entity name="swedishStoreGroup" type="group">
+        <data key="name">Swedish</data>
+        <data key="code">swd</data>
+        <data key="root_category_id">2</data>
+        <data key="website_id">1</data>
+    </entity>
+
     <entity name="staticFirstStoreGroup" extends="staticStoreGroup">
         <data key="name">NewStore</data>
         <data key="code">Base1</data>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
index af18e858e1057..af24a3b9d29f8 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -11,5 +11,6 @@
         <element name="storeViewSwitcher" type="button" selector="#switcher-language-trigger"/>
         <element name="storeViewDropdown" type="button" selector="ul.switcher-dropdown"/>
         <element name="storeViewOption" type="button" selector="li.view-{{var1}}>a" parameterized="true"/>
+        <element name="storeView" type="button" selector="//div[@class='actions dropdown options switcher-options active']//ul//li//a[contains(text(),'{{var}}')]" parameterized="true"/>
     </section>
 </sections>

From 9edabc7755a90fdfaa3a774415e076b495b4f0ca Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Fri, 2 Nov 2018 16:28:02 +0400
Subject: [PATCH 088/932] MAGETWO-95822: Layered Navigation shows options not
 available

- Add automated test
---
 .../AdminAddOptionsToAttributeActionGroup.xml | 44 +++++++++++++++++++
 ...reateProductConfigurationsPanelSection.xml |  1 +
 .../Section/AdminNewAttributePanelSection.xml |  1 +
 .../Mftf/Section/LayeredNavigationSection.xml |  4 ++
 .../Section/AdminDataGridHeaderSection.xml    |  2 +
 5 files changed, 52 insertions(+)
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToAttributeActionGroup.xml

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToAttributeActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToAttributeActionGroup.xml
new file mode 100644
index 0000000000000..4328159d6e930
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToAttributeActionGroup.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="addOptionsToAttributeActionGroup">
+        <arguments>
+            <argument name="option1" defaultValue="colorProductAttribute2"/>
+            <argument name="option2" defaultValue="colorDefaultProductAttribute1"/>
+            <argument name="option3" defaultValue="colorProductAttribute3"/>
+            <argument name="option4" defaultValue="colorProductAttribute1"/>
+            <argument name="option5" defaultValue="colorDefaultProductAttribute2"/>
+        </arguments>
+        <!--Add option 1 to attribute-->
+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption1"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('1')}}" time="30" stepKey="waitForOptionRow1" after="clickAddOption1"/>
+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('0')}}" userInput="{{option1.name}}" stepKey="fillAdminLabel1" after="waitForOptionRow1"/>
+        <!--Add option 2 to attribute-->
+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption2" after="fillAdminLabel1"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('2')}}" time="30" stepKey="waitForOptionRow2" after="clickAddOption2"/>
+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('1')}}" userInput="{{option2.name}}" stepKey="fillAdminLabel2" after="waitForOptionRow2"/>
+        <!--Add option 3 to attribute-->
+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption3" after="fillAdminLabel2"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('3')}}" time="30" stepKey="waitForOptionRow3" after="clickAddOption3"/>
+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('2')}}" userInput="{{option3.name}}" stepKey="fillAdminLabel3" after="waitForOptionRow3"/>
+        <!--Add option 4 to attribute-->
+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption4" after="fillAdminLabel3"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('4')}}" time="30" stepKey="waitForOptionRow4" after="clickAddOption4"/>
+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('3')}}" userInput="{{option4.name}}" stepKey="fillAdminLabel4" after="waitForOptionRow4"/>
+        <!--Add option 5 to attribute-->
+        <click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickAddOption5" after="fillAdminLabel4"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.isDefault('5')}}" time="30" stepKey="waitForOptionRow5" after="clickAddOption5"/>
+        <fillField selector="{{AdminNewAttributePanel.optionAdminValue('4')}}" userInput="{{option5.name}}" stepKey="fillAdminLabel5" after="waitForOptionRow5"/>
+        <!--Save attribute-->
+        <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickSaveAttribute" after="fillAdminLabel5"/>
+        <waitForPageLoad stepKey="waitForSavingAttribute"/>
+        <see userInput="You saved the product attribute." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
index 99e47baac37d5..fa018c07bcea8 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
@@ -35,5 +35,6 @@
         <element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
         <element name="quantity" type="input" selector="#apply-single-inventory-input"/>
         <element name="gridLoadingMask" type="text" selector="[data-role='spinner'][data-component*='product_attributes_listing']"/>
+        <element name="attributeCheckboxByName" type="input" selector="//*[contains(@data-attribute-option-title,'{{arg}}')]//input[@type='checkbox']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
index 44077888f8bc0..1df777f44f2f4 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
@@ -20,5 +20,6 @@
         <element name="optionAdminValue" type="input" selector="[data-role='options-container'] input[name='option[value][option_{{row}}][0]']" parameterized="true"/>
         <element name="optionDefaultStoreValue" type="input" selector="[data-role='options-container'] input[name='option[value][option_{{row}}][1]']" parameterized="true"/>
         <element name="deleteOption" type="button" selector="#delete_button_option_{{row}}" parameterized="true"/>
+        <element name="deleteOptionByName" type="button" selector="//*[contains(@value, '{{arg}}')]/../following-sibling::td[contains(@id, 'delete_button_container')]/button" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
index ad94d44d636e9..b44ee9ddbd734 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection.xml
@@ -16,4 +16,8 @@
         <element name="PriceNavigationStep" type="button" selector="#catalog_layered_navigation_price_range_step"/>
         <element name="PriceNavigationStepSystemValue" type="button" selector="#catalog_layered_navigation_price_range_step_inherit"/>
     </section>
+
+    <section name="StorefrontLayeredNavigationSection">
+        <element name="shoppingOptionsByName" type="button" selector="//*[text()='Shopping Options']/..//*[contains(text(),'{{arg}}')]" parameterized="true"/>
+    </section>
 </sections>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
index 3e917a5944f95..4ee38e30f98e6 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridHeaderSection.xml
@@ -25,5 +25,7 @@
         <!--Visible columns management-->
         <element name="columnsToggle" type="button" selector="div.admin__data-grid-action-columns button[data-bind='toggleCollapsible']" timeout="30"/>
         <element name="columnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
+        <element name="perPage" type="select" selector="#product_attributes_listing.product_attributes_listing.listing_top.listing_paging_sizes"/>
+        <element name="attributeName" type="input" selector="//div[text()='{{arg}}']/../preceding-sibling::td//input" parameterized="true"/>
     </section>
 </sections>

From c91649a8ef2e7f9d50aedead338537afd7b89401 Mon Sep 17 00:00:00 2001
From: Vasilii Burlacu <v.burlacu@atwix.com>
Date: Fri, 2 Nov 2018 11:45:44 +0200
Subject: [PATCH 089/932] magento/magento2:4154 - There is no abilitity to add
 a tab to product page at a desired position

---
 .../Catalog/Block/Product/View/Details.php    | 48 +++++++++++++++++++
 .../frontend/layout/catalog_product_view.xml  |  4 +-
 .../templates/product/view/details.phtml      |  3 +-
 .../frontend/layout/catalog_product_view.xml  |  3 ++
 4 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Block/Product/View/Details.php

diff --git a/app/code/Magento/Catalog/Block/Product/View/Details.php b/app/code/Magento/Catalog/Block/Product/View/Details.php
new file mode 100644
index 0000000000000..4241d30b8fa06
--- /dev/null
+++ b/app/code/Magento/Catalog/Block/Product/View/Details.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+/**
+ * Product details block
+ * Holds a group of blocks to show as tabs
+ *
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
+
+namespace Magento\Catalog\Block\Product\View;
+
+/**
+ * @api
+ */
+class Details extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * @param string $groupName
+     * @param $callback
+     * @throws \Magento\Framework\Exception\LocalizedException
+     *
+     * @return array
+     */
+    public function getGroupSortedChildNames(string $groupName, $callback): array
+    {
+        $groupChildNames = $this->getGroupChildNames($groupName, $callback);
+        $layout = $this->getLayout();
+
+        $childNamesSortOrder = [];
+
+        foreach ($groupChildNames as $childName) {
+            $alias = $layout->getElementAlias($childName);
+            $sortOrder = (int)$this->getChildData($alias, 'sort_order') ?? 0;
+
+            $childNamesSortOrder[$sortOrder] = $childName;
+        }
+
+        ksort($childNamesSortOrder, SORT_NUMERIC);
+
+        return $childNamesSortOrder;
+    }
+}
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index 3630fddb326a7..8d3248896b434 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
@@ -136,7 +136,7 @@
                     </arguments>
                 </block>
             </container>
-            <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="Magento_Catalog::product/view/details.phtml" after="product.info.media">
+            <block class="Magento\Catalog\Block\Product\View\Details" name="product.info.details" template="Magento_Catalog::product/view/details.phtml" after="product.info.media">
                 <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" as="description" template="Magento_Catalog::product/view/attribute.phtml" group="detailed_info">
                     <arguments>
                         <argument name="at_call" xsi:type="string">getDescription</argument>
@@ -144,11 +144,13 @@
                         <argument name="css_class" xsi:type="string">description</argument>
                         <argument name="at_label" xsi:type="string">none</argument>
                         <argument name="title" translate="true" xsi:type="string">Details</argument>
+                        <argument name="sort_order" xsi:type="string">10</argument>
                     </arguments>
                 </block>
                 <block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="Magento_Catalog::product/view/attributes.phtml" group="detailed_info">
                     <arguments>
                         <argument translate="true" name="title" xsi:type="string">More Information</argument>
+                        <argument name="sort_order" xsi:type="string">20</argument>
                     </arguments>
                 </block>
             </block>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
index 038bea86e7d4e..af664051b1431 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
@@ -6,8 +6,9 @@
 
 // @codingStandardsIgnoreFile
 
+/** @var \Magento\Catalog\Block\Product\View\Details $block */
 ?>
-<?php if ($detailedInfoGroup = $block->getGroupChildNames('detailed_info', 'getChildHtml')):?>
+<?php if ($detailedInfoGroup = $block->getGroupSortedChildNames('detailed_info', 'getChildHtml')):?>
     <div class="product info detailed">
         <?php $layout = $block->getLayout(); ?>
         <div class="product data items" data-mage-init='{"tabs":{"openedState":"active"}}'>
diff --git a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
index d7c5c19d4d813..f326c3a382269 100644
--- a/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Review/view/frontend/layout/catalog_product_view.xml
@@ -19,6 +19,9 @@
         </referenceContainer>
         <referenceBlock name="product.info.details">
             <block class="Magento\Review\Block\Product\Review" name="reviews.tab" as="reviews" template="Magento_Review::review.phtml" group="detailed_info">
+                <arguments>
+                    <argument name="sort_order" xsi:type="string">30</argument>
+                </arguments>
                 <block class="Magento\Review\Block\Form" name="product.review.form" as="review_form">
                     <container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before"/>
                 </block>

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 090/932] 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 b2ce545d24004e407fa8d83ee3c76b1157ea3212 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Mon, 5 Nov 2018 15:51:00 +0400
Subject: [PATCH 091/932] MAGETWO-95803: Apply coupon code to guests that
 create accounts after checking out

- Add Automated test
---
 .../Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml    | 1 +
 .../Test/Mftf/Section/AdminCartPriceRulesFormSection.xml         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
index 34819f641cbc9..bc65f8a2c0816 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutSuccessMainSection.xml
@@ -16,6 +16,7 @@
         <element name="orderLink" type="text" selector="a[href*=order_id].order-number" timeout="30"/>
         <element name="orderNumberText" type="text" selector=".checkout-success > p:nth-child(1)"/>
         <element name="continueShoppingButton" type="button" selector=".action.primary.continue" timeout="30"/>
+        <element name="createAnAccount" type="button" selector="input[value='Create an Account']" timeout="30"/>
         <element name="printLink" type="button" selector=".print" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index 54f7aa97053cb..2b1845e84fe5b 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -39,6 +39,7 @@
         <element name="applyDiscountToShippingLabel" type="checkbox" selector="input[name='apply_to_shipping']+label"/>
         <element name="discountAmount" type="input" selector="input[name='discount_amount']"/>
         <element name="discountStep" type="input" selector="input[name='discount_step']"/>
+        <element name="addRewardPoints" type="input" selector="input[name='extension_attributes[reward_points_delta]']"/>
         <element name="freeShipping" type="select" selector="//select[@name='simple_free_shipping']"/>
 
         <!-- Manage Coupon Codes sub-form -->

From e2c9ac0ae11cc574c9a3fb790c52caa9b38eff3d Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Thu, 8 Nov 2018 13:58:11 +0100
Subject: [PATCH 092/932] Rename recurcive method to have more clear
 understanding

---
 .../ExtractDataFromCategoryTree.php           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
index 2daf3649c131d..5d282fda549a5 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
@@ -53,7 +53,7 @@ public function execute(\Iterator $iterator): array
             $pathElements = explode("/", $category->getPath());
             $this->iteratingCategory = $category;
 
-            $currentLevelTree = $this->generateLevelTree($pathElements, self::START_CATEGORY_FETCH_LEVEL);
+            $currentLevelTree = $this->explodePathToArray($pathElements, self::START_CATEGORY_FETCH_LEVEL);
             if (empty($tree)) {
                 $tree = $currentLevelTree;
             }
@@ -64,7 +64,7 @@ public function execute(\Iterator $iterator): array
     }
 
     /**
-     * Merge together complex categories tree
+     * Merge together complex categories trees
      *
      * @param array $tree1
      * @param array $tree2
@@ -86,23 +86,23 @@ private function mergeCategoriesTrees(array &$tree1, array &$tree2): array
     /**
      * Recursive method to generate tree for one category path
      *
-     * @param $elements
+     * @param $pathElements
      * @param $index
      * @return array
      */
-    private function generateLevelTree($elements, $index): array
+    private function explodePathToArray($pathElements, $index): array
     {
 
         $tree = [];
-        $tree[$elements[$index]]['id'] = $elements[$index];
-        if ($index === count($elements) - 1) {
-            $tree[$elements[$index]] = $this->categoryHydrator->hydrateCategory($this->iteratingCategory);
-            $tree[$elements[$index]]['model'] = $this->iteratingCategory;
+        $tree[$pathElements[$index]]['id'] = $pathElements[$index];
+        if ($index === count($pathElements) - 1) {
+            $tree[$pathElements[$index]] = $this->categoryHydrator->hydrateCategory($this->iteratingCategory);
+            $tree[$pathElements[$index]]['model'] = $this->iteratingCategory;
         }
         $currentIndex = $index;
         $index++;
-        if (isset($elements[$index])) {
-            $tree[$elements[$currentIndex]]['children'] = $this->generateLevelTree($elements, $index);
+        if (isset($pathElements[$index])) {
+            $tree[$pathElements[$currentIndex]]['children'] = $this->explodePathToArray($pathElements, $index);
         }
         return $tree;
     }

From dfcac0cda94965b503aa388fea3fb58347139d5a Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Thu, 8 Nov 2018 15:19:14 +0100
Subject: [PATCH 093/932] Align tests to work correctly with fixed three logic

---
 .../Magento/GraphQl/Catalog/CategoryTest.php         | 12 ++++++------
 .../testsuite/Magento/Catalog/_files/categories.php  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
index eff2e96f4b112..57c350bf8e500 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -83,8 +83,8 @@ public function testCategoriesTree()
         $responseDataObject = new DataObject($response);
         //Some sort of smoke testing
         self::assertEquals(
-            'Ololo',
-            $responseDataObject->getData('category/children/7/children/1/description')
+            'Its a description of Test Category 1.2',
+            $responseDataObject->getData('category/children/0/children/1/description')
         );
         self::assertEquals(
             'default-category',
@@ -99,16 +99,16 @@ public function testCategoriesTree()
             $responseDataObject->getData('category/children/0/default_sort_by')
         );
         self::assertCount(
-            8,
+            7,
             $responseDataObject->getData('category/children')
         );
         self::assertCount(
             2,
-            $responseDataObject->getData('category/children/7/children')
+            $responseDataObject->getData('category/children/0/children')
         );
         self::assertEquals(
-            5,
-            $responseDataObject->getData('category/children/7/children/1/children/0/id')
+            13,
+            $responseDataObject->getData('category/children/0/children/1/id')
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
index a903274793c34..a5ab961932461 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
@@ -178,7 +178,7 @@
     ->setParentId(3)
     ->setPath('1/2/3/13')
     ->setLevel(3)
-    ->setDescription('Ololo')
+    ->setDescription('Its a description of Test Category 1.2')
     ->setAvailableSortBy('name')
     ->setDefaultSortBy('name')
     ->setIsActive(true)

From e39ce7a3f2a7e6ee134cff9a097b7321756c32cf Mon Sep 17 00:00:00 2001
From: Joshua Bixler <jbixler@vervocity.io>
Date: Thu, 8 Nov 2018 11:00:03 -0600
Subject: [PATCH 094/932] Correct setFrom in Magento\Framework\Mail\Template to
 match Zend Message

---
 lib/internal/Magento/Framework/Mail/Message.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index 6f156e42dfdba..d3b8569a0b27e 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -90,9 +90,9 @@ public function getBody()
     /**
      * {@inheritdoc}
      */
-    public function setFrom($fromAddress)
+    public function setFrom($fromAddress, $name = null)
     {
-        $this->zendMessage->setFrom($fromAddress);
+        $this->zendMessage->setFrom($fromAddress, $name);
         return $this;
     }
 

From 99621b32f8c7d3d12f83db7e67f5f1c1ef3e7f31 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Thu, 8 Nov 2018 17:12:58 +0000
Subject: [PATCH 095/932] Fixed setFrom function by deprecating old and
 introducing new function.

---
 lib/internal/Magento/Framework/Mail/Message.php   | 15 ++++++++++++++-
 .../Framework/Mail/Template/TransportBuilder.php  |  2 +-
 .../Mail/Template/TransportBuilderByStore.php     |  2 +-
 .../Unit/Template/TransportBuilderByStoreTest.php |  4 ++--
 .../Test/Unit/Template/TransportBuilderTest.php   |  4 ++--
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index 6f156e42dfdba..bc7193f107bb5 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -89,10 +89,23 @@ public function getBody()
 
     /**
      * {@inheritdoc}
+     *
+     * @deprecated This function is missing the from name. The
+     * setFromAddress() function sets both from address and from name.
+     * @see setFromAddress()
      */
     public function setFrom($fromAddress)
     {
-        $this->zendMessage->setFrom($fromAddress);
+        $this->setFromAddress($fromAddress, null);
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setFromAddress($fromAddress, $fromName = null)
+    {
+        $this->zendMessage->setFrom($fromAddress, $fromName);
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 3a9117deb4b17..a7bb96122a84d 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -200,7 +200,7 @@ public function setFrom($from)
     public function setFromByStore($from, $store = null)
     {
         $result = $this->_senderResolver->resolve($from, $store);
-        $this->message->setFrom($result['email'], $result['name']);
+        $this->message->setFromAddress($result['email'], $result['name']);
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
index baac867fd6ce8..85b1b181d4f9e 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
@@ -54,7 +54,7 @@ public function __construct(
     public function setFromByStore($from, $store)
     {
         $result = $this->senderResolver->resolve($from, $store);
-        $this->message->setFrom($result['email'], $result['name']);
+        $this->message->setFromAddress($result['email'], $result['name']);
 
         return $this;
     }
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
index 80df2887a3a93..a28dbcd291baf 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderByStoreTest.php
@@ -55,8 +55,8 @@ public function testSetFromByStore()
             ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
-            ->method('setFrom')
-            ->with('from@example.com', 'name')
+            ->method('setFromAddress')
+            ->with($sender['email'], $sender['name'])
             ->willReturnSelf();
 
         $this->model->setFromByStore($sender, $store);
diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
index 5f20a790a2d32..b476eecd7f59f 100644
--- a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
+++ b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -176,8 +176,8 @@ public function testSetFromByStore()
             ->with($sender, $store)
             ->willReturn($sender);
         $this->messageMock->expects($this->once())
-            ->method('setFrom')
-            ->with('from@example.com', 'name')
+            ->method('setFromAddress')
+            ->with($sender['email'], $sender['name'])
             ->willReturnSelf();
 
         $this->builder->setFromByStore($sender, $store);

From 77d2a6c04d97f90d8d9d240466540bf87138983d Mon Sep 17 00:00:00 2001
From: Cristiano Casciotti <teknoman84@gmail.com>
Date: Thu, 11 Oct 2018 11:41:46 +0200
Subject: [PATCH 096/932] Added option to exclude discount for minimum order
 amount calculation

---
 app/code/Magento/Quote/Model/Quote.php        | 17 ++++++++++--
 .../Magento/Quote/Model/Quote/Address.php     | 18 +++++++++++--
 .../Test/Unit/Model/Quote/AddressTest.php     | 27 +++++++++++++++++++
 .../Quote/Test/Unit/Model/QuoteTest.php       |  2 ++
 .../Magento/Sales/etc/adminhtml/system.xml    |  5 ++++
 app/code/Magento/Sales/etc/config.xml         |  1 +
 6 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 3f04519713687..636f5c2dd06e2 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -2246,6 +2246,11 @@ public function validateMinimumAmount($multishipping = false)
         if (!$minOrderActive) {
             return true;
         }
+        $includeDiscount = $this->_scopeConfig->getValue(
+            'sales/minimum_order/include_discount_amount',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
         $minOrderMulti = $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/multi_address',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
@@ -2279,7 +2284,11 @@ public function validateMinimumAmount($multishipping = false)
                 $taxes = ($taxInclude) ? $address->getBaseTaxAmount() : 0;
                 foreach ($address->getQuote()->getItemsCollection() as $item) {
                     /** @var \Magento\Quote\Model\Quote\Item $item */
-                    $amount = $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $taxes;
+                    if ($includeDiscount) {
+                        $amount = $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $taxes;
+                    } else {
+                        $amount = $taxInclude ? $item->getBaseRowTotalInclTax() : $item->getBaseRowTotal();
+                    }
                     if ($amount < $minAmount) {
                         return false;
                     }
@@ -2289,7 +2298,11 @@ public function validateMinimumAmount($multishipping = false)
             $baseTotal = 0;
             foreach ($addresses as $address) {
                 $taxes = ($taxInclude) ? $address->getBaseTaxAmount() : 0;
-                $baseTotal += $address->getBaseSubtotalWithDiscount() + $taxes;
+                if ($includeDiscount) {
+                    $baseTotal += $address->getBaseSubtotalWithDiscount() + $taxes;
+                } else {
+                    $baseTotal += $taxInclude ? $address->getBaseSubtotalTotalInclTax() : $address->getBaseSubtotal();
+                }
             }
             if ($baseTotal < $minAmount) {
                 return false;
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index e311eb924dee4..8cac16989d5ca 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1143,6 +1143,11 @@ public function validateMinimumAmount()
             return true;
         }
 
+        $includeDiscount = $this->_scopeConfig->getValue(
+            'sales/minimum_order/include_discount_amount',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
         $amount = $this->_scopeConfig->getValue(
             'sales/minimum_order/amount',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
@@ -1153,9 +1158,18 @@ public function validateMinimumAmount()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
-        $taxes = $taxInclude ? $this->getBaseTaxAmount() : 0;
 
-        return ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount);
+        if ($includeDiscount) {
+            $taxes = $taxInclude ? $this->getBaseTaxAmount() : 0;
+
+            $isMinimumReached = ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount);
+        } else {
+            $isMinimumReached = $taxInclude
+                ? ($this->getBaseSubtotalTotalInclTax() >= $amount)
+                : ($this->getBaseSubtotal() >= $amount);
+        }
+
+        return $isMinimumReached;
     }
 
     /**
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
index c1c131260f17a..242f81b222507 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
@@ -216,6 +216,7 @@ public function testValidateMinimumAmountVirtual()
         $scopeConfigValues = [
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
 
@@ -240,6 +241,31 @@ public function testValidateMinimumAmount()
         $scopeConfigValues = [
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
+        ];
+
+        $this->quote->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $this->quote->expects($this->once())
+            ->method('getIsVirtual')
+            ->willReturn(false);
+
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->willReturnMap($scopeConfigValues);
+
+        $this->assertTrue($this->address->validateMinimumAmount());
+    }
+
+    public function testValidateMiniumumAmountWithoutDiscount()
+    {
+        $storeId = 1;
+        $scopeConfigValues = [
+            ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, false],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
 
@@ -263,6 +289,7 @@ public function testValidateMinimumAmountNegative()
         $scopeConfigValues = [
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
index 22785f051dcfa..07e203f71714d 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
@@ -975,6 +975,7 @@ public function testValidateMinimumAmount()
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
         $this->scopeConfig->expects($this->any())
@@ -1001,6 +1002,7 @@ public function testValidateMinimumAmountNegative()
             ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/include_discount_amount', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
         $this->scopeConfig->expects($this->any())
diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
index 1b2f8b88d7dc3..2dc467d6ca247 100644
--- a/app/code/Magento/Sales/etc/adminhtml/system.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/system.xml
@@ -89,6 +89,11 @@
                     <label>Minimum Amount</label>
                     <comment>Subtotal after discount</comment>
                 </field>
+                <field id="include_discount_amount" translate="label" sortOrder="12" type="select" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>Include Discount Amount</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment>Choosing yes will be used subtotal after discount, otherwise only subtotal will be used</comment>
+                </field>
                 <field id="tax_including" translate="label" sortOrder="15" type="select" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Include Tax to Amount</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
diff --git a/app/code/Magento/Sales/etc/config.xml b/app/code/Magento/Sales/etc/config.xml
index 5be06fa3836a7..2480da4ad214b 100644
--- a/app/code/Magento/Sales/etc/config.xml
+++ b/app/code/Magento/Sales/etc/config.xml
@@ -22,6 +22,7 @@
                 <allow_zero_grandtotal>1</allow_zero_grandtotal>
             </zerograndtotal_creditmemo>
             <minimum_order>
+                <include_discount_amount>1</include_discount_amount>
                 <tax_including>1</tax_including>
             </minimum_order>
             <orders>

From e337c77a6bc364fc8b0b61e5994e9770d13d2362 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Mon, 12 Nov 2018 16:01:01 +0300
Subject: [PATCH 097/932] MAGETWO-58212: [GITHUB] Magento 2.1 CE, Cannot change
 attribute set for bundled product #5999

- Bug fix.
---
 .../Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index d84f496e81915..88cd3f180075d 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -342,6 +342,8 @@ private function getAttributesMeta(array $attributes, $groupCode)
             }
 
             $attributeContainer = $this->addContainerChildren($attributeContainer, $attribute, $groupCode, $sortOrder);
+            $attributeContainer['arguments']['data']['config']['dataScope'] =
+                static::CONTAINER_PREFIX . $attribute->getAttributeCode();
 
             $meta[static::CONTAINER_PREFIX . $attribute->getAttributeCode()] = $attributeContainer;
         }

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 098/932] 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 099/932] 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 bbf124759cf3d27dd4bfee4a9c4e3a3969bc59ff Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 13 Nov 2018 11:56:42 +0200
Subject: [PATCH 100/932] magento/magento2#14849: [Forwardport] In Sales Emails
 no translation using order.getStatusLabel().

---
 app/code/Magento/Sales/Model/Order.php        | 24 ++++++++---
 app/code/Magento/Sales/Model/Order/Config.php | 42 +++++++++++++++----
 .../frontend/email/creditmemo_update.html     |  4 +-
 .../email/creditmemo_update_guest.html        |  4 +-
 .../view/frontend/email/invoice_update.html   |  4 +-
 .../frontend/email/invoice_update_guest.html  |  4 +-
 .../view/frontend/email/order_update.html     |  4 +-
 .../frontend/email/order_update_guest.html    |  4 +-
 .../view/frontend/email/shipment_update.html  |  4 +-
 .../frontend/email/shipment_update_guest.html |  4 +-
 .../email/creditmemo_update.html              |  4 +-
 .../email/creditmemo_update_guest.html        |  4 +-
 .../Magento_Sales/email/invoice_update.html   |  4 +-
 .../email/invoice_update_guest.html           |  4 +-
 .../Magento_Sales/email/order_update.html     |  4 +-
 .../email/order_update_guest.html             |  4 +-
 .../Magento_Sales/email/shipment_update.html  |  4 +-
 .../email/shipment_update_guest.html          |  4 +-
 18 files changed, 84 insertions(+), 46 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 345ff036a2be6..e223f213b86f7 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -8,6 +8,7 @@
 use Magento\Directory\Model\Currency;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Sales\Api\Data\OrderInterface;
@@ -1024,10 +1025,21 @@ public function setState($state)
         return $this->setData(self::STATE, $state);
     }
 
+    /**
+     * Retrieve frontend label of order status
+     *
+     * @return string
+     */
+    public function getFrontendStatusLabel()
+    {
+        return $this->getConfig()->getStatusFrontendLabel($this->getStatus());
+    }
+
     /**
      * Retrieve label of order status
      *
      * @return string
+     * @throws LocalizedException
      */
     public function getStatusLabel()
     {
@@ -1135,12 +1147,12 @@ public function place()
      * Hold order
      *
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function hold()
     {
         if (!$this->canHold()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('A hold action is not available.'));
+            throw new LocalizedException(__('A hold action is not available.'));
         }
         $this->setHoldBeforeState($this->getState());
         $this->setHoldBeforeStatus($this->getStatus());
@@ -1153,12 +1165,12 @@ public function hold()
      * Attempt to unhold the order
      *
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function unhold()
     {
         if (!$this->canUnhold()) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('You cannot remove the hold.'));
+            throw new LocalizedException(__('You cannot remove the hold.'));
         }
 
         $this->setState($this->getHoldBeforeState())
@@ -1202,7 +1214,7 @@ public function isFraudDetected()
      * @param string $comment
      * @param bool $graceful
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function registerCancellation($comment = '', $graceful = true)
@@ -1241,7 +1253,7 @@ public function registerCancellation($comment = '', $graceful = true)
                 $this->addStatusHistoryComment($comment, false);
             }
         } elseif (!$graceful) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('We cannot cancel this order.'));
+            throw new LocalizedException(__('We cannot cancel this order.'));
         }
         return $this;
     }
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index e00eda647dc8d..8999fca174de9 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Sales\Model\Order;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * Order configuration model
  *
@@ -85,7 +87,7 @@ protected function _getCollection()
 
     /**
      * @param string $state
-     * @return Status|null
+     * @return Status
      */
     protected function _getState($state)
     {
@@ -101,7 +103,7 @@ protected function _getState($state)
      * Retrieve default status for state
      *
      * @param   string $state
-     * @return  string
+     * @return  string|null
      */
     public function getStateDefaultStatus($state)
     {
@@ -115,24 +117,48 @@ public function getStateDefaultStatus($state)
     }
 
     /**
-     * Retrieve status label
+     * Get status label for a specified area
      *
-     * @param   string $code
-     * @return  string
+     * @param string $code
+     * @param string $area
+     * @return string
      */
-    public function getStatusLabel($code)
+    private function getStatusLabelForArea(string $code, string $area): string
     {
-        $area = $this->state->getAreaCode();
         $code = $this->maskStatusForArea($area, $code);
         $status = $this->orderStatusFactory->create()->load($code);
 
-        if ($area == 'adminhtml') {
+        if ($area === 'adminhtml') {
             return $status->getLabel();
         }
 
         return $status->getStoreLabel();
     }
 
+    /**
+     * Retrieve status label for detected area
+     *
+     * @param string $code
+     * @return string
+     * @throws LocalizedException
+     */
+    public function getStatusLabel($code)
+    {
+        $area = $this->state->getAreaCode() ?: \Magento\Framework\App\Area::AREA_FRONTEND;
+        return $this->getStatusLabelForArea($code, $area);
+    }
+
+    /**
+     * Retrieve status label for area
+     *
+     * @param string $code
+     * @return string
+     */
+    public function getStatusFrontendLabel(string $code): string
+    {
+        return $this->getStatusLabelForArea($code, \Magento\Framework\App\Area::AREA_FRONTEND);
+    }
+
     /**
      * Mask status for order for specified area
      *
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
index 3a4aab19e9e7c..a6a10fb49e3f5 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html
@@ -11,7 +11,7 @@
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var order.getCustomerName()":"Customer Name",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -24,7 +24,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
index bc7c079d7f21b..b7411d80d2ba6 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
@@ -10,7 +10,7 @@
 "var creditmemo.increment_id":"Credit Memo Id",
 "var billing.getName()":"Guest Customer Name",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -23,7 +23,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update.html b/app/code/Magento/Sales/view/frontend/email/invoice_update.html
index cafdd65ff5208..4043e59f9d7d6 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update.html
@@ -11,7 +11,7 @@
 "var comment":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -24,7 +24,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
index fafb533301efb..40cdec7fb4cab 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
@@ -10,7 +10,7 @@
 "var comment":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -23,7 +23,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>
diff --git a/app/code/Magento/Sales/view/frontend/email/order_update.html b/app/code/Magento/Sales/view/frontend/email/order_update.html
index a709a9ed8a7f1..a8f0068b70e87 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_update.html
@@ -10,7 +10,7 @@
 "var order.getCustomerName()":"Customer Name",
 "var comment":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -23,7 +23,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
diff --git a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
index 5a39b01810c18..749fa3b60ad59 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
@@ -9,7 +9,7 @@
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -22,7 +22,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update.html b/app/code/Magento/Sales/view/frontend/email/shipment_update.html
index 6d9efc37004bc..9d1c93287549a 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_update.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update.html
@@ -10,7 +10,7 @@
 "var order.getCustomerName()":"Customer Name",
 "var comment":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status",
+"var order.getFrontendStatusLabel()":"Order Status",
 "var shipment.increment_id":"Shipment Id"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -24,7 +24,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>{{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}</p>
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
index 4896a00b7bc5a..0d2dccd3377d2 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
@@ -9,7 +9,7 @@
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status",
+"var order.getFrontendStatusLabel()":"Order Status",
 "var shipment.increment_id":"Shipment Id"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -23,7 +23,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
index a7b9b330ab9ce..269e46d752084 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
@@ -11,7 +11,7 @@
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var order.getCustomerName()":"Customer Name",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -24,7 +24,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
index 36279eb26005e..c8bdae7b08fa5 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
@@ -10,7 +10,7 @@
 "var creditmemo.increment_id":"Credit Memo Id",
 "var billing.getName()":"Guest Customer Name",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -23,7 +23,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
index a739c9f54b08f..8ec54f1e64d9c 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
@@ -11,7 +11,7 @@
 "var comment":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -24,7 +24,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
index a56ee6da9fa25..6028db7b97730 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
@@ -10,7 +10,7 @@
 "var comment":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -23,7 +23,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
index 3e4bf8df2f107..fa16ac2196bf4 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
@@ -10,7 +10,7 @@
 "var order.getCustomerName()":"Customer Name",
 "var comment":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -23,7 +23,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
index 1075608db4341..8ead615fe01ca 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
@@ -9,7 +9,7 @@
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status"
+"var order.getFrontendStatusLabel()":"Order Status"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -22,7 +22,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
index 37bf92b866c74..4f9b7286f3ae4 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
@@ -10,7 +10,7 @@
 "var order.getCustomerName()":"Customer Name",
 "var comment":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status",
+"var order.getFrontendStatusLabel()":"Order Status",
 "var shipment.increment_id":"Shipment Id"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -24,7 +24,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
                 {{trans 'You can check the status of your order by <a href="%account_url">logging into your account</a>.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
index 954819949860b..3ef26463ea755 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
@@ -9,7 +9,7 @@
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Order Comment",
 "var order.increment_id":"Order Id",
-"var order.getStatusLabel()":"Order Status",
+"var order.getFrontendStatusLabel()":"Order Status",
 "var shipment.increment_id":"Shipment Id"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -23,7 +23,7 @@
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
 
                     increment_id=$order.increment_id
-                    order_status=$order.getStatusLabel()
+                    order_status=$order.getFrontendStatusLabel()
                 |raw}}
             </p>
             <p>

From 8038f6ed70eefd45798e493d4eceeb91ef6120ab Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Tue, 13 Nov 2018 15:02:39 +0200
Subject: [PATCH 101/932] GraphQl-139: Show only active categories

-- Fix static tests
---
 .../Products/DataProvider/ExtractDataFromCategoryTree.php  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
index 5d282fda549a5..cc8aa7e13aff7 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
@@ -86,13 +86,12 @@ private function mergeCategoriesTrees(array &$tree1, array &$tree2): array
     /**
      * Recursive method to generate tree for one category path
      *
-     * @param $pathElements
-     * @param $index
+     * @param array $pathElements
+     * @param int $index
      * @return array
      */
-    private function explodePathToArray($pathElements, $index): array
+    private function explodePathToArray(array $pathElements, int $index): array
     {
-
         $tree = [];
         $tree[$pathElements[$index]]['id'] = $pathElements[$index];
         if ($index === count($pathElements) - 1) {

From 517ef266b441edffea38a1a8848e67a266f3359e Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Tue, 13 Nov 2018 21:28:28 +0530
Subject: [PATCH 102/932] issue #18349 for 2.3-develop

---
 app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
index 32687499274f8..d1e559845c479 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
@@ -63,6 +63,9 @@ public function convert($item, $data = [])
             'to_order_item',
             $item
         );
+        if ($item instanceof \Magento\Quote\Model\Quote\Address\Item) {
+            $orderItemData['quote_item_id'] = $item->getQuoteItemId();
+        }
         if (!$item->getNoDiscount()) {
             $data = array_merge(
                 $data,

From ea3a8c7a42ad4132f5641de6d47e9b8d7020cdef Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 14 Nov 2018 15:39:15 +0300
Subject: [PATCH 103/932] MAGETWO-94556: Undefined variables during product
 save

- Fixed an issue with missing product data after sku validation;
---
 .../adminhtml/web/js/variations/variations.js | 30 ++++++++++++++++++-
 1 file changed, 29 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..c6eee5486d117 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
@@ -389,10 +389,23 @@ define([
                 this.formSaveParams = arguments;
                 this.attributeSetHandlerModal().openModal();
             } else {
+                if (this.validateForm(this.formElement())) {
+                    this.clearOutdatedData();
+                }
                 this.formElement().save(arguments[0], arguments[1]);
             }
         },
 
+        /**
+         * @param {Object} formElement
+         *
+         * Validates each form element and returns true, if all elements are valid.
+         */
+        validateForm: function (formElement) {
+            formElement.validate();
+            return !formElement.additionalInvalid && !formElement.source.get('params.invalid');
+        },
+
         /**
          * Serialize data for specific form fields
          *
@@ -410,12 +423,27 @@ define([
             if (this.source.data['configurable-matrix']) {
                 this.source.data['configurable-matrix-serialized'] =
                     JSON.stringify(this.source.data['configurable-matrix']);
-                delete this.source.data['configurable-matrix'];
             }
 
             if (this.source.data['associated_product_ids']) {
                 this.source.data['associated_product_ids_serialized'] =
                     JSON.stringify(this.source.data['associated_product_ids']);
+            }
+        },
+
+        /**
+         * Clear outdated data for specific form fields
+         *
+         * Outdated fields:
+         *   - configurable-matrix;
+         *   - associated_product_ids.
+         */
+        clearOutdatedData: function () {
+            if (this.source.data['configurable-matrix']) {
+                delete this.source.data['configurable-matrix'];
+            }
+
+            if (this.source.data['associated_product_ids']) {
                 delete this.source.data['associated_product_ids'];
             }
         },

From 7cd85c802cf8cf820109b8702a04a2a22ef42d9e Mon Sep 17 00:00:00 2001
From: Jayanka <jayan@codilar.com>
Date: Wed, 14 Nov 2018 18:04:02 +0300
Subject: [PATCH 104/932] unnecessary comments removed

---
 app/code/Magento/Quote/Model/Quote/Address/Total.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 7b24e60f9749f..8179b2b19707f 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -55,7 +55,6 @@ public function __construct(
      */
     public function setTotalAmount($code, $amount)
     {
-        /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
         $amount = is_float($amount) ? round($amount, 4) : $amount;
 
         $this->totalAmounts[$code] = $amount;
@@ -76,7 +75,6 @@ public function setTotalAmount($code, $amount)
      */
     public function setBaseTotalAmount($code, $amount)
     {
-        /* (Fixes issue #18027) Round the total amount to 4 decimal places, to avoid floating point overflows */
         $amount = is_float($amount) ? round($amount, 4) : $amount;
 
         $this->baseTotalAmounts[$code] = $amount;

From cf383a9b96853104077f08e4b1e5bc8c189725cf Mon Sep 17 00:00:00 2001
From: Patrick McLain <pat@pmclain.com>
Date: Tue, 6 Nov 2018 23:49:31 -0500
Subject: [PATCH 105/932] Fix mass product update with group min cart qty

Resolves warning when using the product edit mass-action after configuring
global group cart min qty

Fixes #17592
---
 .../Edit/Action/Attribute/Tab/Inventory.php   | 27 +++++++++++++++-
 .../Action/Attribute/Tab/InventoryTest.php    | 31 ++++++++++++++++++-
 .../product/edit/action/inventory.phtml       |  2 +-
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
index 4aa01b467d451..01107412d1006 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
 
+use Magento\Customer\Api\Data\GroupInterface;
+
 /**
  * Products mass update inventory tab
  *
@@ -29,6 +31,11 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
      */
     protected $disabledFields = [];
 
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\CatalogInventory\Model\Source\Backorders $backorders
@@ -39,10 +46,13 @@ public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\CatalogInventory\Model\Source\Backorders $backorders,
         \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\SerializerInterface $serializer = null
     ) {
         $this->_backorders = $backorders;
         $this->stockConfiguration = $stockConfiguration;
+        $this->serializer = $serializer ?? \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\SerializerInterface::class);
         parent::__construct($context, $data);
     }
 
@@ -88,6 +98,21 @@ public function getDefaultConfigValue($field)
         return $this->stockConfiguration->getDefaultConfigValue($field);
     }
 
+    /**
+     * Returns min_sale_qty configuration for the ALL Customer Group
+     * @return int
+     */
+    public function getDefaultMinSaleQty()
+    {
+        $default = $this->stockConfiguration->getDefaultConfigValue('min_sale_qty');
+        if (!is_numeric($default)) {
+            $default = $this->serializer->unserialize($default);
+            $default = isset($default[GroupInterface::CUST_GROUP_ALL]) ? $default[GroupInterface::CUST_GROUP_ALL] : 1;
+        }
+
+        return (int) $default;
+    }
+
     /**
      * Tab settings
      *
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/InventoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/InventoryTest.php
index fb8a3d221b029..13e1b33a47d9a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/InventoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/InventoryTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
 
+use Magento\Customer\Api\Data\GroupInterface;
+
 /**
  * Class InventoryTest
  */
@@ -68,7 +70,8 @@ protected function setUp()
             [
                 'context' => $this->contextMock,
                 'backorders' => $this->backordersMock,
-                'stockConfiguration' => $this->stockConfigurationMock
+                'stockConfiguration' => $this->stockConfigurationMock,
+                'serializer' => new \Magento\Framework\Serialize\Serializer\Json(),
             ]
         );
     }
@@ -126,6 +129,32 @@ public function testGetDefaultConfigValue()
         $this->assertEquals('return-value', $this->inventory->getDefaultConfigValue('field-name'));
     }
 
+    /**
+     * @dataProvider getDefaultMinSaleQtyDataProvider
+     * @param string $expected
+     * @param string $default
+     */
+    public function testGetDefaultMinSaleQty($expected, $default)
+    {
+        $this->stockConfigurationMock->method('getDefaultConfigValue')->willReturn($default);
+        $this->assertEquals($expected, $this->inventory->getDefaultMinSaleQty());
+    }
+
+    public function getDefaultMinSaleQtyDataProvider()
+    {
+        return [
+            'single-default-value' => [
+                22, '22'
+            ],
+            'no-default-for-all-group' => [
+                1, json_encode(['12' => '111'])
+            ],
+            'default-for-all-group' => [
+                5, json_encode(['12' => '111', GroupInterface::CUST_GROUP_ALL => '5'])
+            ]
+        ];
+    }
+
     /**
      * Run test getTabLabel method
      *
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
index efc06d675c369..96e07ceb4d305 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
@@ -132,7 +132,7 @@
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[min_sale_qty]"
-                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('min_sale_qty') * 1 ?>"
+                               value="<?= /* @escapeNotVerified */ $block->getDefaultMinSaleQty() * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">

From 8b4c1fa781ef14b2f1b9d3ae46be5b932cf108a6 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <Veronika_Kurochkina@epam.com>
Date: Thu, 15 Nov 2018 18:02:08 +0300
Subject: [PATCH 106/932] MAGETWO-91559: Static blocks with same ID appear in
 place of correct block

- Update automated test
---
 app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
index df7cd59a45886..c3c92dc59c288 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CheckStaticBlocksTest">
         <annotations>
             <features value="Cms"/>
@@ -63,10 +63,10 @@
         <see userInput="A block identifier with the same properties already exists in the selected store." stepKey="VerifyBlockIsSaved1"/>
 
         <after>
-            <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
                 <argument name="websiteName" value="secondWebsite"/>
             </actionGroup>
+            <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
         </after>
     </test>
 </tests>

From 1b71e53cd67d7e1ab46f98a867e94225d05cd528 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Thu, 15 Nov 2018 15:11:06 +0300
Subject: [PATCH 107/932] MAGETWO-95310: [2.3] Wrong color image when filtering
 by color filter

- Bug fix.
---
 .../Product/Renderer/Listing/Configurable.php | 29 ++++++++++++++++---
 app/code/Magento/Swatches/Helper/Data.php     | 14 ++++-----
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
index e13373fb72558..287134d6bb70a 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
@@ -8,7 +8,8 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Helper\Product as CatalogProduct;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Catalog\Model\Layer\Category as CategoryLayer;
 use Magento\ConfigurableProduct\Helper\Data;
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
@@ -39,6 +40,11 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
      */
     private $variationPrices;
 
+    /**
+     * @var \Magento\Catalog\Model\Layer\Resolver
+     */
+    private $layerResolver;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @param Context $context
@@ -55,6 +61,7 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
      * @param SwatchAttributesProvider|null $swatchAttributesProvider
      * @param \Magento\Framework\Locale\Format|null $localeFormat
      * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices|null $variationPrices
+     * @param Resolver $layerResolver
      */
     public function __construct(
         Context $context,
@@ -70,7 +77,8 @@ public function __construct(
         array $data = [],
         SwatchAttributesProvider $swatchAttributesProvider = null,
         \Magento\Framework\Locale\Format $localeFormat = null,
-        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null
+        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null,
+        Resolver $layerResolver = null
     ) {
         parent::__construct(
             $context,
@@ -92,10 +100,11 @@ public function __construct(
         $this->variationPrices = $variationPrices ?: ObjectManager::getInstance()->get(
             \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class
         );
+        $this->layerResolver = $layerResolver ?: ObjectManager::getInstance()->get(Resolver::class);
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     protected function getRendererTemplate()
     {
@@ -121,7 +130,7 @@ protected function _toHtml()
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     protected function getSwatchAttributesData()
     {
@@ -247,4 +256,16 @@ private function getLayeredAttributesIfExists(Product $configurableProduct, arra
 
         return $layeredAttributes;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCacheKeyInfo()
+    {
+        $cacheKeyInfo = parent::getCacheKeyInfo();
+        /** @var CategoryLayer $catalogLayer */
+        $catalogLayer = $this->layerResolver->get();
+        $cacheKeyInfo[] = $catalogLayer->getStateKey();
+        return $cacheKeyInfo;
+    }
 }
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index d82109ac12603..a40d65b6bb90b 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -7,7 +7,6 @@
 
 use Magento\Catalog\Api\Data\ProductInterface as Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product as ModelProduct;
 use Magento\Catalog\Model\Product\Image\UrlBuilder;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
@@ -254,18 +253,15 @@ public function loadVariationByFallback(Product $parentProduct, array $attribute
         $this->addFilterByParent($productCollection, $parentId);
 
         $configurableAttributes = $this->getAttributesFromConfigurable($parentProduct);
-        $allAttributesArray = [];
+
+        $resultAttributesToFilter = [];
         foreach ($configurableAttributes as $attribute) {
-            if (!empty($attribute['default_value'])) {
-                $allAttributesArray[$attribute['attribute_code']] = $attribute['default_value'];
+            $attributeCode = $attribute->getData('attribute_code');
+            if (array_key_exists($attributeCode, $attributes)) {
+                $resultAttributesToFilter[$attributeCode] = $attributes[$attributeCode];
             }
         }
 
-        $resultAttributesToFilter = array_merge(
-            $attributes,
-            array_diff_key($allAttributesArray, $attributes)
-        );
-
         $this->addFilterByAttributes($productCollection, $resultAttributesToFilter);
 
         $variationProduct = $productCollection->getFirstItem();

From 387b0e7067f70e13e9b107c43d0e4b1e26944ea8 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Fri, 16 Nov 2018 11:46:34 -0600
Subject: [PATCH 108/932] MC-5570: Different Order Status of two created credit
 memo orders

---
 app/code/Magento/Sales/Model/Order.php        |  15 +-
 .../ResourceModel/Order/Handler/State.php     |  26 ++-
 .../ResourceModel/Order/Handler/StateTest.php | 178 +++++++-----------
 3 files changed, 96 insertions(+), 123 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 345ff036a2be6..ab9dce1041592 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\ResourceModel\Order\Address\Collection;
@@ -761,13 +762,25 @@ public function canShip()
         }
 
         foreach ($this->getAllItems() as $item) {
-            if ($item->getQtyToShip() > 0 && !$item->getIsVirtual() && !$item->getLockedDoShip()) {
+            if ($item->getQtyToShip() > 0 && !$item->getIsVirtual() &&
+                !$item->getLockedDoShip() && !$this->isRefunded($item)) {
                 return true;
             }
         }
         return false;
     }
 
+    /**
+     * Check if item is refunded.
+     *
+     * @param OrderItemInterface $item
+     * @return bool
+     */
+    private function isRefunded(OrderItemInterface $item)
+    {
+        return $item->getQtyRefunded() == $item->getQtyOrdered();
+    }
+
     /**
      * Retrieve order edit availability
      *
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
index 3b127abbda732..106745df266fd 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
@@ -14,7 +14,7 @@
 class State
 {
     /**
-     * Check order status before save
+     * Check order status and adjust the status before save
      *
      * @param Order $order
      * @return $this
@@ -23,22 +23,18 @@ class State
      */
     public function check(Order $order)
     {
-        if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice() && !$order->canShip()) {
-            if (0 == $order->getBaseGrandTotal() || $order->canCreditmemo()) {
-                if ($order->getState() !== Order::STATE_COMPLETE) {
-                    $order->setState(Order::STATE_COMPLETE)
-                        ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
-                }
-            } elseif ((float)$order->getTotalRefunded()
-                || !$order->getTotalRefunded() && $order->hasForcedCanCreditmemo()
-            ) {
-                if ($order->getState() !== Order::STATE_CLOSED) {
-                    $order->setState(Order::STATE_CLOSED)
-                        ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_CLOSED));
-                }
+        $currentState = $order->getState();
+        if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice()) {
+            if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE]) && !$order->canCreditmemo()) {
+                $order->setState(Order::STATE_CLOSED)
+                    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_CLOSED));
+            } elseif ($currentState === Order::STATE_PROCESSING && !$order->canShip()) {
+                $order->setState(Order::STATE_COMPLETE)
+                    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
             }
         }
-        if ($order->getState() == Order::STATE_NEW && $order->getIsInProcess()) {
+
+        if ($currentState == Order::STATE_NEW && $order->getIsInProcess()) {
             $order->setState(Order::STATE_PROCESSING)
                 ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING));
         }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index e120d613e323c..625589342974a 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
@@ -53,127 +53,91 @@ protected function setUp()
     }
 
     /**
-     * test check order - order without id
+     * @param bool $isCanceled
+     * @param bool $canUnhold
+     * @param bool $canInvoice
+     * @param bool $canShip
+     * @param int $callCanSkipNum
+     * @param bool $canCreditmemo
+     * @param int $callCanCreditmemoNum
+     * @param string $currentState
+     * @param string $expectedState
+     * @param int $callSetStateNum
+     * @dataProvider stateCheckDataProvider
      */
-    public function testCheckOrderEmpty()
-    {
-        $this->orderMock->expects($this->once())
-            ->method('getBaseGrandTotal')
-            ->willReturn(100);
-        $this->orderMock->expects($this->never())
-            ->method('setState');
-
-        $this->state->check($this->orderMock);
-    }
-
-    /**
-     * test check order - set state complete
-     */
-    public function testCheckSetStateComplete()
-    {
+    public function testCheck(
+        bool $canCreditmemo,
+        int $callCanCreditmemoNum,
+        bool $canShip,
+        int $callCanSkipNum,
+        string $currentState,
+        string $expectedState = '',
+        int $callSetStateNum = 0,
+        bool $isInProcess = false,
+        int $callGetIsInProcessNum = 0,
+        bool $isCanceled = false,
+        bool $canUnhold = false,
+        bool $canInvoice = false
+    ) {
         $this->orderMock->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(1));
-        $this->orderMock->expects($this->once())
             ->method('isCanceled')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canUnhold')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canInvoice')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canShip')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('getBaseGrandTotal')
-            ->will($this->returnValue(100));
-        $this->orderMock->expects($this->once())
-            ->method('canCreditmemo')
-            ->will($this->returnValue(true));
-        $this->orderMock->expects($this->exactly(2))
-            ->method('getState')
-            ->will($this->returnValue(Order::STATE_PROCESSING));
-        $this->orderMock->expects($this->once())
-            ->method('setState')
-            ->with(Order::STATE_COMPLETE)
-            ->will($this->returnSelf());
-        $this->assertEquals($this->state, $this->state->check($this->orderMock));
-    }
-
-    /**
-     * test check order - set state closed
-     */
-    public function testCheckSetStateClosed()
-    {
+            ->willReturn($isCanceled);
         $this->orderMock->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(1));
-        $this->orderMock->expects($this->once())
-            ->method('isCanceled')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
             ->method('canUnhold')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
+            ->willReturn($canUnhold);
+        $this->orderMock->expects($this->any())
             ->method('canInvoice')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
+            ->willReturn($canInvoice);
+        $this->orderMock->expects($this->exactly($callCanSkipNum))
             ->method('canShip')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('getBaseGrandTotal')
-            ->will($this->returnValue(100));
-        $this->orderMock->expects($this->once())
+            ->willReturn($canShip);
+        $this->orderMock->expects($this->exactly($callCanCreditmemoNum))
             ->method('canCreditmemo')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->exactly(2))
-            ->method('getTotalRefunded')
-            ->will($this->returnValue(null));
+            ->willReturn($canCreditmemo);
         $this->orderMock->expects($this->once())
-            ->method('hasForcedCanCreditmemo')
-            ->will($this->returnValue(true));
-        $this->orderMock->expects($this->exactly(2))
             ->method('getState')
-            ->will($this->returnValue(Order::STATE_PROCESSING));
-        $this->orderMock->expects($this->once())
+            ->willReturn($currentState);
+        $this->orderMock->expects($this->exactly($callGetIsInProcessNum))
+            ->method('getIsInProcess')
+            ->willReturn($isInProcess);
+        $this->orderMock->expects($this->exactly($callSetStateNum))
             ->method('setState')
-            ->with(Order::STATE_CLOSED)
+            ->with($expectedState)
             ->will($this->returnSelf());
-        $this->assertEquals($this->state, $this->state->check($this->orderMock));
+        $this->state->check($this->orderMock);
     }
 
-    /**
-     * test check order - set state processing
-     */
-    public function testCheckSetStateProcessing()
+    public function stateCheckDataProvider()
     {
-        $this->orderMock->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(1));
-        $this->orderMock->expects($this->once())
-            ->method('isCanceled')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canUnhold')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canInvoice')
-            ->will($this->returnValue(false));
-        $this->orderMock->expects($this->once())
-            ->method('canShip')
-            ->will($this->returnValue(true));
-        $this->orderMock->expects($this->once())
-            ->method('getState')
-            ->will($this->returnValue(Order::STATE_NEW));
-        $this->orderMock->expects($this->once())
-            ->method('getIsInProcess')
-            ->will($this->returnValue(true));
-        $this->orderMock->expects($this->once())
-            ->method('setState')
-            ->with(Order::STATE_PROCESSING)
-            ->will($this->returnSelf());
-        $this->assertEquals($this->state, $this->state->check($this->orderMock));
+        return [
+            'processing - !canCreditmemo!canShip -> closed' =>
+                [false, 1, false, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED, 1],
+            'complete - !canCreditmemo,!canShip -> closed' =>
+                [false, 1, false, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED, 1],
+            'processing - !canCreditmemo,canShip -> closed' =>
+                [false, 1, true, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED, 1],
+            'complete - !canCreditmemo,canShip -> closed' =>
+                [false, 1, true, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED, 1],
+            'processing - canCreditmemo,!canShip -> complete' =>
+                [true, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_COMPLETE, 1],
+            'complete - canCreditmemo,!canShip -> complete' =>
+                [true, 1, false, 0, Order::STATE_COMPLETE],
+            'processing - canCreditmemo, canShip -> processing' =>
+                [true, 1, true, 1, Order::STATE_PROCESSING],
+            'complete - canCreditmemo, canShip -> complete' =>
+                [true, 1, true, 0, Order::STATE_COMPLETE],
+            'new - canCreditmemo, canShip, IsInProcess -> processing' =>
+                [true, 0, true, 0, Order::STATE_NEW, Order::STATE_PROCESSING, 1, true, 1],
+            'new - canCreditmemo, canShip, !IsInProcess -> new' =>
+                [true, 0, true, 0, Order::STATE_NEW, '', 0, false, 1],
+            'hold - canUnhold -> hold' =>
+                [true, 0, true, 0, Order::STATE_HOLDED, '', 0, false, 0, false, true, false],
+            'payment_review - canUnhold -> payment_review' =>
+                [true, 0, true, 0, Order::STATE_PAYMENT_REVIEW, '', 0, false, 0, false, false, false],
+            'pending_payment - canUnhold -> pending_payment' =>
+                [true, 0, true, 0, Order::STATE_PENDING_PAYMENT, '', 0, false, 0, false, false, false],
+            'cancelled - isCanceled -> cancelled' =>
+                [true, 0, true, 0, Order::STATE_HOLDED, '', 0, false, 0, true, false, false],
+        ];
     }
 }

From 6d5a80c09aa94b38b8e2a5a5504d38257438364f Mon Sep 17 00:00:00 2001
From: Stepan Furman <furman.stepan@gmail.com>
Date: Sun, 18 Nov 2018 20:13:58 +0200
Subject: [PATCH 109/932] 248: Create customer account

---
 .../Model/Resolver/CreateCustomer.php         | 117 ++++++++++++++++++
 .../CustomerGraphQl/etc/schema.graphqls       |   7 +-
 2 files changed, 121 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
new file mode 100644
index 0000000000000..4dbf6ea4d7946
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Psr\Log\LoggerInterface;
+use Psr\Log\Test\LoggerInterfaceTest;
+
+/**
+ * Create customer data resolver
+ */
+class CreateCustomer implements ResolverInterface
+{
+    /**
+     * @var CustomerDataProvider
+     */
+    private $customerDataProvider;
+
+    /**
+     * @var AccountManagementInterface
+     */
+    private $accountManagement;
+
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+    /**
+     * @var Magento\Newsletter\Model\SubscriberFactory
+     */
+    private $subscriberFactory;
+
+    /**
+     * @param DataObjectHelper $dataObjectHelper
+     * @param CustomerInterfaceFactory $customerFactory
+     * @param AccountManagementInterface $accountManagement
+     * @param StoreManagerInterface $storeManager
+     * @param SubscriberFactory $subscriberFactory
+     * @param CustomerDataProvider $customerDataProvider
+     */
+    public function __construct(
+        DataObjectHelper $dataObjectHelper,
+        CustomerInterfaceFactory $customerFactory,
+        AccountManagementInterface $accountManagement,
+        StoreManagerInterface $storeManager,
+        SubscriberFactory $subscriberFactory,
+        CustomerDataProvider $customerDataProvider
+    ) {
+        $this->customerDataProvider = $customerDataProvider;
+        $this->accountManagement = $accountManagement;
+        $this->customerFactory = $customerFactory;
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->storeManager = $storeManager;
+        $this->subscriberFactory = $subscriberFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
+            throw new GraphQlInputException(__('"input" value should be specified'));
+        }
+        try {
+            $customerDataObject = $this->customerFactory->create();
+            $this->dataObjectHelper->populateWithArray(
+                $customerDataObject,
+                $args['input'],
+                \Magento\Customer\Api\Data\CustomerInterface::class
+            );
+            $store = $this->storeManager->getStore();
+            $customerDataObject->setWebsiteId($store->getWebsiteId());
+            $customerDataObject->setStoreId($store->getId());
+            $customer = $this->accountManagement->createAccount($customerDataObject, $args['input']['password']);
+            if (array_key_exists('is_subscribed', $args['input'])) {
+                if ($args['input']['is_subscribed']) {
+                    $this->subscriberFactory->create()->subscribeCustomerById($customer->getId());
+                }
+            }
+            $data = $this->customerDataProvider->getCustomerById((int)$customer->getId());
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()));
+        }
+        return ['customer' => $data];
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index b8411f00c5cb1..951d767eb1e67 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -8,7 +8,8 @@ type Query {
 type Mutation {
     generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\GenerateCustomerToken") @doc(description:"Retrieve Customer token")
     changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes password for logged in customer")
-    updateCustomer (input: UpdateCustomerInput): UpdateCustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update customer personal information")
+    createCustomer (input: CustomerInput): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomer") @doc(description:"Create customer account")
+    updateCustomer (input: CustomerInput): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update customer personal information")
     revokeCustomerToken: Boolean @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke Customer token")
 }
 
@@ -16,7 +17,7 @@ type CustomerToken {
     token: String @doc(description: "The customer token")
 }
 
-input UpdateCustomerInput {
+input CustomerInput {
     firstname: String
     lastname: String
     email: String
@@ -24,7 +25,7 @@ input UpdateCustomerInput {
     is_subscribed: Boolean
 }
 
-type UpdateCustomerOutput {
+type CustomerOutput {
     customer: Customer!
 }
 

From 91edcc574478fc57d798938261c5be4c6732707e Mon Sep 17 00:00:00 2001
From: Stepan Furman <furman.stepan@gmail.com>
Date: Mon, 19 Nov 2018 09:55:51 +0200
Subject: [PATCH 110/932] 248:Bugfix - Solved 'user is not authorised' error
 after creating customer and trying to retrieve data

---
 .../Model/Resolver/CreateCustomer.php         | 53 ++++++++++++-------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
index 4dbf6ea4d7946..2bf85eefe7617 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
@@ -7,20 +7,18 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-use Magento\Framework\Api\DataObjectHelper;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
-use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Store\Model\StoreManagerInterface;
-use Psr\Log\LoggerInterface;
-use Psr\Log\Test\LoggerInterfaceTest;
+use Magento\Framework\Api\DataObjectHelper;
 
 /**
  * Create customer data resolver
@@ -51,7 +49,7 @@ class CreateCustomer implements ResolverInterface
      */
     private $storeManager;
     /**
-     * @var Magento\Newsletter\Model\SubscriberFactory
+     * @var SubscriberFactory
      */
     private $subscriberFactory;
 
@@ -93,16 +91,8 @@ public function resolve(
             throw new GraphQlInputException(__('"input" value should be specified'));
         }
         try {
-            $customerDataObject = $this->customerFactory->create();
-            $this->dataObjectHelper->populateWithArray(
-                $customerDataObject,
-                $args['input'],
-                \Magento\Customer\Api\Data\CustomerInterface::class
-            );
-            $store = $this->storeManager->getStore();
-            $customerDataObject->setWebsiteId($store->getWebsiteId());
-            $customerDataObject->setStoreId($store->getId());
-            $customer = $this->accountManagement->createAccount($customerDataObject, $args['input']['password']);
+            $customer = $this->createUserAccount($args);
+            $this->setUpUserContext($context, $customer);
             if (array_key_exists('is_subscribed', $args['input'])) {
                 if ($args['input']['is_subscribed']) {
                     $this->subscriberFactory->create()->subscribeCustomerById($customer->getId());
@@ -114,4 +104,27 @@ public function resolve(
         }
         return ['customer' => $data];
     }
+
+    private function createUserAccount($args)
+    {
+        $customerDataObject = $this->customerFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $customerDataObject,
+            $args['input'],
+            \Magento\Customer\Api\Data\CustomerInterface::class
+        );
+        $store = $this->storeManager->getStore();
+        $customerDataObject->setWebsiteId($store->getWebsiteId());
+        $customerDataObject->setStoreId($store->getId());
+
+        $password = array_key_exists('password', $args['input']) ? $args['input']['password'] : null;
+
+        return $this->accountManagement->createAccount($customerDataObject, $password);
+    }
+
+    private function setUpUserContext($context, $customer)
+    {
+        $context->setUserId((int)$customer->getId());
+        $context->setUserType(UserContextInterface::USER_TYPE_CUSTOMER);
+    }
 }

From 5ef59e9373174a1c4dc062b823371f40f4143aff Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Mon, 19 Nov 2018 11:53:04 +0300
Subject: [PATCH 111/932] MAGETWO-57337: Store View (language) switch leads to
 404

- Add redirect to the home page in case with switch CMS page from other store
---
 .../UrlRewrite/Model/StoreSwitcher/RewriteUrl.php      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
index 2ce00d53588b3..34e82f561ee80 100644
--- a/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
+++ b/app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php
@@ -40,6 +40,8 @@ public function __construct(
     }
 
     /**
+     * Switch to another store.
+     *
      * @param StoreInterface $fromStore
      * @param StoreInterface $targetStore
      * @param string $redirectUrl
@@ -75,6 +77,14 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
                 /** @var \Magento\Framework\App\Response\Http $response */
                 $targetUrl = $targetStore->getBaseUrl();
             }
+        } else {
+            $existingRewrite = $this->urlFinder->findOneByData([
+                UrlRewrite::REQUEST_PATH => $urlPath
+            ]);
+            if ($existingRewrite) {
+                /** @var \Magento\Framework\App\Response\Http $response */
+                $targetUrl = $targetStore->getBaseUrl();
+            }
         }
 
         return $targetUrl;

From da9c81b7c0223ffdeaa83bc70c2016b7611b1962 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Mon, 19 Nov 2018 15:37:56 +0300
Subject: [PATCH 112/932] MAGETWO-58212: [GITHUB] Magento 2.1 CE, Cannot change
 attribute set for bundled product #5999

- Bug fix.
---
 .../DataProvider/Product/Form/Modifier/AdvancedPricing.php | 7 +++++--
 .../Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php  | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
index 336aeffa10584..2a4d2ff52d479 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
@@ -139,7 +139,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyMeta(array $meta)
@@ -158,7 +159,8 @@ public function modifyMeta(array $meta)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 101.0.0
      */
     public function modifyData(array $data)
@@ -381,6 +383,7 @@ private function addAdvancedPriceLink()
             );
 
             $advancedPricingButton['arguments']['data']['config'] = [
+                'dataScope' => 'advanced_pricing_button',
                 'displayAsLink' => true,
                 'formElement' => Container::NAME,
                 'componentType' => Container::NAME,
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index 88cd3f180075d..d84f496e81915 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -342,8 +342,6 @@ private function getAttributesMeta(array $attributes, $groupCode)
             }
 
             $attributeContainer = $this->addContainerChildren($attributeContainer, $attribute, $groupCode, $sortOrder);
-            $attributeContainer['arguments']['data']['config']['dataScope'] =
-                static::CONTAINER_PREFIX . $attribute->getAttributeCode();
 
             $meta[static::CONTAINER_PREFIX . $attribute->getAttributeCode()] = $attributeContainer;
         }

From ab52d4b0b7553593c46bce69a7e5cf6e4eb25828 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Mon, 19 Nov 2018 13:22:55 -0600
Subject: [PATCH 113/932] MC-5570: Different Order Status of two created credit
 memo orders

- fix tests
---
 .../ResourceModel/Order/Handler/StateTest.php  |  8 ++++++--
 .../Magento/GraphQl/Sales/OrdersTest.php       | 18 +++++++++++++++---
 .../Service/V1/CreditMemoCreateRefundTest.php  |  2 +-
 ...AssertOrderCancelMassActionFailMessage.php} | 17 ++++-------------
 .../Constraint/AssertOrderStatusIsCorrect.php  |  4 ++--
 .../Test/TestCase/MassOrdersUpdateTest.xml     | 14 ++++++--------
 .../testsuite/Magento/Paypal/Model/IpnTest.php |  4 ++--
 .../_files/order_with_shipping_and_invoice.php |  1 +
 .../Sales/_files/orders_with_customer.php      | 12 ++++++++++++
 9 files changed, 49 insertions(+), 31 deletions(-)
 rename dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/{AssertOrderCancelMassActionPartialFailMessage.php => AssertOrderCancelMassActionFailMessage.php} (61%)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index 625589342974a..d98eaec9019d1 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
@@ -24,7 +24,9 @@ class StateTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->orderMock = $this->createPartialMock(\Magento\Sales\Model\Order::class, [
+        $this->orderMock = $this->createPartialMock(
+            \Magento\Sales\Model\Order::class,
+            [
                 '__wakeup',
                 'getId',
                 'hasCustomerNoteNotify',
@@ -41,7 +43,8 @@ protected function setUp()
                 'hasForcedCanCreditmemo',
                 'getIsInProcess',
                 'getConfig',
-            ]);
+            ]
+        );
         $this->orderMock->expects($this->any())
             ->method('getConfig')
             ->willReturnSelf();
@@ -64,6 +67,7 @@ protected function setUp()
      * @param string $expectedState
      * @param int $callSetStateNum
      * @dataProvider stateCheckDataProvider
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function testCheck(
         bool $canCreditmemo,
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
index 589b0bc7746f8..9c969befa328b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/OrdersTest.php
@@ -83,9 +83,21 @@ public function testOrdersQuery()
         $actualData = $response['customerOrders']['items'];
 
         foreach ($expectedData as $key => $data) {
-            $this->assertEquals($data['increment_id'], $actualData[$key]['increment_id']);
-            $this->assertEquals($data['grand_total'], $actualData[$key]['grand_total']);
-            $this->assertEquals($data['status'], $actualData[$key]['status']);
+            $this->assertEquals(
+                $data['increment_id'],
+                $actualData[$key]['increment_id'],
+                "increment_id is different than the expected for order - " . $data['increment_id']
+            );
+            $this->assertEquals(
+                $data['grand_total'],
+                $actualData[$key]['grand_total'],
+                "grand_total is different than the expected for order - " . $data['increment_id']
+            );
+            $this->assertEquals(
+                $data['status'],
+                $actualData[$key]['status'],
+                "status is different than the expected for order - " . $data['increment_id']
+            );
         }
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php
index eae0e600434a6..6bc4197f8877b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php
@@ -116,7 +116,7 @@ public function testInvoke()
         $this->assertNotEmpty($result);
         $order = $this->objectManager->get(OrderRepositoryInterface::class)->get($order->getId());
         //Totally refunded orders still can be processed and shipped.
-        $this->assertEquals(Order::STATE_PROCESSING, $order->getState());
+        $this->assertEquals(Order::STATE_CLOSED, $order->getState());
     }
 
     private function getItemsForRest($order)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionPartialFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
similarity index 61%
rename from dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionPartialFailMessage.php
rename to dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
index ecc9af83580f3..2c87d8539f0db 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionPartialFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
@@ -11,20 +11,15 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertOrderCancelAndSuccessMassActionFailMessage
+ * Class AssertOrderCancelMassActionFailMessage
  * Assert cancel fail message is displayed on order index page
  */
-class AssertOrderCancelMassActionPartialFailMessage extends AbstractConstraint
+class AssertOrderCancelMassActionFailMessage extends AbstractConstraint
 {
-    /**
-     * Message displayed after cancel order from archive
-     */
-    const SUCCESS_MESSAGE = 'We canceled 1 order(s).';
-
     /**
      * Text value to be checked
      */
-    const FAIL_CANCEL_MESSAGE = '1 order(s) cannot be canceled.';
+    const FAIL_CANCEL_MESSAGE = 'You cannot cancel the order(s).';
 
     /**
      * Assert cancel fail message is displayed on order index page
@@ -38,10 +33,6 @@ public function processAssert(OrderIndex $orderIndex)
             self::FAIL_CANCEL_MESSAGE,
             $orderIndex->getMessagesBlock()->getErrorMessage()
         );
-        \PHPUnit\Framework\Assert::assertEquals(
-            self::SUCCESS_MESSAGE,
-            $orderIndex->getMessagesBlock()->getSuccessMessage()
-        );
     }
 
     /**
@@ -51,6 +42,6 @@ public function processAssert(OrderIndex $orderIndex)
      */
     public function toString()
     {
-        return 'Cancel and success fail message is displayed on order index page.';
+        return 'Cancel fail message is displayed on order index page.';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
index c3e8558df7fcc..fc854bd8c50ad 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
@@ -39,8 +39,8 @@ public function processAssert(
         /** @var \Magento\Sales\Test\Block\Adminhtml\Order\View\Tab\Info $infoTab */
         $infoTab = $salesOrderView->getOrderForm()->openTab('info')->getTab('info');
         \PHPUnit\Framework\Assert::assertEquals(
-            $infoTab->getOrderStatus(),
-            $orderStatus
+            $orderStatus,
+            $infoTab->getOrderStatus()
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
index 31d5c30d25fc7..1f75b07c8ca1e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml
@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\MassOrdersUpdateTest" summary="Mass Update Orders" ticketId="MAGETWO-27897">
         <variation name="MassOrdersUpdateTestVariation1">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="description" xsi:type="string">cancel orders in status Pending and Processing</data>
             <data name="steps" xsi:type="string">-</data>
             <data name="action" xsi:type="string">Cancel</data>
@@ -18,21 +17,21 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation2">
-            <data name="description" xsi:type="string">try to cancel orders in status Complete, Canceled</data>
+            <data name="description" xsi:type="string">try to cancel orders in status Complete, Closed</data>
             <data name="steps" xsi:type="string">invoice, shipment|invoice, credit memo</data>
             <data name="action" xsi:type="string">Cancel</data>
             <data name="ordersCount" xsi:type="string">2</data>
-            <data name="resultStatuses" xsi:type="string">Complete,Canceled</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionPartialFailMessage" />
+            <data name="resultStatuses" xsi:type="string">Complete,Closed</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionFailMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation3">
-            <data name="description" xsi:type="string">try to cancel orders in status Pending, Closed</data>
+            <data name="description" xsi:type="string">try to cancel orders in status Processing, Closed</data>
             <data name="steps" xsi:type="string">invoice|invoice, credit memo</data>
             <data name="action" xsi:type="string">Cancel</data>
             <data name="ordersCount" xsi:type="string">2</data>
-            <data name="resultStatuses" xsi:type="string">Processing,Canceled</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionPartialFailMessage" />
+            <data name="resultStatuses" xsi:type="string">Processing,Closed</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionFailMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation4">
@@ -45,7 +44,6 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation5">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="description" xsi:type="string">Try to put order in status Complete on Hold</data>
             <data name="steps" xsi:type="string">invoice, shipment</data>
             <data name="action" xsi:type="string">Hold</data>
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
index f2cd745e96d83..a15151e8d1016 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/IpnTest.php
@@ -65,7 +65,7 @@ public function testProcessIpnRequestFullRefund()
         $creditmemo = current($creditmemoItems);
 
         //Totally refunded orders still can be shipped
-        $this->assertEquals(Order::STATE_PROCESSING, $order->getState()) ;
+        $this->assertEquals(Order::STATE_CLOSED, $order->getState()) ;
         $this->assertEquals(1, count($creditmemoItems));
         $this->assertEquals(Creditmemo::STATE_REFUNDED, $creditmemo->getState());
         $this->assertEquals(10, $order->getSubtotalRefunded());
@@ -148,7 +148,7 @@ public function testProcessIpnRequestRestRefund()
         $creditmemoItems = $order->getCreditmemosCollection()->getItems();
 
         //Totally refunded orders still can be shipped
-        $this->assertEquals(Order::STATE_PROCESSING, $order->getState()) ;
+        $this->assertEquals(Order::STATE_CLOSED, $order->getState()) ;
         $this->assertEquals(1, count($creditmemoItems));
         $this->assertEquals(10, $order->getSubtotalRefunded());
         $this->assertEquals(10, $order->getBaseSubtotalRefunded());
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
index 4c892904b3c3e..61d8be98bdd22 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php
@@ -44,5 +44,6 @@
     $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
 }
 $shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
+$shipment->register();
 
 $transaction->addObject($invoice)->addObject($shipment)->addObject($order)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php
index 753adb1f38596..1a0a94b0ca951 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/orders_with_customer.php
@@ -33,6 +33,7 @@
         'grand_total' => 130.00,
         'base_grand_total' => 130.00,
         'subtotal' => 130.00,
+        'total_paid' => 130.00,
         'store_id' => 0,
         'website_id' => 0,
         'payment' => $payment
@@ -55,6 +56,7 @@
         'grand_total' => 150.00,
         'base_grand_total' => 150.00,
         'subtotal' => 150.00,
+        'total_paid' => 150.00,
         'store_id' => 1,
         'website_id' => 1,
         'payment' => $payment
@@ -66,6 +68,7 @@
         'grand_total' => 160.00,
         'base_grand_total' => 160.00,
         'subtotal' => 160.00,
+        'total_paid' => 160.00,
         'store_id' => 1,
         'website_id' => 1,
         'payment' => $payment
@@ -89,6 +92,15 @@
     $shippingAddress = clone $billingAddress;
     $shippingAddress->setId(null)->setAddressType('shipping');
 
+    /** @var Order\Item $orderItem */
+    $orderItem = $objectManager->create(Order\Item::class);
+    $orderItem->setProductId($product->getId())
+        ->setQtyOrdered(2)
+        ->setBasePrice($product->getPrice())
+        ->setPrice($product->getPrice())
+        ->setRowTotal($product->getPrice())
+        ->setProductType('simple');
+
     $order
         ->setData($orderData)
         ->addItem($orderItem)

From 6d90348bb2dbe372f7f7f29f8a5a1cfe3361ef75 Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Tue, 20 Nov 2018 01:10:30 +0530
Subject: [PATCH 114/932] new field added in fieldset.xml

---
 app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php | 9 ++++++++-
 app/code/Magento/Quote/etc/fieldset.xml                 | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
index d1e559845c479..38bc6aeb6b242 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
@@ -64,7 +64,14 @@ public function convert($item, $data = [])
             $item
         );
         if ($item instanceof \Magento\Quote\Model\Quote\Address\Item) {
-            $orderItemData['quote_item_id'] = $item->getQuoteItemId();
+            $data = array_merge(
+                $data,
+                $this->objectCopyService->getDataFromFieldset(
+                    'quote_convert_item',
+                    'to_order_item_id',
+                    $item
+                )
+            );
         }
         if (!$item->getNoDiscount()) {
             $data = array_merge(
diff --git a/app/code/Magento/Quote/etc/fieldset.xml b/app/code/Magento/Quote/etc/fieldset.xml
index 55ec76a647fcd..4b7c344d6219b 100644
--- a/app/code/Magento/Quote/etc/fieldset.xml
+++ b/app/code/Magento/Quote/etc/fieldset.xml
@@ -205,6 +205,9 @@
             <field name="qty">
                 <aspect name="to_order_item" targetField="qty_ordered" />
             </field>
+            <field name="quote_item_id">
+                <aspect name="to_order_item_id" targetField="quote_item_id" />
+            </field>
             <field name="id">
                 <aspect name="to_order_item" targetField="quote_item_id" />
             </field>

From 9298e795a53234f8fdb6f467a6cd53d63d2b3e0d Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Mon, 19 Nov 2018 18:03:01 -0600
Subject: [PATCH 115/932] MC-5570: Different Order Status of two created credit
 memo orders

---
 .../ResourceModel/Order/Handler/State.php     | 11 ++---
 .../ResourceModel/Order/Handler/StateTest.php | 44 +++++++++----------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
index 106745df266fd..2f5a176b9617a 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
@@ -24,6 +24,12 @@ class State
     public function check(Order $order)
     {
         $currentState = $order->getState();
+        if ($currentState == Order::STATE_NEW && $order->getIsInProcess()) {
+            $order->setState(Order::STATE_PROCESSING)
+                ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING));
+            $currentState = Order::STATE_PROCESSING;
+        }
+
         if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice()) {
             if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE]) && !$order->canCreditmemo()) {
                 $order->setState(Order::STATE_CLOSED)
@@ -33,11 +39,6 @@ public function check(Order $order)
                     ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_COMPLETE));
             }
         }
-
-        if ($currentState == Order::STATE_NEW && $order->getIsInProcess()) {
-            $order->setState(Order::STATE_PROCESSING)
-                ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING));
-        }
         return $this;
     }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index d98eaec9019d1..f9fee9b34ce8d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
@@ -37,8 +37,8 @@ protected function setUp()
                 'canShip',
                 'getBaseGrandTotal',
                 'canCreditmemo',
-                'getState',
-                'setState',
+//                'getState',
+//                'setState',
                 'getTotalRefunded',
                 'hasForcedCanCreditmemo',
                 'getIsInProcess',
@@ -76,13 +76,13 @@ public function testCheck(
         int $callCanSkipNum,
         string $currentState,
         string $expectedState = '',
-        int $callSetStateNum = 0,
         bool $isInProcess = false,
         int $callGetIsInProcessNum = 0,
         bool $isCanceled = false,
         bool $canUnhold = false,
         bool $canInvoice = false
     ) {
+        $this->orderMock->setState($currentState);
         $this->orderMock->expects($this->any())
             ->method('isCanceled')
             ->willReturn($isCanceled);
@@ -98,50 +98,46 @@ public function testCheck(
         $this->orderMock->expects($this->exactly($callCanCreditmemoNum))
             ->method('canCreditmemo')
             ->willReturn($canCreditmemo);
-        $this->orderMock->expects($this->once())
-            ->method('getState')
-            ->willReturn($currentState);
         $this->orderMock->expects($this->exactly($callGetIsInProcessNum))
             ->method('getIsInProcess')
             ->willReturn($isInProcess);
-        $this->orderMock->expects($this->exactly($callSetStateNum))
-            ->method('setState')
-            ->with($expectedState)
-            ->will($this->returnSelf());
         $this->state->check($this->orderMock);
+        $this->assertEquals($expectedState, $this->orderMock->getState());
     }
 
     public function stateCheckDataProvider()
     {
         return [
             'processing - !canCreditmemo!canShip -> closed' =>
-                [false, 1, false, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED, 1],
+                [false, 1, false, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED],
             'complete - !canCreditmemo,!canShip -> closed' =>
-                [false, 1, false, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED, 1],
+                [false, 1, false, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED],
             'processing - !canCreditmemo,canShip -> closed' =>
-                [false, 1, true, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED, 1],
+                [false, 1, true, 0, Order::STATE_PROCESSING, Order::STATE_CLOSED],
             'complete - !canCreditmemo,canShip -> closed' =>
-                [false, 1, true, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED, 1],
+                [false, 1, true, 0, Order::STATE_COMPLETE, Order::STATE_CLOSED],
             'processing - canCreditmemo,!canShip -> complete' =>
-                [true, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_COMPLETE, 1],
+                [true, 1, false, 1, Order::STATE_PROCESSING, Order::STATE_COMPLETE],
             'complete - canCreditmemo,!canShip -> complete' =>
-                [true, 1, false, 0, Order::STATE_COMPLETE],
+                [true, 1, false, 0, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
             'processing - canCreditmemo, canShip -> processing' =>
-                [true, 1, true, 1, Order::STATE_PROCESSING],
+                [true, 1, true, 1, Order::STATE_PROCESSING, Order::STATE_PROCESSING],
             'complete - canCreditmemo, canShip -> complete' =>
-                [true, 1, true, 0, Order::STATE_COMPLETE],
+                [true, 1, true, 0, Order::STATE_COMPLETE, Order::STATE_COMPLETE],
             'new - canCreditmemo, canShip, IsInProcess -> processing' =>
-                [true, 0, true, 0, Order::STATE_NEW, Order::STATE_PROCESSING, 1, true, 1],
+                [true, 1, true, 1, Order::STATE_NEW, Order::STATE_PROCESSING, true, 1],
+            'new - canCreditmemo, !canShip, IsInProcess -> processing' =>
+                [true, 1, false, 1, Order::STATE_NEW, Order::STATE_COMPLETE, true, 1],
             'new - canCreditmemo, canShip, !IsInProcess -> new' =>
-                [true, 0, true, 0, Order::STATE_NEW, '', 0, false, 1],
+                [true, 0, true, 0, Order::STATE_NEW, Order::STATE_NEW, false, 1],
             'hold - canUnhold -> hold' =>
-                [true, 0, true, 0, Order::STATE_HOLDED, '', 0, false, 0, false, true, false],
+                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, false, true, false],
             'payment_review - canUnhold -> payment_review' =>
-                [true, 0, true, 0, Order::STATE_PAYMENT_REVIEW, '', 0, false, 0, false, false, false],
+                [true, 0, true, 0, Order::STATE_PAYMENT_REVIEW, Order::STATE_PAYMENT_REVIEW, false, 0, false, false, false],
             'pending_payment - canUnhold -> pending_payment' =>
-                [true, 0, true, 0, Order::STATE_PENDING_PAYMENT, '', 0, false, 0, false, false, false],
+                [true, 0, true, 0, Order::STATE_PENDING_PAYMENT, Order::STATE_PENDING_PAYMENT, false, 0, false, false, false],
             'cancelled - isCanceled -> cancelled' =>
-                [true, 0, true, 0, Order::STATE_HOLDED, '', 0, false, 0, true, false, false],
+                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, true, false, false],
         ];
     }
 }

From b7f40b73bdd92f2bdcb2a88be25dc66a84e8d811 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Mon, 19 Nov 2018 19:15:39 -0600
Subject: [PATCH 116/932] MC-5570: Different Order Status of two created credit
 memo orders

---
 .../Model/ResourceModel/Order/Handler/StateTest.php    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index f9fee9b34ce8d..d21e575245395 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
@@ -37,8 +37,6 @@ protected function setUp()
                 'canShip',
                 'getBaseGrandTotal',
                 'canCreditmemo',
-//                'getState',
-//                'setState',
                 'getTotalRefunded',
                 'hasForcedCanCreditmemo',
                 'getIsInProcess',
@@ -131,13 +129,13 @@ public function stateCheckDataProvider()
             'new - canCreditmemo, canShip, !IsInProcess -> new' =>
                 [true, 0, true, 0, Order::STATE_NEW, Order::STATE_NEW, false, 1],
             'hold - canUnhold -> hold' =>
-                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, false, true, false],
+                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, false, true],
             'payment_review - canUnhold -> payment_review' =>
-                [true, 0, true, 0, Order::STATE_PAYMENT_REVIEW, Order::STATE_PAYMENT_REVIEW, false, 0, false, false, false],
+                [true, 0, true, 0, Order::STATE_PAYMENT_REVIEW, Order::STATE_PAYMENT_REVIEW, false, 0, false, true],
             'pending_payment - canUnhold -> pending_payment' =>
-                [true, 0, true, 0, Order::STATE_PENDING_PAYMENT, Order::STATE_PENDING_PAYMENT, false, 0, false, false, false],
+                [true, 0, true, 0, Order::STATE_PENDING_PAYMENT, Order::STATE_PENDING_PAYMENT, false, 0, false, true],
             'cancelled - isCanceled -> cancelled' =>
-                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, true, false, false],
+                [true, 0, true, 0, Order::STATE_HOLDED, Order::STATE_HOLDED, false, 0, true],
         ];
     }
 }

From bb4f44fa53176c8ebce6ef2719dcd710d66c35ca Mon Sep 17 00:00:00 2001
From: Lusine <lusine_papyan@epam.com>
Date: Tue, 20 Nov 2018 14:01:33 +0400
Subject: [PATCH 117/932] MAGETWO-96124: [2.3.x] Custom Customer Attributes get
 cleared in case of invalid Customer Account creation on Storefront

- Add automated test script
---
 .../Mftf/Page/StorefrontCustomerCreatePage.xml     |  3 ++-
 .../StorefrontCustomerCreateFormSection.xml        | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
index e2ebf638934c6..101ff1451ccbf 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
@@ -9,6 +9,7 @@
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="StorefrontCustomerCreatePage" url="/customer/account/create/" area="storefront" module="Magento_Customer">
-        <section name="StorefrontCustomerCreateFormSection" />
+        <section name="StorefrontCustomerCreateFormSection"/>
+        <section name="StoreFrontCustomerCustomAttributesSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
index 2b5662cdd623e..a8c7cefb773d1 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -11,9 +11,23 @@
     <section name="StorefrontCustomerCreateFormSection">
         <element name="firstnameField" type="input" selector="#firstname"/>
         <element name="lastnameField" type="input" selector="#lastname"/>
+        <element name="lastnameLabel" type="text" selector="//label[@for='lastname']"/>
         <element name="emailField" type="input" selector="#email_address"/>
         <element name="passwordField" type="input" selector="#password"/>
         <element name="confirmPasswordField" type="input" selector="#password-confirmation"/>
         <element name="createAccountButton" type="button" selector="button.action.submit.primary" timeout="30"/>
     </section>
+    <section name="StoreFrontCustomerCustomAttributesSection">
+        <element name="textFieldAttribute" type="input" selector="//input[@id='{{var}}']" parameterized="true" />
+        <element name="textAreaAttribute" type="input" selector="//textarea[@id='{{var}}']" parameterized="true" />
+        <element name="multiLineFirstAttribute" type="input" selector="//input[@id='{{var}}_0']" parameterized="true" />
+        <element name="multiLineSecondAttribute" type="input" selector="//input[@id='{{var}}_1']" parameterized="true" />
+        <element name="datedAttribute" type="input" selector="//input[@id='{{var}}']" parameterized="true" />
+        <element name="dropDownAttribute" type="select" selector="//select[@id='{{var}}']" parameterized="true" />
+        <element name="dropDownOptionAttribute" type="text" selector="//*[@id='{{var}}']/option[2]" parameterized="true" />
+        <element name="multiSelectFirstOptionAttribute" type="text" selector="//select[@id='{{var}}']/option[3]" parameterized="true" />
+        <element name="yesNoAttribute" type="select" selector="//select[@id='{{var}}']" parameterized="true" />
+        <element name="yesNoOptionAttribute" type="select" selector="//select[@id='{{var}}']/option[2]" parameterized="true" />
+        <element name="selectedOption" type="text" selector="//select[@id='{{var}}']/option[@selected='selected']" parameterized="true"/>
+    </section>
 </sections>

From fd4d70fa6b938128ecf48e619387869c85ccb985 Mon Sep 17 00:00:00 2001
From: vprohorov <vitaliy_prokharau@epam.com>
Date: Tue, 20 Nov 2018 16:06:06 +0300
Subject: [PATCH 118/932] MAGETWO-94444: [2.3] Order total value is limited by
 8 round digits

- Changing precision in database schema
---
 app/code/Magento/NewRelicReporting/etc/db_schema.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/NewRelicReporting/etc/db_schema.xml b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
index f6d463de0ce33..6b5f977762c53 100644
--- a/app/code/Magento/NewRelicReporting/etc/db_schema.xml
+++ b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
@@ -38,8 +38,8 @@
                 comment="Entity ID"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Customer ID"/>
-        <column xsi:type="decimal" name="total" scale="0" precision="10" unsigned="true" nullable="true"/>
-        <column xsi:type="decimal" name="total_base" scale="0" precision="10" unsigned="true" nullable="true"/>
+        <column xsi:type="decimal" name="total" scale="4" precision="20" unsigned="true" nullable="true"/>
+        <column xsi:type="decimal" name="total_base" scale="4" precision="20" unsigned="true" nullable="true"/>
         <column xsi:type="int" name="item_count" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Line Item Count"/>
         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"

From cd8b01bf5ccffc5b46fdd33d93bc8f05d6597dd9 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Tue, 20 Nov 2018 14:59:05 +0100
Subject: [PATCH 119/932] Fix lever responses and add new test for get category
 by id

---
 .../ExtractDataFromCategoryTree.php           | 14 +++++--
 .../Magento/GraphQl/Catalog/CategoryTest.php  | 38 +++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
index 5d282fda549a5..43e7cb7c9e624 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
@@ -15,8 +15,6 @@
  */
 class ExtractDataFromCategoryTree
 {
-    const START_CATEGORY_FETCH_LEVEL = 1;
-
     /**
      * @var Hydrator
      */
@@ -27,6 +25,11 @@ class ExtractDataFromCategoryTree
      */
     private $iteratingCategory;
 
+    /**
+     * @var int
+     */
+    private $startCategoryFetchLevel = 1;
+
     /**
      * @param Hydrator $categoryHydrator
      */
@@ -51,9 +54,12 @@ public function execute(\Iterator $iterator): array
             $iterator->next();
 
             $pathElements = explode("/", $category->getPath());
-            $this->iteratingCategory = $category;
+            if (empty($tree)){
+                $this->startCategoryFetchLevel = count($pathElements) - 1;
+            }
 
-            $currentLevelTree = $this->explodePathToArray($pathElements, self::START_CATEGORY_FETCH_LEVEL);
+            $this->iteratingCategory = $category;
+            $currentLevelTree = $this->explodePathToArray($pathElements, $this->startCategoryFetchLevel);
             if (empty($tree)) {
                 $tree = $currentLevelTree;
             }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
index 57c350bf8e500..6825f90c05833 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -112,6 +112,44 @@ public function testCategoriesTree()
         );
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testGetCategoryById()
+    {
+        $rootCategoryId = 13;
+        $query = <<<QUERY
+{
+  category(id: {$rootCategoryId}) {
+      id
+      name
+  }
+}
+QUERY;
+
+        // get customer ID token
+        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = $this->objectManager->create(
+            \Magento\Integration\Api\CustomerTokenServiceInterface::class
+        );
+        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $responseDataObject = new DataObject($response);
+        //Some sort of smoke testing
+        self::assertEquals(
+            'Category 1.2',
+            $responseDataObject->getData('category/name')
+        );
+        self::assertEquals(
+            13,
+            $responseDataObject->getData('category/id')
+        );
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)

From 0bded20ee989ecf66466ea9eca70e4de1014c76a Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Tue, 20 Nov 2018 21:33:09 +0530
Subject: [PATCH 120/932] added new fieldset

---
 .../Quote/Model/Quote/Item/ToOrderItem.php     | 18 +++++++++---------
 app/code/Magento/Quote/etc/fieldset.xml        |  8 +++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
index 38bc6aeb6b242..ec786153e7ab4 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
@@ -64,15 +64,15 @@ public function convert($item, $data = [])
             $item
         );
         if ($item instanceof \Magento\Quote\Model\Quote\Address\Item) {
-            $data = array_merge(
-                $data,
-                $this->objectCopyService->getDataFromFieldset(
-                    'quote_convert_item',
-                    'to_order_item_id',
-                    $item
-                )
-            );
-        }
+            $orderItemData= array_merge(
+                $orderItemData,
+               $this->objectCopyService->getDataFromFieldset(
+                   'quote_convert_address_item',
+                   'to_order_item',
+                   $item
+               )
+           );
+       }
         if (!$item->getNoDiscount()) {
             $data = array_merge(
                 $data,
diff --git a/app/code/Magento/Quote/etc/fieldset.xml b/app/code/Magento/Quote/etc/fieldset.xml
index 4b7c344d6219b..85ee20c7f8520 100644
--- a/app/code/Magento/Quote/etc/fieldset.xml
+++ b/app/code/Magento/Quote/etc/fieldset.xml
@@ -186,6 +186,11 @@
                 <aspect name="to_order_address" />
             </field>
         </fieldset>
+        <fieldset id="quote_convert_address_item">
+            <field name="quote_item_id">
+                <aspect name="to_order_item" />
+            </field>
+        </fieldset>
         <fieldset id="quote_convert_item">
             <field name="sku">
                 <aspect name="to_order_item" />
@@ -205,9 +210,6 @@
             <field name="qty">
                 <aspect name="to_order_item" targetField="qty_ordered" />
             </field>
-            <field name="quote_item_id">
-                <aspect name="to_order_item_id" targetField="quote_item_id" />
-            </field>
             <field name="id">
                 <aspect name="to_order_item" targetField="quote_item_id" />
             </field>

From 958a0ac69475fd8b43d878c1ad3850434a7a3538 Mon Sep 17 00:00:00 2001
From: Aquarvin <fevius@gmail.com>
Date: Tue, 20 Nov 2018 19:34:09 +0200
Subject: [PATCH 121/932] GraphQl-93: Implement support for variables in query
 -- Variables may be Input type -- Query now accepts variables -- added type
 property for Output/Input Type element -- functional test was added

---
 .../Magento/GraphQl/Controller/GraphQl.php    |  4 +-
 .../TestFramework/TestCase/GraphQl/Client.php |  4 +-
 .../GraphQl/VariablesSupportQueryTest.php     | 90 +++++++++++++++++++
 .../Magento/Framework/GraphQl/Config.php      | 14 ++-
 .../Framework/GraphQl/Config/Element/Type.php | 18 ++++
 .../GraphQl/Config/Element/TypeFactory.php    |  1 +
 .../Framework/GraphQl/Query/Fields.php        | 27 +++++-
 .../GraphQl/Schema/SchemaGenerator.php        | 42 ++++++---
 .../GraphQl/Schema/Type/Input/InputMapper.php | 30 +++++++
 9 files changed, 211 insertions(+), 19 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php

diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index c4a0b55de9bfc..c04bb7f5775a0 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -111,10 +111,10 @@ public function dispatch(RequestInterface $request) : ResponseInterface
             $data = $this->jsonSerializer->unserialize($request->getContent());
 
             $query = isset($data['query']) ? $data['query'] : '';
-
+            $variables = isset($data['variables']) ? $data['variables'] : null;
             // We have to extract queried field names to avoid instantiation of non necessary fields in webonyx schema
             // Temporal coupling is required for performance optimization
-            $this->queryFields->setQuery($query);
+            $this->queryFields->setQuery($query, $variables);
             $schema = $this->schemaGenerator->generate();
 
             $result = $this->queryProcessor->process(
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
index 64ad44528572d..bd91d58b6b00e 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
@@ -59,8 +59,8 @@ public function postQuery(string $query, array $variables = [], string $operatio
         $headers = array_merge($headers, ['Accept: application/json', 'Content-Type: application/json']);
         $requestArray = [
             'query' => $query,
-            'variables' => empty($variables) ? $variables : null,
-            'operationName' => empty($operationName) ? $operationName : null
+            'variables' => !empty($variables) ? $variables : null,
+            'operationName' => !empty($operationName) ? $operationName : null
         ];
         $postData = $this->json->jsonEncode($requestArray);
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
new file mode 100644
index 0000000000000..138547ecdbc38
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\ObjectManager;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+class VariablesSupportQueryTest extends GraphQlAbstract
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Tests that Introspection is disabled when not in developer mode
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testQueryObjectVariablesSupport()
+    {
+        $productSku = 'simple';
+
+        $query
+            = <<<'QUERY'
+query GetProductsQuery($page: Int, $filterInput: ProductFilterInput){
+  products(
+    pageSize: 10
+    currentPage: $page
+    filter: $filterInput
+    sort: {}
+  ) {
+    items {
+    	name
+    }
+  }
+}
+QUERY;
+        $variables = [
+            'page' => 1,
+            'filterInput' => [
+                'sku' => [
+                    'like' => '%simple%'
+                ]
+            ]
+        ];
+
+        $response = $this->graphQlQuery($query, $variables);
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get($productSku, false, null, true);
+
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('items', $response['products']);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertArrayHasKey(0, $response['products']['items']);
+        $this->assertFields($product, $response['products']['items'][0]);
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $actualResponse
+     */
+    private function assertFields($product, $actualResponse)
+    {
+        $assertionMap = [
+            ['response_field' => 'name', 'expected_value' => $product->getName()],
+        ];
+
+        $this->assertResponseFields($actualResponse, $assertionMap);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config.php b/lib/internal/Magento/Framework/GraphQl/Config.php
index ff4c920d2cd6a..a9f5eb3aaff6f 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config.php
@@ -77,18 +77,24 @@ public function getConfigElement(string $configElementName) : ConfigElementInter
     }
 
     /**
-     * Return all type names declared in a GraphQL schema's configuration.
+     * Return all type names declared in a GraphQL schema's configuration and their type.
      *
-     * @return string[]
+     * @return array $types
+     *  name string
+     *  type string
      */
     public function getDeclaredTypeNames() : array
     {
         $types = [];
         foreach ($this->configData->get(null) as $item) {
-            if (isset($item['type']) && $item['type'] == 'graphql_type') {
-                $types[] = $item['name'];
+            if (isset($item['type'])) {
+                $types[] = [
+                    'name' => $item['name'],
+                    'type' => $item['type'],
+                ];
             }
         }
+
         return $types;
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
index 24ff439db0347..bda2c5ad5bd52 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
@@ -27,6 +27,11 @@ class Type implements TypeInterface
      */
     private $interfaces;
 
+    /**
+     * @var string
+     */
+    private $type;
+
     /**
      * @var string
      */
@@ -36,17 +41,20 @@ class Type implements TypeInterface
      * @param string $name
      * @param Field[] $fields
      * @param string[] $interfaces
+     * @param string $type
      * @param string $description
      */
     public function __construct(
         string $name,
         array $fields,
         array $interfaces,
+        string $type,
         string $description
     ) {
         $this->name = $name;
         $this->fields = $fields;
         $this->interfaces = $interfaces;
+        $this->type = $type;
         $this->description = $description;
     }
 
@@ -89,4 +97,14 @@ public function getDescription() : string
     {
         return $this->description;
     }
+
+    /**
+     * Get a type.
+     *
+     * @return string
+     */
+    public function getType() : string
+    {
+        return $this->type;
+    }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
index c5f3187b04841..a6a6de8475009 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
@@ -92,6 +92,7 @@ public function create(
                 'name' => $typeData['name'],
                 'fields' => $fields,
                 'interfaces' => isset($typeData['implements']) ? $typeData['implements'] : [],
+                'type' => isset($typeData['type']) ? $typeData['type'] : '',
                 'description' => isset($typeData['description']) ? $typeData['description'] : ''
             ]
         );
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
index d0bc9591265eb..9c812e5259032 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
@@ -24,9 +24,11 @@ class Fields
      * Set Query for extracting list of fields.
      *
      * @param string $query
+     * @param array|null $variables
+     *
      * @return void
      */
-    public function setQuery($query)
+    public function setQuery($query, $variables = null)
     {
         $queryFields = [];
         try {
@@ -48,6 +50,9 @@ public function setQuery($query)
             // It must be possible to query any fields during introspection query
             $queryFields = [];
         }
+        if (isset($variables)) {
+            $queryFields = array_merge($queryFields, $this->getVariables($variables));
+        }
         $this->fieldsUsedInQuery = $queryFields;
     }
 
@@ -62,4 +67,24 @@ public function getFieldsUsedInQuery()
     {
         return $this->fieldsUsedInQuery;
     }
+
+    /**
+     * Extract and return list of all used fields in GraphQL query's variables
+     *
+     * @param array $variables
+     *
+     * @return string[]
+     */
+    private function getVariables($variables)
+    {
+        $fields = [];
+        foreach ($variables as $key => $value){
+            if (is_array($value)){
+                $fields = array_merge($fields, $this->getVariables($value));
+            }
+            $fields[$key] = $key;
+        }
+
+        return $fields;
+    }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
index 63fef73186b12..c768d2fab5afa 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
@@ -8,9 +8,9 @@
 namespace Magento\Framework\GraphQl\Schema;
 
 use Magento\Framework\GraphQl\ConfigInterface;
-use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
-use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
 use Magento\Framework\GraphQl\Schema;
+use Magento\Framework\GraphQl\Schema\Type\Input\InputMapper;
+use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
 use Magento\Framework\GraphQl\SchemaFactory;
 
 /**
@@ -28,6 +28,11 @@ class SchemaGenerator implements SchemaGeneratorInterface
      */
     private $outputMapper;
 
+    /**
+     * @var InputMapper
+     */
+    private $inputMapper;
+
     /**
      * @var ConfigInterface
      */
@@ -36,15 +41,18 @@ class SchemaGenerator implements SchemaGeneratorInterface
     /**
      * @param SchemaFactory $schemaFactory
      * @param OutputMapper $outputMapper
+     * @param InputMapper $inputMapper
      * @param ConfigInterface $config
      */
     public function __construct(
         SchemaFactory $schemaFactory,
         OutputMapper $outputMapper,
+        InputMapper $inputMapper,
         ConfigInterface $config
     ) {
         $this->schemaFactory = $schemaFactory;
         $this->outputMapper = $outputMapper;
+        $this->inputMapper = $inputMapper;
         $this->config = $config;
     }
 
@@ -60,16 +68,30 @@ public function generate() : Schema
                 'typeLoader' => function ($name) {
                     return $this->outputMapper->getOutputType($name);
                 },
-                'types' => function () {
-                    //all types should be generated only on introspection
-                    $typesImplementors = [];
-                    foreach ($this->config->getDeclaredTypeNames() as $name) {
-                        $typesImplementors [] = $this->outputMapper->getOutputType($name);
-                    }
-                    return $typesImplementors;
-                }
+                'types' => $this->getTypes()
             ]
         );
         return $schema;
     }
+
+    /**
+     * @return array
+     * @throws \Magento\Framework\GraphQl\Exception\GraphQlInputException
+     */
+    private function getTypes()
+    {
+        $typesImplementors = [];
+        foreach ($this->config->getDeclaredTypeNames() as $type) {
+            switch ($type['type']) {
+                case 'graphql_type' :
+                    $typesImplementors [] = $this->outputMapper->getOutputType($type['name']);
+                    break;
+                case 'graphql_input' :
+                    $typesImplementors [] = $this->inputMapper->getInputType($type['name']);
+                    break;
+            }
+        }
+
+        return $typesImplementors;
+    }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
index d806c0b3e68ab..0785ea1278045 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
@@ -11,7 +11,10 @@
 use Magento\Framework\GraphQl\Config\Element\Argument;
 use Magento\Framework\GraphQl\ConfigInterface;
 use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
+use Magento\Framework\GraphQl\Schema\Type\InputTypeInterface;
 use Magento\Framework\GraphQl\Schema\TypeFactory;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Phrase;
 
 class InputMapper
 {
@@ -35,6 +38,11 @@ class InputMapper
      */
     private $scalarTypes;
 
+    /**
+     * @var InputTypeInterface[]
+     */
+    private $inputTypes;
+
     /**
      * @var WrappedTypeProcessor
      */
@@ -101,4 +109,26 @@ public function getRepresentation(Argument $argument) : array
 
         return $calculatedArgument;
     }
+
+    /**
+     * Get GraphQL input type object by type name.
+     *
+     * @param string $typeName
+     * @return InputTypeInterface
+     * @throws GraphQlInputException
+     */
+    public function getInputType($typeName)
+    {
+        if (!isset($this->inputTypes[$typeName])) {
+            $configElement = $this->config->getConfigElement($typeName);
+            $this->inputTypes[$typeName] = $this->inputFactory->create($configElement);
+            if (!($this->inputTypes[$typeName] instanceof InputTypeInterface)) {
+                throw new GraphQlInputException(
+                    new Phrase("Type '{$typeName}' was requested but is not declared in the GraphQL schema.")
+                );
+            }
+        }
+
+        return $this->inputTypes[$typeName];
+    }
 }

From 261ab097c0d23805fc4f008252b8e0cd710ec85f Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Tue, 20 Nov 2018 23:33:22 +0530
Subject: [PATCH 122/932] space added in declaration

---
 app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
index ec786153e7ab4..ca6b83aa50e75 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
@@ -64,7 +64,7 @@ public function convert($item, $data = [])
             $item
         );
         if ($item instanceof \Magento\Quote\Model\Quote\Address\Item) {
-            $orderItemData= array_merge(
+            $orderItemData = array_merge(
                 $orderItemData,
                $this->objectCopyService->getDataFromFieldset(
                    'quote_convert_address_item',

From 5da7b8e30d218a3f7eb566021909bcb629a0018e Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Tue, 20 Nov 2018 16:14:12 -0600
Subject: [PATCH 123/932] MC-5570: Different Order Status of two created credit
 memo orders

- fix tests
---
 .../Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml     | 2 ++
 .../Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml
index e4fd894f608c5..9cf808ac28b72 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml
@@ -128,6 +128,7 @@
         <waitForElementVisible selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="seeSubmitRefundBtn"/>
         <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="submitRefundOffline"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the credit memo." stepKey="seeCreditMemoSuccessMsg" after="submitRefundOffline"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderStatus"/>
 
         <!--Create invoice for rest of the ordered items-->
         <comment userInput="Admin creates invoice for rest of the items" stepKey="adminCreateInvoiceComment2" />
@@ -159,6 +160,7 @@
         <!--Submit Shipment-->
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="submitShipment2" after="fillRestOfItemsToShip"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The shipment has been created." stepKey="successfullyCreatedShipment" after="submitShipment2"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Complete" stepKey="seeOrderComplete"/>
 
         <!--Verify Items Status and Shipped Qty in the Items Ordered section-->
         <scrollTo selector="{{AdminOrderItemsOrderedSection.itemStatus('1')}}" stepKey="scrollToItemsOrdered2"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
index 08e859b11d1bb..2c27a391d559c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
@@ -120,6 +120,7 @@
 
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage1"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderProcessing"/>
 
         <!--Create Credit Memo-->
         <comment userInput="Admin creates credit memo" stepKey="createCreditMemoComment"/>

From 4864793070dabf2de761c938a8c85404bf802920 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Wed, 21 Nov 2018 12:40:42 +0400
Subject: [PATCH 124/932] MAGETWO-95823: Order Sales Report includes canceled
 orders

- Updated automated test
---
 .../Test/CancelOrdersInOrderSalesReportTest.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
index 967b0f3caf515..38ad418865eac 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
@@ -10,12 +10,13 @@
     <test name="CancelOrdersInOrderSalesReportTest">
         <annotations>
             <features value="Reports"/>
-            <stories value="MAGETWO-95823: Order Sales Report includes canceled orders"/>
+            <stories value="Order Sales Report includes canceled orders"/>
             <group value="reports"/>
             <title value="Canceled orders in order sales report"/>
             <description value="Verify canceling of orders in order sales report"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-95960"/>
+            <useCaseId value="MAGETWO-95823"/>
         </annotations>
 
         <before>
@@ -32,6 +33,13 @@
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
         </before>
 
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
         <!-- Create completed order -->
         <actionGroup ref="CreateOrderActionGroup" stepKey="createOrderd">
             <argument name="product" value="$$createSimpleProduct$$"/>
@@ -69,12 +77,5 @@
 
         <!-- Compare canceled orders price -->
         <assertEquals expected="$0.00" expectedType="string" actual="{$grabCanceledOrdersPrice}" actualType="string"  stepKey="assertEquals"/>
-
-        <after>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
     </test>
 </tests>

From 072409ed7fe317262710e1ac64ce5c65e206b22f Mon Sep 17 00:00:00 2001
From: Oksana_Kremen <Oksana_Kremen@epam.com>
Date: Wed, 21 Nov 2018 11:24:37 +0200
Subject: [PATCH 125/932] MAGETWO-96420: [2.3.x] Customer receives newsletter
 unsubscription email after registering for new account

- Fixed moving subscription status to 'UNCONFIRMED' if a customer was already in 'SUBSCRIBED' status
---
 app/code/Magento/Newsletter/Model/Subscriber.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index 50e6bb7e878c0..e7e5d5f202811 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -591,7 +591,12 @@ protected function _updateCustomerSubscription($customerId, $subscribe)
             if (AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED
                 == $this->customerAccountManagement->getConfirmationStatus($customerId)
             ) {
-                $status = self::STATUS_UNCONFIRMED;
+                if ($this->getId() && $this->getStatus() == self::STATUS_SUBSCRIBED) {
+                    // if a customer was already subscribed then keep the subscribed
+                    $status = self::STATUS_SUBSCRIBED;
+                } else {
+                    $status = self::STATUS_UNCONFIRMED;
+                }
             } elseif ($isConfirmNeed) {
                 if ($this->getStatus() != self::STATUS_SUBSCRIBED) {
                     $status = self::STATUS_NOT_ACTIVE;

From 23e6250046ad8d54d732643ad4c7c881818f44c9 Mon Sep 17 00:00:00 2001
From: ratnesh <ratnesh@webkul.com>
Date: Wed, 21 Nov 2018 21:18:09 +0530
Subject: [PATCH 126/932] fixed issue #19292 for 2.3-develop

---
 .../Wishlist/Block/Customer/Wishlist.php      | 66 ++++++++++++++++++-
 .../view/frontend/templates/view.phtml        |  8 ++-
 .../Magento/luma/web/css/source/_extends.less |  9 ++-
 3 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index 2b1b6d44b425c..9b7587e68f368 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -24,11 +24,21 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
      */
     protected $_optionsCfg = [];
 
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $_scopeConfig;
+
     /**
      * @var \Magento\Catalog\Helper\Product\ConfigurationPool
      */
     protected $_helperPool;
 
+    /**
+     * @var  \Magento\Wishlist\Model\ResourceModel\Item\Collection
+     */
+    protected $_collection;
+
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
      */
@@ -63,6 +73,8 @@ public function __construct(
         $this->_helperPool = $helperPool;
         $this->currentCustomer = $currentCustomer;
         $this->postDataHelper = $postDataHelper;
+        $this->_scopeConfig = $context->getScopeConfig();
+        $this->getWishlistItems();
     }
 
     /**
@@ -77,15 +89,67 @@ protected function _prepareCollection($collection)
         return $this;
     }
 
+    /**
+     * Retrieve Wishlist Product Items collection
+     *
+     * @return \Magento\Wishlist\Model\ResourceModel\Item\Collection
+     */
+    public function getWishlistItems()
+    {
+        $page = ($this->getRequest()->getParam("p")) ? $this->getRequest()->getParam("p") : 1;
+        $limit = ($this->getRequest()->getParam("limit")) ? $this->getRequest()->getParam("limit") : 10;
+        if ($this->_collection === null) {
+            $this->_collection = $this->_createWishlistItemCollection();
+            $this->_prepareCollection($this->_collection);
+        }
+        $this->_collection
+            ->setPageSize($limit)
+            ->setCurPage($page);
+        return $this->_collection;
+    }
+
     /**
      * Preparing global layout
      *
-     * @return void
+     * @return $this
      */
     protected function _prepareLayout()
     {
         parent::_prepareLayout();
         $this->pageConfig->getTitle()->set(__('My Wish List'));
+        $pager = $this->getLayout()
+            ->createBlock('Magento\Theme\Block\Html\Pager', 'wishlist_item_pager')
+            ->setUseContainer(
+                true
+            )->setShowAmounts(
+                true
+            )->setFrameLength(
+                $this->_scopeConfig->getValue(
+                    'design/pagination/pagination_frame',
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                )
+            )->setJump(
+                $this->_scopeConfig->getValue(
+                    'design/pagination/pagination_frame_skip',
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                )
+            )->setLimit(
+                $this->getLimit()
+            )
+            ->setCollection($this->_collection);
+        $this->setChild("pager", $pager);
+        $this->_collection->load();
+        return $this;
+    }
+
+    /**
+     * Render pagination HTML
+     *
+     * @return string
+     */
+    public function getPagerHtml()
+    {
+        return $this->getChildHtml('pager');
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
index 8b2e1b1c9d808..fc41737436156 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
@@ -10,6 +10,9 @@
 ?>
 
 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
+    <?php if ($block->getPagerHtml()): ?>
+        <div class="toolbar"><?php echo $block->getPagerHtml(); ?></div>
+    <?php endif ?>
     <?= ($block->getChildHtml('wishlist.rss.link')) ?>
     <form class="form-wishlist-items" id="wishlist-view-form"
           data-mage-init='{"wishlist":{
@@ -51,5 +54,8 @@
           <input name="entity" value="<%- data.entity %>">
           <% } %>
       </form>
-  </script>
+    </script>
+    <?php if ($block->getPagerHtml()): ?>
+        <div class="toolbar"><br><?php echo $block->getPagerHtml(); ?></div>
+    <?php endif ?>
 <?php endif ?>
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index 7c9f5b7a65ab4..febc80210b134 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1503,8 +1503,8 @@
 
         .toolbar-amount,
         .limiter {
-            position: relative;
             z-index: 1;
+            display: inline-block;
         }
 
         .toolbar-amount {
@@ -1512,9 +1512,12 @@
             padding: 0;
         }
 
+        .limiter {
+            float: right;
+        }
+
         .pages {
-            position: absolute;
-            width: 100%;
+            display: inline-block;
             z-index: 0;
         }
     }

From f04154e54a1a5d62932934971acdd07118f98d40 Mon Sep 17 00:00:00 2001
From: Jasper Zeinstra <jasper.zeinstra@mediact.nl>
Date: Wed, 21 Nov 2018 16:53:11 +0100
Subject: [PATCH 127/932] Add child identities of bundle and configurable
 products on frontend instead of parent identities

---
 .../Bundle/Model/Plugin/Frontend/Product.php  | 45 +++++++++++++++
 app/code/Magento/Bundle/etc/frontend/di.xml   |  3 +
 .../Frontend/ProductIdentitiesExtender.php    | 57 +++++++++++++++++++
 .../ConfigurableProduct/etc/frontend/di.xml   |  3 +
 4 files changed, 108 insertions(+)
 create mode 100644 app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
 create mode 100644 app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php

diff --git a/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php b/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
new file mode 100644
index 0000000000000..452a338e96fcd
--- /dev/null
+++ b/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Bundle\Model\Plugin\Frontend;
+
+use Magento\Bundle\Model\Product\Type;
+use Magento\Catalog\Model\Product as CatalogProduct;
+
+class Product
+{
+    /**
+     * @var Type
+     */
+    private $type;
+
+    /**
+     * @param Type $type
+     */
+    public function __construct(Type $type)
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * Add child identities to product identities
+     *
+     * @param CatalogProduct $product
+     * @param array $identities
+     * @return string[]
+     */
+    public function afterGetIdentities(
+        CatalogProduct $product,
+        array $identities
+    ) {
+        foreach ($this->type->getChildrenIds($product->getEntityId()) as $optionId => $childIds) {
+            foreach ($childIds as $childId) {
+                $identities[] = CatalogProduct::CACHE_TAG . '_' . $childId;
+            }
+        }
+
+        return array_unique($identities);
+    }
+}
diff --git a/app/code/Magento/Bundle/etc/frontend/di.xml b/app/code/Magento/Bundle/etc/frontend/di.xml
index 54f6d3b4b0f42..fc820ff87a129 100644
--- a/app/code/Magento/Bundle/etc/frontend/di.xml
+++ b/app/code/Magento/Bundle/etc/frontend/di.xml
@@ -13,4 +13,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Catalog\Model\Product">
+        <plugin name="bundle" type="Magento\Bundle\Model\Plugin\Frontend\Product" sortOrder="100" />
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
new file mode 100644
index 0000000000000..513a7330c9d5c
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Plugin\Frontend;
+
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+
+/**
+ *  Extender of product identities for child of configurable products
+ */
+class ProductIdentitiesExtender
+{
+    /**
+     * @var Configurable
+     */
+    private $configurableType;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @param Configurable $configurableType
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(Configurable $configurableType, ProductRepositoryInterface $productRepository)
+    {
+        $this->configurableType = $configurableType;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Add child identities to product identities
+     *
+     * @param Product $subject
+     * @param array $identities
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetIdentities(Product $subject, array $identities): array
+    {
+        foreach ($this->configurableType->getChildrenIds($subject->getId()) as $key => $childIds) {
+            foreach ($childIds as $childId) {
+                $identities[] = Product::CACHE_TAG . '_' . $childId;
+            }
+        }
+
+        return array_unique($identities);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
index bb830c36b929d..df96829b354c8 100644
--- a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
@@ -10,4 +10,7 @@
     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
         <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
     </type>
+    <type name="Magento\Catalog\Model\Product">
+        <plugin name="product_identities_extender" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\ProductIdentitiesExtender" />
+    </type>
 </config>

From edd9d4c7583f9e86a48389897cd7a59a3ab8e479 Mon Sep 17 00:00:00 2001
From: Jasper Zeinstra <jasper.zeinstra@mediact.nl>
Date: Wed, 21 Nov 2018 21:43:06 +0100
Subject: [PATCH 128/932] Make code more strict

---
 .../Magento/Bundle/Model/Plugin/Frontend/Product.php | 12 ++++++------
 .../Plugin/Frontend/ProductIdentitiesExtender.php    |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php b/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
index 452a338e96fcd..c1cb0e8b1bb8b 100644
--- a/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
+++ b/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Bundle\Model\Plugin\Frontend;
 
 use Magento\Bundle\Model\Product\Type;
@@ -28,13 +30,11 @@ public function __construct(Type $type)
      *
      * @param CatalogProduct $product
      * @param array $identities
-     * @return string[]
+     * @return array
      */
-    public function afterGetIdentities(
-        CatalogProduct $product,
-        array $identities
-    ) {
-        foreach ($this->type->getChildrenIds($product->getEntityId()) as $optionId => $childIds) {
+    public function afterGetIdentities(CatalogProduct $product, array $identities): array
+    {
+        foreach ($this->type->getChildrenIds($product->getEntityId()) as $childIds) {
             foreach ($childIds as $childId) {
                 $identities[] = CatalogProduct::CACHE_TAG . '_' . $childId;
             }
diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
index 513a7330c9d5c..2c002acf938f4 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
@@ -42,11 +42,10 @@ public function __construct(Configurable $configurableType, ProductRepositoryInt
      * @param Product $subject
      * @param array $identities
      * @return array
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetIdentities(Product $subject, array $identities): array
     {
-        foreach ($this->configurableType->getChildrenIds($subject->getId()) as $key => $childIds) {
+        foreach ($this->configurableType->getChildrenIds($subject->getId()) as $childIds) {
             foreach ($childIds as $childId) {
                 $identities[] = Product::CACHE_TAG . '_' . $childId;
             }

From 3ebcc33bb57a15d0f7e6e5382fad4e28abf302fb Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 10:07:54 +0530
Subject: [PATCH 129/932] Update Wishlist.php

fixed block file
---
 .../Wishlist/Block/Customer/Wishlist.php      | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index 9b7587e68f368..5e7cc0440342c 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -24,11 +24,6 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
      */
     protected $_optionsCfg = [];
 
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * @var \Magento\Catalog\Helper\Product\ConfigurationPool
      */
@@ -73,7 +68,6 @@ public function __construct(
         $this->_helperPool = $helperPool;
         $this->currentCustomer = $currentCustomer;
         $this->postDataHelper = $postDataHelper;
-        $this->_scopeConfig = $context->getScopeConfig();
         $this->getWishlistItems();
     }
 
@@ -89,6 +83,20 @@ protected function _prepareCollection($collection)
         return $this;
     }
 
+    /**
+     * Paginate Wishlist Product Items collection
+     *
+     * @return void
+     */
+    public function paginateCollection()
+    {
+        $page = $this->getRequest()->getParam("p", 1);
+        $limit = $this->getRequest()->getParam("limit", 10);
+        $this->_collection
+            ->setPageSize($limit)
+            ->setCurPage($page);
+    }
+
     /**
      * Retrieve Wishlist Product Items collection
      *
@@ -96,15 +104,12 @@ protected function _prepareCollection($collection)
      */
     public function getWishlistItems()
     {
-        $page = ($this->getRequest()->getParam("p")) ? $this->getRequest()->getParam("p") : 1;
-        $limit = ($this->getRequest()->getParam("limit")) ? $this->getRequest()->getParam("limit") : 10;
         if ($this->_collection === null) {
             $this->_collection = $this->_createWishlistItemCollection();
             $this->_prepareCollection($this->_collection);
+            $this->paginateCollection();
         }
-        $this->_collection
-            ->setPageSize($limit)
-            ->setCurPage($page);
+
         return $this->_collection;
     }
 
@@ -117,8 +122,7 @@ protected function _prepareLayout()
     {
         parent::_prepareLayout();
         $this->pageConfig->getTitle()->set(__('My Wish List'));
-        $pager = $this->getLayout()
-            ->createBlock('Magento\Theme\Block\Html\Pager', 'wishlist_item_pager')
+        $pager = $this->getChildBlock('wishlist_item_pager')
             ->setUseContainer(
                 true
             )->setShowAmounts(

From edc84041bada47a73e1f35bbc879442c4d26e65e Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 10:12:02 +0530
Subject: [PATCH 130/932] Update wishlist_index_index.xml

added layout for pager
---
 .../Wishlist/view/frontend/layout/wishlist_index_index.xml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
index 243a06062425a..d3f21dda9ccde 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
@@ -13,6 +13,7 @@
         </referenceBlock>
         <referenceContainer name="content">
             <block class="Magento\Wishlist\Block\Customer\Wishlist" name="customer.wishlist" template="Magento_Wishlist::view.phtml" cacheable="false">
+                <block class="Magento\Theme\Block\Html\Pager" name="wishlist_item_pager"/>
                 <block class="Magento\Wishlist\Block\Rss\Link" name="wishlist.rss.link" template="Magento_Wishlist::rss/wishlist.phtml"/>
                 <block class="Magento\Wishlist\Block\Customer\Wishlist\Items" name="customer.wishlist.items" as="items" template="Magento_Wishlist::item/list.phtml" cacheable="false">
                     <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Image" name="customer.wishlist.item.image" template="Magento_Wishlist::item/column/image.phtml" cacheable="false"/>

From 624de59079eabef2042e29dbf0874f54a546de1b Mon Sep 17 00:00:00 2001
From: mahesh <mahesh721@webkul.com>
Date: Thu, 22 Nov 2018 10:40:24 +0530
Subject: [PATCH 131/932] store id issue fixed with multishipping checkout

---
 app/code/Magento/Quote/Model/Quote/Address/Item.php | 4 ++++
 app/code/Magento/Quote/etc/db_schema.xml            | 7 +++++++
 app/code/Magento/Quote/etc/db_schema_whitelist.json | 7 +++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Item.php b/app/code/Magento/Quote/Model/Quote/Address/Item.php
index d7014403f7884..6b46297f72e8f 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Item.php
@@ -46,6 +46,8 @@
  * @method \Magento\Quote\Model\Quote\Address\Item setSuperProductId(int $value)
  * @method int getParentProductId()
  * @method \Magento\Quote\Model\Quote\Address\Item setParentProductId(int $value)
+ * @method int getStoreId()
+ * @method \Magento\Quote\Model\Quote\Address\Item setStoreId(int $value)
  * @method string getSku()
  * @method \Magento\Quote\Model\Quote\Address\Item setSku(string $value)
  * @method string getImage()
@@ -168,6 +170,8 @@ public function importQuoteItem(\Magento\Quote\Model\Quote\Item $quoteItem)
             $quoteItem->getProductId()
         )->setProduct(
             $quoteItem->getProduct()
+        )->setStoreId(
+            $quoteItem->getStoreId()
         )->setSku(
             $quoteItem->getSku()
         )->setName(
diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 7dd215b87e8cc..59fb48d6fd918 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -352,6 +352,8 @@
                 comment="Super Product Id"/>
         <column xsi:type="int" name="parent_product_id" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Parent Product Id"/>
+        <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
+                comment="Store Id"/>
         <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
         <column xsi:type="varchar" name="image" nullable="true" length="255" comment="Image"/>
         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
@@ -394,6 +396,8 @@
         <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID"
                     table="quote_address_item" column="quote_item_id" referenceTable="quote_item"
                     referenceColumn="item_id" onDelete="CASCADE"/>
+        <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_ITEM_STORE_ID_STORE_STORE_ID" table="quote_address_item" column="store_id"
+                    referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
         <index referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID" indexType="btree">
             <column name="quote_address_id"/>
         </index>
@@ -403,6 +407,9 @@
         <index referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID" indexType="btree">
             <column name="quote_item_id"/>
         </index>
+        <index referenceId="QUOTE_ADDRESS_ITEM_STORE_ID" indexType="btree">
+            <column name="store_id"/>
+        </index>
     </table>
     <table name="quote_item_option" resource="checkout" engine="innodb" comment="Sales Flat Quote Item Option">
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"
diff --git a/app/code/Magento/Quote/etc/db_schema_whitelist.json b/app/code/Magento/Quote/etc/db_schema_whitelist.json
index c2cc34293dcb5..c9afa09e0a207 100644
--- a/app/code/Magento/Quote/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Quote/etc/db_schema_whitelist.json
@@ -212,6 +212,7 @@
             "product_id": true,
             "super_product_id": true,
             "parent_product_id": true,
+            "store_id": true,
             "sku": true,
             "image": true,
             "name": true,
@@ -233,13 +234,15 @@
         "index": {
             "QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID": true,
             "QUOTE_ADDRESS_ITEM_PARENT_ITEM_ID": true,
-            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID": true
+            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID": true,
+            "QUOTE_ADDRESS_ITEM_STORE_ID": true
         },
         "constraint": {
             "PRIMARY": true,
             "QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID": true,
             "QUOTE_ADDR_ITEM_PARENT_ITEM_ID_QUOTE_ADDR_ITEM_ADDR_ITEM_ID": true,
-            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID": true
+            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID": true,
+            "QUOTE_ADDRESS_ITEM_STORE_ID_STORE_STORE_ID": true
         }
     },
     "quote_item_option": {

From 9c4ff3833fea371c6bda85d3c9fc014404c00e97 Mon Sep 17 00:00:00 2001
From: mahesh <mahesh721@webkul.com>
Date: Thu, 22 Nov 2018 10:58:10 +0530
Subject: [PATCH 132/932] change file wich is not related to this issue

---
 app/code/Magento/Bundle/Model/Product/Type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index e5755df2291ee..b61df8d7cb125 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -827,7 +827,7 @@ private function multiToFlatArray(array $array)
             if (is_array($value)) {
                 $flatArray = array_merge($flatArray, $this->multiToFlatArray($value));
             } else {
-                $flatArray[] = $value;
+                $flatArray[$key] = $value;
             }
         }
 

From 7a2d534967b7468875c647c9216dcaa0ee2ad13b Mon Sep 17 00:00:00 2001
From: mahesh <mahesh721@webkul.com>
Date: Thu, 22 Nov 2018 11:01:21 +0530
Subject: [PATCH 133/932] change file wich is not related to this issue

---
 app/code/Magento/Bundle/Model/Product/Type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index e5755df2291ee..b61df8d7cb125 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -827,7 +827,7 @@ private function multiToFlatArray(array $array)
             if (is_array($value)) {
                 $flatArray = array_merge($flatArray, $this->multiToFlatArray($value));
             } else {
-                $flatArray[] = $value;
+                $flatArray[$key] = $value;
             }
         }
 

From 4ddc22bb35d45fcb473a995089c6c132800e1356 Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 15:13:21 +0530
Subject: [PATCH 134/932] Update Wishlist.php

updating with removing extra block name assignment.
---
 app/code/Magento/Wishlist/Block/Customer/Wishlist.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index 5e7cc0440342c..ac6adc4c44145 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -141,21 +141,10 @@ protected function _prepareLayout()
                 $this->getLimit()
             )
             ->setCollection($this->_collection);
-        $this->setChild("pager", $pager);
         $this->_collection->load();
         return $this;
     }
 
-    /**
-     * Render pagination HTML
-     *
-     * @return string
-     */
-    public function getPagerHtml()
-    {
-        return $this->getChildHtml('pager');
-    }
-
     /**
      * Retrieve Back URL
      *

From 60a0dd4a753eab9344bbf1e3598ab5d1077a2ffe Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 15:14:14 +0530
Subject: [PATCH 135/932] Update view.phtml

updating pagination template calling way
---
 .../Magento/Wishlist/view/frontend/templates/view.phtml   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
index fc41737436156..c80bf9adbffe8 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
@@ -10,9 +10,7 @@
 ?>
 
 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-    <?php if ($block->getPagerHtml()): ?>
-        <div class="toolbar"><?php echo $block->getPagerHtml(); ?></div>
-    <?php endif ?>
+    <div class="toolbar"><?php echo $block->getChildHtml('wishlist_item_pager'); ?></div>
     <?= ($block->getChildHtml('wishlist.rss.link')) ?>
     <form class="form-wishlist-items" id="wishlist-view-form"
           data-mage-init='{"wishlist":{
@@ -55,7 +53,5 @@
           <% } %>
       </form>
     </script>
-    <?php if ($block->getPagerHtml()): ?>
-        <div class="toolbar"><br><?php echo $block->getPagerHtml(); ?></div>
-    <?php endif ?>
+    <div class="toolbar"><br><?php echo $block->getChildHtml('wishlist_item_pager'); ?></div>
 <?php endif ?>

From 6be4ebf95d562fb3310812cc586dd02af57f5cdb Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal.solanki@krishtechnolabs.com>
Date: Thu, 22 Nov 2018 15:17:32 +0530
Subject: [PATCH 136/932] Fix issue-19328- Success Message Icon vertically
 misaligned in admin panel

---
 .../backend/web/css/source/components/_messages.less     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
index de24bf89620d4..09ffa8e72720c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
@@ -121,6 +121,15 @@
     }
 }
 
+#import_validation_container  {
+    .message-success {
+        &:before {
+            color: @alert-icon__success__color;
+            content: @alert-icon__success__content;
+            top: 2.3rem;
+        }
+    }
+}
 .message-spinner {
     &:before {
         display: none;

From ce8765b118840d7894126f1e5c1bac519a79e80a Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 15:18:42 +0530
Subject: [PATCH 137/932] Update Wishlist.php

removed unused variable
---
 app/code/Magento/Wishlist/Block/Customer/Wishlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index ac6adc4c44145..f09c6b6a42954 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -122,7 +122,7 @@ protected function _prepareLayout()
     {
         parent::_prepareLayout();
         $this->pageConfig->getTitle()->set(__('My Wish List'));
-        $pager = $this->getChildBlock('wishlist_item_pager')
+        $this->getChildBlock('wishlist_item_pager')
             ->setUseContainer(
                 true
             )->setShowAmounts(

From 4fb3c8dbc5a04de266f7bf65d4e45ff4a9baf48c Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 15:22:48 +0530
Subject: [PATCH 138/932] Update view.phtml

remove echo keyword
---
 app/code/Magento/Wishlist/view/frontend/templates/view.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
index c80bf9adbffe8..9c347bbd1fe8d 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
@@ -10,7 +10,7 @@
 ?>
 
 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-    <div class="toolbar"><?php echo $block->getChildHtml('wishlist_item_pager'); ?></div>
+    <div class="toolbar"><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
     <?= ($block->getChildHtml('wishlist.rss.link')) ?>
     <form class="form-wishlist-items" id="wishlist-view-form"
           data-mage-init='{"wishlist":{
@@ -53,5 +53,5 @@
           <% } %>
       </form>
     </script>
-    <div class="toolbar"><br><?php echo $block->getChildHtml('wishlist_item_pager'); ?></div>
+    <div class="toolbar"><br><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
 <?php endif ?>

From 71ee75b539fa753bc866b546f6d89d0b36d972ba Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 16:05:34 +0530
Subject: [PATCH 139/932] Update _extends.less

reverting changes in less
---
 .../frontend/Magento/luma/web/css/source/_extends.less   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index febc80210b134..7c9f5b7a65ab4 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1503,8 +1503,8 @@
 
         .toolbar-amount,
         .limiter {
+            position: relative;
             z-index: 1;
-            display: inline-block;
         }
 
         .toolbar-amount {
@@ -1512,12 +1512,9 @@
             padding: 0;
         }
 
-        .limiter {
-            float: right;
-        }
-
         .pages {
-            display: inline-block;
+            position: absolute;
+            width: 100%;
             z-index: 0;
         }
     }

From b153c06bd95b30121d0cd61a20c147dc3ef43692 Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 16:06:54 +0530
Subject: [PATCH 140/932] Update view.phtml

adding specific classes to increase weight
---
 app/code/Magento/Wishlist/view/frontend/templates/view.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
index 9c347bbd1fe8d..4f4a1d302c150 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
@@ -10,7 +10,7 @@
 ?>
 
 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-    <div class="toolbar"><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
+    <div class="toolbar wishlist-toolbar"><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
     <?= ($block->getChildHtml('wishlist.rss.link')) ?>
     <form class="form-wishlist-items" id="wishlist-view-form"
           data-mage-init='{"wishlist":{
@@ -53,5 +53,5 @@
           <% } %>
       </form>
     </script>
-    <div class="toolbar"><br><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
+    <div class="toolbar wishlist-toolbar"><br><?= $block->getChildHtml('wishlist_item_pager'); ?></div>
 <?php endif ?>

From ff416b94ac2e7ec348d4be963f0234568a885f11 Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 16:07:30 +0530
Subject: [PATCH 141/932] Update wishlist_index_index.xml

adding css file to wishlist page
---
 .../Wishlist/view/frontend/layout/wishlist_index_index.xml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
index d3f21dda9ccde..458cd6edfbe6b 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
@@ -7,6 +7,9 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="customer_account"/>
+    <head>
+        <css src="Magento_Wishlist::css/styles.css"/>
+    </head>
     <body>
         <referenceBlock name="head.components">
             <block class="Magento\Framework\View\Element\Js\Components" name="wishlist_head_components" template="Magento_Wishlist::js/components.phtml"/>

From 00a21317486a013ba69847ff320d26afefea39e1 Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 16:09:04 +0530
Subject: [PATCH 142/932] Create styles.css

created css for wishlist page
---
 .../Magento/Wishlist/view/frontend/css/styles.css   | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 app/code/Magento/Wishlist/view/frontend/css/styles.css

diff --git a/app/code/Magento/Wishlist/view/frontend/css/styles.css b/app/code/Magento/Wishlist/view/frontend/css/styles.css
new file mode 100644
index 0000000000000..43d2c4bb3627f
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/frontend/css/styles.css
@@ -0,0 +1,13 @@
+.limiter {
+    float: right;
+}
+.toolbar .wishlist-toolbar .pages {
+    display: inline-block;
+    z-index: 0;
+    position: absolute;
+}
+.toolbar .wishlist-toolbar .toolbar-amount,
+.limiter {
+    z-index: 1;
+    display: inline-block;
+}

From 9fe21d3c489b7c8e2789b7c6ecdb43766b075c8b Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Thu, 22 Nov 2018 15:18:04 +0300
Subject: [PATCH 143/932] MAGETWO-96434: [2.3.x] Autoscroll is missed on JS
 error on Storefront PDP [mobile]

- Fixed an issue with scroll to element after form validation on Safari iOS;
---
 lib/web/mage/validation.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 0fd28143ea9a0..6c540755a8759 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1929,6 +1929,9 @@
             }
 
             if (firstActive.length) {
+                $('html, body').animate({
+                    scrollTop: firstActive.offset().top
+                });
                 firstActive.focus();
             }
         }

From ae5dfae57e62170de4668812454ad57fe8ff8b26 Mon Sep 17 00:00:00 2001
From: MaxNovik <novik.kor@gmail.com>
Date: Thu, 22 Nov 2018 14:34:25 +0200
Subject: [PATCH 144/932] [Forwardport]
 Cart-Sales-Rule-with-negated-condition-over-special-price-does-not-work-for-configurable-products.
 Use configurable product`s children for shopping cart rules validation for
 cases when attribute exists for children only (E.g. special_price)

---
 .../Unit/Model/Rule/Condition/ProductTest.php |   1 +
 .../Model/Rule/Condition/Product.php          |  69 ++++++
 .../Model/Rule/Condition/ProductTest.php      | 225 ++++++++++++++++++
 .../Magento/ConfigurableProduct/etc/di.xml    |   3 +
 .../Model/Rule/Condition/Product.php          |  20 +-
 5 files changed, 312 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php

diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php
index 219cae6829299..00550383ce26f 100644
--- a/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php
+++ b/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php
@@ -9,6 +9,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.LongVariable)
  */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
new file mode 100644
index 0000000000000..1ed4432347b7a
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition;
+
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+
+/**
+ * Class Product
+ *
+ * @package Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition
+ */
+class Product
+{
+    /**
+     * Prepare configurable product for validation.
+     *
+     * @param \Magento\SalesRule\Model\Rule\Condition\Product $subject
+     * @param \Magento\Framework\Model\AbstractModel $model
+     * @return array
+     */
+    public function beforeValidate(
+        \Magento\SalesRule\Model\Rule\Condition\Product $subject,
+        \Magento\Framework\Model\AbstractModel $model
+    ) {
+        $product = $this->getProductToValidate($subject, $model);
+        if ($model->getProduct() !== $product) {
+            // We need to replace product only for validation and keep original product for all other cases.
+            $clone = clone $model;
+            $clone->setProduct($product);
+            $model = $clone;
+        }
+
+        return [$model];
+    }
+
+    /**
+     * Select proper product for validation.
+     *
+     * @param \Magento\SalesRule\Model\Rule\Condition\Product $subject
+     * @param \Magento\Framework\Model\AbstractModel $model
+     *
+     * @return \Magento\Catalog\Api\Data\ProductInterface|\Magento\Catalog\Model\Product
+     */
+    private function getProductToValidate(
+        \Magento\SalesRule\Model\Rule\Condition\Product $subject,
+        \Magento\Framework\Model\AbstractModel $model
+    ) {
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $model->getProduct();
+
+        $attrCode = $subject->getAttribute();
+
+        /* Check for attributes which are not available for configurable products */
+        if ($product->getTypeId() == Configurable::TYPE_CODE && !$product->hasData($attrCode)) {
+            /** @var \Magento\Catalog\Model\AbstractModel $childProduct */
+            $childProduct = current($model->getChildren())->getProduct();
+            if ($childProduct->hasData($attrCode)) {
+                $product = $childProduct;
+            }
+        }
+
+        return $product;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
new file mode 100644
index 0000000000000..c9d06709defa1
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
@@ -0,0 +1,225 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition;
+
+use Magento\Backend\Helper\Data;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition\Product as ValidatorPlugin;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\AbstractEntity;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\Locale\Format;
+use Magento\Framework\Locale\FormatInterface;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Rule\Model\Condition\Context;
+use Magento\SalesRule\Model\Rule\Condition\Product as SalesRuleProduct;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ProductTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var SalesRuleProduct
+     */
+    private $validator;
+
+    /**
+     * @var \Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition\Product
+     */
+    private $validatorPlugin;
+
+    public function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->validator = $this->createValidator();
+        $this->validatorPlugin = $this->objectManager->getObject(ValidatorPlugin::class);
+    }
+
+    /**
+     * @return \Magento\SalesRule\Model\Rule\Condition\Product
+     */
+    private function createValidator(): SalesRuleProduct
+    {
+        /** @var Context|\PHPUnit_Framework_MockObject_MockObject $contextMock */
+        $contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var Data|\PHPUnit_Framework_MockObject_MockObject $backendHelperMock */
+        $backendHelperMock = $this->getMockBuilder(Data::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var Config|\PHPUnit_Framework_MockObject_MockObject $configMock */
+        $configMock = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var ProductFactory|\PHPUnit_Framework_MockObject_MockObject $productFactoryMock */
+        $productFactoryMock = $this->getMockBuilder(ProductFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject $productRepositoryMock */
+        $productRepositoryMock = $this->getMockBuilder(ProductRepositoryInterface::class)
+            ->getMockForAbstractClass();
+        $attributeLoaderInterfaceMock = $this->getMockBuilder(AbstractEntity::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttributesByCode'])
+            ->getMock();
+        $attributeLoaderInterfaceMock
+            ->expects($this->any())
+            ->method('getAttributesByCode')
+            ->willReturn([]);
+        /** @var Product|\PHPUnit_Framework_MockObject_MockObject $productMock */
+        $productMock = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['loadAllAttributes', 'getConnection', 'getTable'])
+            ->getMock();
+        $productMock->expects($this->any())
+        ->method('loadAllAttributes')
+        ->willReturn($attributeLoaderInterfaceMock);
+        /** @var Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */
+        $collectionMock = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var FormatInterface|\PHPUnit_Framework_MockObject_MockObject $formatMock */
+        $formatMock = new Format(
+            $this->getMockBuilder(ScopeResolverInterface::class)->disableOriginalConstructor()->getMock(),
+            $this->getMockBuilder(ResolverInterface::class)->disableOriginalConstructor()->getMock(),
+            $this->getMockBuilder(CurrencyFactory::class)->disableOriginalConstructor()->getMock()
+        );
+
+        return new SalesRuleProduct(
+            $contextMock,
+            $backendHelperMock,
+            $configMock,
+            $productFactoryMock,
+            $productRepositoryMock,
+            $productMock,
+            $collectionMock,
+            $formatMock
+        );
+    }
+
+    public function testChildIsUsedForValidation()
+    {
+        $configurableProductMock = $this->createProductMock();
+        $configurableProductMock
+            ->expects($this->any())
+            ->method('getTypeId')
+            ->willReturn(Configurable::TYPE_CODE);
+        $configurableProductMock
+            ->expects($this->any())
+            ->method('hasData')
+            ->with($this->equalTo('special_price'))
+            ->willReturn(false);
+
+        /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+        $item = $this->getMockBuilder(AbstractItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setProduct', 'getProduct', 'getChildren'])
+            ->getMockForAbstractClass();
+        $item->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($configurableProductMock);
+
+        $simpleProductMock = $this->createProductMock();
+        $simpleProductMock
+            ->expects($this->any())
+            ->method('getTypeId')
+            ->willReturn(Type::TYPE_SIMPLE);
+        $simpleProductMock
+            ->expects($this->any())
+            ->method('hasData')
+            ->with($this->equalTo('special_price'))
+            ->willReturn(true);
+
+        $childItem = $this->getMockBuilder(AbstractItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMockForAbstractClass();
+        $childItem->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($simpleProductMock);
+
+        $item->expects($this->any())
+            ->method('getChildren')
+            ->willReturn([$childItem]);
+        $item->expects($this->once())
+            ->method('setProduct')
+            ->with($simpleProductMock);
+
+        $this->validator->setAttribute('special_price');
+
+        $this->validatorPlugin->beforeValidate($this->validator, $item);
+    }
+
+    /**
+     * @return Product|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private function createProductMock(): \PHPUnit_Framework_MockObject_MockObject
+    {
+        $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getAttribute',
+                'getId',
+                'setQuoteItemQty',
+                'setQuoteItemPrice',
+                'getTypeId',
+                'hasData',
+            ])
+            ->getMock();
+        $productMock
+            ->expects($this->any())
+            ->method('setQuoteItemQty')
+            ->willReturnSelf();
+        $productMock
+            ->expects($this->any())
+            ->method('setQuoteItemPrice')
+            ->willReturnSelf();
+
+        return $productMock;
+    }
+
+    public function testChildIsNotUsedForValidation()
+    {
+        $simpleProductMock = $this->createProductMock();
+        $simpleProductMock
+            ->expects($this->any())
+            ->method('getTypeId')
+            ->willReturn(Type::TYPE_SIMPLE);
+        $simpleProductMock
+            ->expects($this->any())
+            ->method('hasData')
+            ->with($this->equalTo('special_price'))
+            ->willReturn(true);
+
+        /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+        $item = $this->getMockBuilder(AbstractItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setProduct', 'getProduct'])
+            ->getMockForAbstractClass();
+        $item->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($simpleProductMock);
+
+        $this->validator->setAttribute('special_price');
+
+        $this->validatorPlugin->beforeValidate($this->validator, $item);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index 1dbb0969687d5..a1cf1a4f28e8e 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -235,4 +235,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesRule\Model\Rule\Condition\Product">
+        <plugin name="apply_rule_on_configurable_children" type="Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition\Product" />
+    </type>
 </config>
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
index 9bda4793e8681..ff83bb1ee9129 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product.php
@@ -35,12 +35,13 @@ protected function _addSpecialAttributes(array &$attributes)
      *
      * @return string
      */
-    public function getAttribute()
+    public function getAttribute(): string
     {
         $attribute = $this->getData('attribute');
         if (strpos($attribute, '::') !== false) {
-            list (, $attribute) = explode('::', $attribute);
+            list(, $attribute) = explode('::', $attribute);
         }
+
         return $attribute;
     }
 
@@ -53,6 +54,7 @@ public function getAttributeName()
         if ($this->getAttributeScope()) {
             $attribute = $this->getAttributeScope() . '::' . $attribute;
         }
+
         return $this->getAttributeOption($attribute);
     }
 
@@ -92,6 +94,7 @@ public function getAttributeElementHtml()
     {
         $html = parent::getAttributeElementHtml() .
                 $this->getAttributeScopeElement()->getHtml();
+
         return $html;
     }
 
@@ -100,7 +103,7 @@ public function getAttributeElementHtml()
      *
      * @return \Magento\Framework\Data\Form\Element\AbstractElement
      */
-    private function getAttributeScopeElement()
+    private function getAttributeScopeElement(): \Magento\Framework\Data\Form\Element\AbstractElement
     {
         return $this->getForm()->addField(
             $this->getPrefix() . '__' . $this->getId() . '__attribute_scope',
@@ -110,7 +113,7 @@ private function getAttributeScopeElement()
                 'value' => $this->getAttributeScope(),
                 'no_span' => true,
                 'class' => 'hidden',
-                'data-form-part' => $this->getFormName()
+                'data-form-part' => $this->getFormName(),
             ]
         );
     }
@@ -119,8 +122,9 @@ private function getAttributeScopeElement()
      * Set attribute value
      *
      * @param string $value
+     * @return void
      */
-    public function setAttribute($value)
+    public function setAttribute(string $value)
     {
         if (strpos($value, '::') !== false) {
             list($scope, $attribute) = explode('::', $value);
@@ -137,7 +141,8 @@ public function setAttribute($value)
     public function loadArray($arr)
     {
         parent::loadArray($arr);
-        $this->setAttributeScope(isset($arr['attribute_scope']) ? $arr['attribute_scope'] : null);
+        $this->setAttributeScope($arr['attribute_scope'] ?? null);
+
         return $this;
     }
 
@@ -148,6 +153,7 @@ public function asArray(array $arrAttributes = [])
     {
         $out = parent::asArray($arrAttributes);
         $out['attribute_scope'] = $this->getAttributeScope();
+
         return $out;
     }
 
@@ -155,7 +161,9 @@ public function asArray(array $arrAttributes = [])
      * Validate Product Rule Condition
      *
      * @param \Magento\Framework\Model\AbstractModel $model
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function validate(\Magento\Framework\Model\AbstractModel $model)
     {

From ee268adc7155ad7378e4950aab451fbea841e091 Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Thu, 22 Nov 2018 15:53:25 +0300
Subject: [PATCH 145/932] MAGETWO-96410: [2.3.x] The cart rule cannot effect
 the cart

- Add parent qty
---
 .../SalesRule/Model/Rule/Condition/Product/Subselect.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
index 1e8fbf43ec3bc..5b02d3c080938 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\SalesRule\Model\Rule\Condition\Product;
 
+/**
+ * Subselect conditions for product.
+ */
 class Subselect extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
 {
     /**
@@ -161,7 +164,9 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
                 }
             }
             if ($hasValidChild || parent::validate($item)) {
-                $total += (($hasValidChild && $useChildrenTotal) ? $childrenAttrTotal : $item->getData($attr));
+                $total += ($hasValidChild && $useChildrenTotal)
+                    ? $childrenAttrTotal * $item->getQty()
+                    : $item->getData($attr);
             }
         }
         return $this->validateAttribute($total);

From 892304654389ccd7bc26366497a11247279abadc Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 18:52:38 +0530
Subject: [PATCH 146/932] Delete styles.css

should not use css that is why deleting
---
 .../Magento/Wishlist/view/frontend/css/styles.css   | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 app/code/Magento/Wishlist/view/frontend/css/styles.css

diff --git a/app/code/Magento/Wishlist/view/frontend/css/styles.css b/app/code/Magento/Wishlist/view/frontend/css/styles.css
deleted file mode 100644
index 43d2c4bb3627f..0000000000000
--- a/app/code/Magento/Wishlist/view/frontend/css/styles.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.limiter {
-    float: right;
-}
-.toolbar .wishlist-toolbar .pages {
-    display: inline-block;
-    z-index: 0;
-    position: absolute;
-}
-.toolbar .wishlist-toolbar .toolbar-amount,
-.limiter {
-    z-index: 1;
-    display: inline-block;
-}

From 7c5b9a55601184400112e7d51b06eaa95781df1d Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 18:54:13 +0530
Subject: [PATCH 147/932] Create styles.less

creating less file
---
 .../Wishlist/view/frontend/web/css/styles.less     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 app/code/Magento/Wishlist/view/frontend/web/css/styles.less

diff --git a/app/code/Magento/Wishlist/view/frontend/web/css/styles.less b/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
new file mode 100644
index 0000000000000..185cac2801929
--- /dev/null
+++ b/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
@@ -0,0 +1,14 @@
+.limiter {
+    float: right;
+}
+.toolbar {
+    .wishlist-toolbar .pages {
+        display: inline-block;
+        z-index: 0;
+        position: absolute;
+    }
+    .wishlist-toolbar .toolbar-amount, .limiter {
+        z-index: 1;
+        display: inline-block;
+    }
+}

From fbec41e5b8720c9e76203dc729213574a7754d97 Mon Sep 17 00:00:00 2001
From: Lusine <lusine_papyan@epam.com>
Date: Thu, 22 Nov 2018 17:33:10 +0400
Subject: [PATCH 148/932] MAGETWO-57337: Store View (language) switch leads to
 404

- Add automated test script
---
 .../Test/Mftf/ActionGroup/CMSActionGroup.xml  | 16 +++++
 .../StoreViewLanguageCorrectSwitchTest.xml    | 60 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index 75e059f620c2d..e2f22d29d3456 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -44,4 +44,20 @@
         <waitForPageLoad stepKey="waitForPageLoad3"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
     </actionGroup>
+
+    <actionGroup name="AddStoreViewToCmsPage" extends="navigateToCreatedCMSPage">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <remove keyForRemoval="clickExpandContentTabForPage"/>
+        <remove keyForRemoval="waitForLoadingMaskOfStagingSection"/>
+        <click selector="{{CmsNewPagePiwSection.header}}" stepKey="clickPageInWebsites" after="waitForPageLoad3"/>
+        <waitForElementVisible selector="{{CmsNewPagePiwSection.selectStoreView(storeViewName)}}" stepKey="waitForStoreGridReload"/>
+        <clickWithLeftButton selector="{{CmsNewPagePiwSection.selectStoreView(storeViewName)}}" stepKey="clickStoreView"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="You saved the page." stepKey="seeMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml
new file mode 100644
index 0000000000000..65fabfe25e817
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml
@@ -0,0 +1,60 @@
+<?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="StoreViewLanguageCorrectSwitchTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Store View (language) switch leads to 404"/>
+            <group value="Cms"/>
+            <title value="Check that Store View(language) switches correct"/>
+            <description value="Check that Store View(language) switches correct"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96388"/>
+            <useCaseId value="MAGETWO-57337"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!-- Create Cms Pages -->
+            <createData entity="_newDefaultCmsPage" stepKey="createFirstCmsPage"/>
+            <createData entity="_newDefaultCmsPage" stepKey="createSecondCmsPage"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createFirstCmsPage" stepKey="deleteFirstCmsPage"/>
+            <deleteData createDataKey="createSecondCmsPage" stepKey="deleteSecondCmsPage"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
+                <argument name="customStore" value="NewStoreViewData"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Create StoreView -->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
+        <argument name="customStore" value="NewStoreViewData"/>
+        </actionGroup>
+
+        <!-- Add StoreView To Cms Page-->
+        <actionGroup ref="AddStoreViewToCmsPage" stepKey="gotToCmsPage">
+            <argument name="CMSPage" value="$$createSecondCmsPage$$"/>
+            <argument name="storeViewName" value="{{NewStoreViewData.name}}"/>
+        </actionGroup>
+
+        <!-- Check that Cms Page is open -->
+        <amOnPage url="{{StorefrontHomePage.url}}/$$createFirstCmsPage.identifier$$" stepKey="gotToFirstCmsPage"/>
+        <see userInput="$$createFirstCmsPage.title$$" stepKey="seePageTitle"/>
+
+        <!-- Switch StoreView and check that Cms Page is open -->
+        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropDown"/>
+        <click selector="{{StorefrontHeaderSection.storeViewOption(NewStoreViewData.code)}}" stepKey="selectStoreView"/>
+        <amOnPage url="{{StorefrontHomePage.url}}/$$createSecondCmsPage.identifier$$" stepKey="gotToSecondCmsPage"/>
+        <see userInput="$$createSecondCmsPage.title$$" stepKey="seePageTitle1"/>
+    </test>
+</tests>

From dc407d98209fb378ea6cf4e44625b551e0a44055 Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 19:33:42 +0530
Subject: [PATCH 149/932] Update styles.less

updating limiter class
---
 app/code/Magento/Wishlist/view/frontend/web/css/styles.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/web/css/styles.less b/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
index 185cac2801929..f36954e8772f6 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
+++ b/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
@@ -1,7 +1,7 @@
-.limiter {
-    float: right;
-}
 .toolbar {
+    .limiter {
+        float: right;
+    }
     .wishlist-toolbar .pages {
         display: inline-block;
         z-index: 0;

From 2b3deabce8eea7d2832ebe83c37534295fb16260 Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 19:40:25 +0530
Subject: [PATCH 150/932] Update styles.less

updated more weighted css
---
 .../view/frontend/web/css/styles.less         | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/web/css/styles.less b/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
index f36954e8772f6..e660fdc10eab4 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
+++ b/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
@@ -1,14 +1,19 @@
+
 .toolbar {
+    .wishlist-toolbar {
+        .pages {
+            display: inline-block;
+            z-index: 0;
+            position: absolute;
+        }
+        .toolbar-amount, .limiter {
+            z-index: 1;
+            display: inline-block;
+        }
+    }
+}
+.toolbar.wishlist-toolbar{
     .limiter {
         float: right;
     }
-    .wishlist-toolbar .pages {
-        display: inline-block;
-        z-index: 0;
-        position: absolute;
-    }
-    .wishlist-toolbar .toolbar-amount, .limiter {
-        z-index: 1;
-        display: inline-block;
-    }
 }

From 4bfacbbbd8124bcbeb6e5f86a2c137e23005b38c Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 19:44:15 +0530
Subject: [PATCH 151/932] Update Wishlist.php

updating constructor
---
 app/code/Magento/Wishlist/Block/Customer/Wishlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index f09c6b6a42954..f84696c928e7a 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -68,7 +68,6 @@ public function __construct(
         $this->_helperPool = $helperPool;
         $this->currentCustomer = $currentCustomer;
         $this->postDataHelper = $postDataHelper;
-        $this->getWishlistItems();
     }
 
     /**
@@ -120,6 +119,7 @@ public function getWishlistItems()
      */
     protected function _prepareLayout()
     {
+        $this->getWishlistItems();
         parent::_prepareLayout();
         $this->pageConfig->getTitle()->set(__('My Wish List'));
         $this->getChildBlock('wishlist_item_pager')

From c6c9ff4a4a82025ad316f0712a045f1f804b2aab Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Thu, 22 Nov 2018 19:03:20 +0400
Subject: [PATCH 152/932] MAGETWO-94556: Undefined variables during product
 save

- Add automated test
---
 .../AdminProductAttributeOptionsSection.xml   |  1 +
 .../Section/AdminProductGridFilterSection.xml |  2 +-
 .../AdminProductFormConfigurationsSection.xml |  1 +
 .../AdminConfigurableProductCreateTest.xml    | 65 +++++++++++++++++++
 4 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml
index 0f438540603d0..5f1112eef3625 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeOptionsSection.xml
@@ -10,5 +10,6 @@
     <section name="DropdownAttributeOptionsSection">
         <element name="nthOptionAdminLabel" type="input"
                  selector="(//*[@id='manage-options-panel']//tr[{{var}}]//input[contains(@name, 'option[value]')])[1]" parameterized="true"/>
+        <element name="deleteButton" type="button" selector="(//td[@class='col-delete'])[1]" timeout="30"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index 611f12a39b510..2e4b9c6cb0430 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductGridFilterSection">
-        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
+        <element name="filters" type="button" selector="//button[text()='Filters']"/>
         <element name="clearAll" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current._show .action-clear" timeout="30"/>
         <element name="enabledFilters" type="textarea" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
         <element name="basicSearchFilter" type="textarea" selector=".admin__control-text.data-grid-search-control"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
index 0de7bc00044c8..1541b5ae81a28 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -22,6 +22,7 @@
         <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="firstSKUInConfigurableProductsGrid" type="input" selector="//input[@name='configurable-matrix[0][sku]']"/>
     </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/AdminConfigurableProductCreateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
index 48f46a1205ec3..f400a4d4708a8 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
@@ -68,4 +68,69 @@
         <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>
         <see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute3.name}}" stepKey="seeInDropDown3"/>
     </test>
+
+    <test name="AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Create, Read, Update, Delete"/>
+            <title value="admin should be able to create a configurable product after incorrect sku"/>
+            <description value="admin should be able to create a configurable product after incorrect sku"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96365"/>
+            <useCaseId value="MAGETWO-94556"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{AdminProductEditPage.url($$createConfigProduct.id$$)}}" stepKey="goToEditPage"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <conditionalClick selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="openConfigurationSection"/>
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="openConfigurationPane"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickFilters"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" userInput="color" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
+        <fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
+        <click selector="{{ConfigurableProductSection.generateConfigure}}" stepKey="generateConfigure"/>
+        <waitForPageLoad stepKey="waitForGenerateConfigure"/>
+        <grabValueFrom selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}"  stepKey="grabTextFromContent"/>
+        <fillField stepKey="fillMoreThan64Symbols" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="01234567890123456789012345678901234567890123456789012345678901234"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct1"/>
+        <see stepKey="seeErrorMessage" userInput="Please enter less or equal than 64 symbols."/>
+        <fillField stepKey="fillCorrectSKU" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="$grabTextFromContent"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
+        <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <waitForPageLoad stepKey="waitForProductAttributes"/>
+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid1"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="color" stepKey="fillFilter"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearch"/>
+        <click selector="{{AdminProductAttributeGridSection.AttributeCode('color')}}" stepKey="clickRowToEdit"/>
+        <click selector="{{DropdownAttributeOptionsSection.deleteButton(1)}}" stepKey="deleteOption"/>
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/>
+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid2"/>
+        <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+            <argument name="sku" value="$grabTextFromContent"/>
+        </actionGroup>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <waitForPageLoad time="60" stepKey="waitForPageLoadInitial"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+    </test>
 </tests>

From de2807d853dd8a1f817904950bbb16b4e691b31b Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Thu, 22 Nov 2018 19:11:49 +0400
Subject: [PATCH 153/932] MAGETWO-94556: Undefined variables during product
 save

- Add minor change
---
 .../Test/Mftf/Section/AdminProductFormConfigurationsSection.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
index 1541b5ae81a28..d4ac6bec9cfd5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -18,11 +18,11 @@
         <element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/>
         <element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/>
         <element name="currentVariationsStatusCells" type="textarea" selector="._no-header[data-index='status']"/>
+        <element name="firstSKUInConfigurableProductsGrid" type="input" selector="//input[@name='configurable-matrix[0][sku]']"/>
         <element name="actionsBtn" type="button" selector="(//button[@class='action-select']/span[contains(text(), 'Select')])[{{var1}}]" parameterized="true"/>
         <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="firstSKUInConfigurableProductsGrid" type="input" selector="//input[@name='configurable-matrix[0][sku]']"/>
     </section>
     <section name="AdminConfigurableProductFormSection">
         <element name="productWeight" type="input" selector=".admin__control-text[name='product[weight]']"/>

From af508310741fa5ef3df11272a4cf3b93892d83fe Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Thu, 22 Nov 2018 17:34:32 +0200
Subject: [PATCH 154/932] GraphQL-57: Manage Address Book

-- Refactoring
---
 .../AddressDataProvider.php                   |  2 +-
 .../Address/AddressConfigProvider.php         | 76 ------------------
 ...ssCreate.php => CreateCustomerAddress.php} | 77 +++++++++++--------
 ...ssDelete.php => DeleteCustomerAddress.php} | 43 ++++++-----
 ...ssUpdate.php => UpdateCustomerAddress.php} | 74 +++++++++++-------
 .../CustomerGraphQl/etc/schema.graphqls       |  6 +-
 6 files changed, 118 insertions(+), 160 deletions(-)
 rename app/code/Magento/CustomerGraphQl/Model/{Resolver/Address => Customer}/AddressDataProvider.php (98%)
 delete mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php
 rename app/code/Magento/CustomerGraphQl/Model/Resolver/{AddressCreate.php => CreateCustomerAddress.php} (60%)
 rename app/code/Magento/CustomerGraphQl/Model/Resolver/{AddressDelete.php => DeleteCustomerAddress.php} (65%)
 rename app/code/Magento/CustomerGraphQl/Model/Resolver/{AddressUpdate.php => UpdateCustomerAddress.php} (64%)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Customer/AddressDataProvider.php
similarity index 98%
rename from app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/AddressDataProvider.php
index 9726e8c0564a9..3f727a5e9e4a6 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/AddressDataProvider.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CustomerGraphQl\Model\Resolver\Address;
+namespace Magento\CustomerGraphQl\Model\Customer;
 
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php
deleted file mode 100644
index 363071b7b860d..0000000000000
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/Address/AddressConfigProvider.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CustomerGraphQl\Model\Resolver\Address;
-
-use Magento\Customer\Api\AddressMetadataManagementInterface;
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\Framework\Api\DataObjectHelper;
-use Magento\Eav\Model\Config;
-
-/**
- * Customers address configuration, used for GraphQL request processing.
- */
-class AddressConfigProvider
-{
-    /**
-     * @var Config
-     */
-    private $eavConfig;
-
-    /**
-     * @var DataObjectHelper
-     */
-    private $dataObjectHelper;
-
-    /**
-     * @var array
-     */
-    private $addressAttributes;
-
-    /**
-     * @param Config $eavConfig
-     * @param DataObjectHelper $dataObjectHelper
-     */
-    public function __construct(
-        Config $eavConfig,
-        DataObjectHelper $dataObjectHelper
-    ) {
-        $this->eavConfig = $eavConfig;
-        $this->dataObjectHelper = $dataObjectHelper;
-        $this->addressAttributes = $this->eavConfig->getEntityAttributes(
-            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
-        );
-    }
-
-    /**
-     * Add $addressInput array information to a $address object
-     *
-     * @param AddressInterface $address
-     * @param array $addressInput
-     * @return AddressInterface
-     */
-    public function fillAddress(AddressInterface $address, array $addressInput) : AddressInterface
-    {
-        $this->dataObjectHelper->populateWithArray(
-            $address,
-            $addressInput,
-            AddressInterface::class
-        );
-        return $address;
-    }
-
-    /**
-     * Get address field configuration
-     *
-     * @return array
-     */
-    public function getAddressAttributes() : array
-    {
-        return $this->addressAttributes;
-    }
-}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
similarity index 60%
rename from app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
rename to app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
index f336d8d73e567..3abe037fcee3e 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressCreate.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
@@ -7,28 +7,33 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\AddressInterface;
+use Magento\CustomerGraphQl\Model\Customer\AddressDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Eav\Model\Config;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\CustomerGraphQl\Model\Resolver\Address\AddressDataProvider;
-use Magento\CustomerGraphQl\Model\Resolver\Address\AddressConfigProvider;
 
 /**
  * Customers address create, used for GraphQL request processing.
  */
-class AddressCreate implements ResolverInterface
+class CreateCustomerAddress implements ResolverInterface
 {
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
     /**
      * @var AddressRepositoryInterface
      */
-    private $addressRepositoryInterface;
+    private $addressRepository;
 
     /**
      * @var AddressInterfaceFactory
@@ -41,26 +46,37 @@ class AddressCreate implements ResolverInterface
     private $addressDataProvider;
 
     /**
-     * @var AddressConfigProvider
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var DataObjectHelper
      */
-    public $addressConfigProvider;
+    private $dataObjectHelper;
 
     /**
-     * @param AddressRepositoryInterface $addressRepositoryInterface
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param AddressRepositoryInterface $addressRepository
      * @param AddressInterfaceFactory $addressInterfaceFactory
      * @param AddressDataProvider $addressDataProvider
-     * @param AddressConfigProvider $addressConfigProvider
+     * @param Config $eavConfig
+     * @param DataObjectHelper $dataObjectHelper
      */
     public function __construct(
-        AddressRepositoryInterface $addressRepositoryInterface,
+        CheckCustomerAccount $checkCustomerAccount,
+        AddressRepositoryInterface $addressRepository,
         AddressInterfaceFactory $addressInterfaceFactory,
         AddressDataProvider $addressDataProvider,
-        AddressConfigProvider $addressConfigProvider
+        Config $eavConfig,
+        DataObjectHelper $dataObjectHelper
     ) {
-        $this->addressRepositoryInterface = $addressRepositoryInterface;
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->addressRepository = $addressRepository;
         $this->addressInterfaceFactory = $addressInterfaceFactory;
         $this->addressDataProvider = $addressDataProvider;
-        $this->addressConfigProvider = $addressConfigProvider;
+        $this->eavConfig = $eavConfig;
+        $this->dataObjectHelper = $dataObjectHelper;
     }
 
     /**
@@ -73,18 +89,13 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
-        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
-            throw new GraphQlAuthorizationException(
-                __(
-                    'Current customer does not have access to the resource "%1"',
-                    [AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS]
-                )
-            );
-        }
-        $customerId = $context->getUserId();
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
         return $this->addressDataProvider->processCustomerAddress(
-            $this->processCustomerAddressCreate($customerId, $args['input'])
+            $this->processCustomerAddressCreate($currentUserId, $args['input'])
         );
     }
 
@@ -94,9 +105,11 @@ public function resolve(
      * @param array $addressInput
      * @return bool|string
      */
-    public function getInputError(array $addressInput)
+    private function getInputError(array $addressInput)
     {
-        $attributes = $this->addressConfigProvider->getAddressAttributes();
+        $attributes = $this->eavConfig->getEntityAttributes(
+            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
+        );
         foreach ($attributes as $attributeName => $attributeInfo) {
             if ($attributeInfo->getIsRequired()
                 && (!isset($addressInput[$attributeName]) || empty($addressInput[$attributeName]))) {
@@ -123,11 +136,13 @@ private function processCustomerAddressCreate($customerId, array $addressInput)
             );
         }
         /** @var AddressInterface $newAddress */
-        $newAddress = $this->addressConfigProvider->fillAddress(
-            $this->addressInterfaceFactory->create(),
-            $addressInput
+        $newAddress = $this->addressInterfaceFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $newAddress,
+            $addressInput,
+            AddressInterface::class
         );
         $newAddress->setCustomerId($customerId);
-        return $this->addressRepositoryInterface->save($newAddress);
+        return $this->addressRepository->save($newAddress);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
similarity index 65%
rename from app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php
rename to app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
index e636f3eceeed8..8d9b9a5ae1897 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressDelete.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
@@ -7,11 +7,9 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Authorization\Model\UserContextInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AddressInterface;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -22,20 +20,28 @@
 /**
  * Customers address delete, used for GraphQL request processing.
  */
-class AddressDelete implements ResolverInterface
+class DeleteCustomerAddress implements ResolverInterface
 {
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
     /**
      * @var AddressRepositoryInterface
      */
-    private $addressRepositoryInterface;
+    private $addressRepository;
 
     /**
-     * @param AddressRepositoryInterface $addressRepositoryInterface
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param AddressRepositoryInterface $addressRepository
      */
     public function __construct(
-        AddressRepositoryInterface $addressRepositoryInterface
+        CheckCustomerAccount $checkCustomerAccount,
+        AddressRepositoryInterface $addressRepository
     ) {
-        $this->addressRepositoryInterface = $addressRepositoryInterface;
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->addressRepository = $addressRepository;
     }
 
     /**
@@ -48,17 +54,12 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
-        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
-            throw new GraphQlAuthorizationException(
-                __(
-                    'Current customer does not have access to the resource "%1"',
-                    [AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS]
-                )
-            );
-        }
-        $customerId = $context->getUserId();
-        return $this->processCustomerAddressDelete($customerId, $args['id']);
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
+        return $this->processCustomerAddressDelete($currentUserId, $args['id']);
     }
 
     /**
@@ -74,7 +75,7 @@ private function processCustomerAddressDelete($customerId, $addressId)
     {
         try {
             /** @var AddressInterface $address */
-            $address = $this->addressRepositoryInterface->getById($addressId);
+            $address = $this->addressRepository->getById($addressId);
         } catch (NoSuchEntityException $exception) {
             throw new GraphQlNoSuchEntityException(
                 __('Address id %1 does not exist.', [$addressId])
@@ -95,6 +96,6 @@ private function processCustomerAddressDelete($customerId, $addressId)
                 __('Customer Address %1 is set as default shipping address and can not be deleted', [$addressId])
             );
         }
-        return $this->addressRepositoryInterface->delete($address);
+        return $this->addressRepository->delete($address);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
similarity index 64%
rename from app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
rename to app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
index 63111138e3d73..d126016587ebe 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/AddressUpdate.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -7,10 +7,13 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AddressInterface;
+use Magento\CustomerGraphQl\Model\Customer\AddressDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Eav\Model\Config;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -18,18 +21,21 @@
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\CustomerGraphQl\Model\Resolver\Address\AddressDataProvider;
-use Magento\CustomerGraphQl\Model\Resolver\Address\AddressConfigProvider;
 
 /**
  * Customers address update, used for GraphQL request processing.
  */
-class AddressUpdate implements ResolverInterface
+class UpdateCustomerAddress implements ResolverInterface
 {
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
     /**
      * @var AddressRepositoryInterface
      */
-    private $addressRepositoryInterface;
+    private $addressRepository;
 
     /**
      * @var AddressDataProvider
@@ -37,23 +43,34 @@ class AddressUpdate implements ResolverInterface
     private $addressDataProvider;
 
     /**
-     * @var AddressConfigProvider
+     * @var Config
      */
-    public $addressConfigProvider;
+    private $eavConfig;
 
     /**
-     * @param AddressRepositoryInterface $addressRepositoryInterface
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @param CheckCustomerAccount $checkCustomerAccount
+     * @param AddressRepositoryInterface $addressRepository
      * @param AddressDataProvider $addressDataProvider
-     * @param AddressConfigProvider $addressConfigProvider
+     * @param Config $eavConfig
+     * @param DataObjectHelper $dataObjectHelper
      */
     public function __construct(
-        AddressRepositoryInterface $addressRepositoryInterface,
+        CheckCustomerAccount $checkCustomerAccount,
+        AddressRepositoryInterface $addressRepository,
         AddressDataProvider $addressDataProvider,
-        AddressConfigProvider $addressConfigProvider
+        DataObjectHelper $dataObjectHelper,
+        Config $eavConfig
     ) {
-        $this->addressRepositoryInterface = $addressRepositoryInterface;
+        $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->addressRepository = $addressRepository;
         $this->addressDataProvider = $addressDataProvider;
-        $this->addressConfigProvider = $addressConfigProvider;
+        $this->eavConfig = $eavConfig;
+        $this->dataObjectHelper = $dataObjectHelper;
     }
 
     /**
@@ -66,18 +83,13 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        /** @var \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context */
-        if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
-            throw new GraphQlAuthorizationException(
-                __(
-                    'Current customer does not have access to the resource "%1"',
-                    [AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS]
-                )
-            );
-        }
-        $customerId = $context->getUserId();
+        $currentUserId = $context->getUserId();
+        $currentUserType = $context->getUserType();
+
+        $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
         return $this->addressDataProvider->processCustomerAddress(
-            $this->processCustomerAddressUpdate($customerId, $args['id'], $args['input'])
+            $this->processCustomerAddressUpdate($currentUserId, $args['id'], $args['input'])
         );
     }
 
@@ -89,7 +101,9 @@ public function resolve(
      */
     private function getInputError(array $addressInput)
     {
-        $attributes = $this->addressConfigProvider->getAddressAttributes();
+        $attributes = $this->eavConfig->getEntityAttributes(
+            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
+        );
         foreach ($attributes as $attributeName => $attributeInfo) {
             if ($attributeInfo->getIsRequired()
                 && (isset($addressInput[$attributeName]) && empty($addressInput[$attributeName]))) {
@@ -114,7 +128,7 @@ private function processCustomerAddressUpdate($customerId, $addressId, array $ad
     {
         try {
             /** @var AddressInterface $address */
-            $address = $this->addressRepositoryInterface->getById($addressId);
+            $address = $this->addressRepository->getById($addressId);
         } catch (NoSuchEntityException $exception) {
             throw new GraphQlNoSuchEntityException(
                 __('Address id %1 does not exist.', [$addressId])
@@ -131,8 +145,12 @@ private function processCustomerAddressUpdate($customerId, $addressId, array $ad
                 __('Required parameter %1 is missing', [$errorInput])
             );
         }
-        return $this->addressRepositoryInterface->save(
-            $this->addressConfigProvider->fillAddress($address, $addressInput)
+
+        $this->dataObjectHelper->populateWithArray(
+            $address,
+            $addressInput,
+            AddressInterface::class
         );
+        return $this->addressRepository->save($address);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index f1577679ba709..ea9c8606566a0 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -10,9 +10,9 @@ type Mutation {
     changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes the password for the logged-in customer")
     updateCustomer (input: UpdateCustomerInput!): UpdateCustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update the customer's personal information")
     revokeCustomerToken: RevokeCustomerTokenOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke the customer token")
-    customerAddressCreate(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\AddressCreate") @doc(description: "Create customer address")
-    customerAddressUpdate(id: Int!, input: CustomerAddressInput): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\AddressUpdate") @doc(description: "Update customer address")
-    customerAddressDelete(id: Int!): Boolean @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\AddressDelete") @doc(description: "Delete customer address")
+    createCustomerAddress(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomerAddress") @doc(description: "Create customer address")
+    updateCustomerAddress(id: Int!, input: CustomerAddressInput): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomerAddress") @doc(description: "Update customer address")
+    deleteCustomerAddress(id: Int!): Boolean @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\DeleteCustomerAddress") @doc(description: "Delete customer address")
 }
 
 input CustomerAddressInput {

From cbe1ea39f4cfd7d27d2eb2e7f649555e0ad1ca44 Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Thu, 22 Nov 2018 17:36:31 +0200
Subject: [PATCH 155/932] GraphQL-57: Manage Address Book

-- Refactoring
---
 app/code/Magento/CustomerGraphQl/etc/module.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/etc/module.xml b/app/code/Magento/CustomerGraphQl/etc/module.xml
index 659171ce80735..eeed4862bbbfd 100644
--- a/app/code/Magento/CustomerGraphQl/etc/module.xml
+++ b/app/code/Magento/CustomerGraphQl/etc/module.xml
@@ -6,12 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CustomerGraphQl" >
-        <sequence>
-            <module name="Magento_Customer"/>
-            <module name="Magento_Authorization"/>
-            <module name="Magento_GraphQl"/>
-            <module name="Magento_Eav"/>
-        </sequence>
-    </module>
+    <module name="Magento_CustomerGraphQl"/>
 </config>

From ec4c985e638120161f88046e03df42a2a911e974 Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Thu, 22 Nov 2018 18:51:47 +0200
Subject: [PATCH 156/932] GraphQL-57: Manage Address Book

-- Refactoring
---
 ...est.php => ChangeCustomerPasswordTest.php} |  2 +-
 ...Test.php => CreateCustomerAddressTest.php} | 26 +++++++++----------
 ...Test.php => DeleteCustomerAddressTest.php} | 16 ++++++------
 ...Test.php => UpdateCustomerAddressTest.php} | 20 +++++++-------
 4 files changed, 31 insertions(+), 33 deletions(-)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/{CustomerChangePasswordTest.php => ChangeCustomerPasswordTest.php} (98%)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/{CustomerAddressCreateTest.php => CreateCustomerAddressTest.php} (92%)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/{CustomerAddressDeleteTest.php => DeleteCustomerAddressTest.php} (95%)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/{CustomerAddressUpdateTest.php => UpdateCustomerAddressTest.php} (94%)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
similarity index 98%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
index f245181815217..f4e96e49a58e6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerChangePasswordTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
@@ -14,7 +14,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
-class CustomerChangePasswordTest extends GraphQlAbstract
+class ChangeCustomerPasswordTest extends GraphQlAbstract
 {
     /**
      * @var AccountManagementInterface
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
similarity index 92%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
index 4e2d248b97eb9..da0935e2d659e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -12,11 +12,9 @@
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use PHPUnit\Framework\TestResult;
 
-class CustomerAddressCreateTest extends GraphQlAbstract
+class CreateCustomerAddressTest extends GraphQlAbstract
 {
-
     /**
      * Verify customers with valid credentials create new address
      *
@@ -53,7 +51,7 @@ public function testAddCustomerAddressWithValidCredentials()
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressCreate(input: {
+  createCustomerAddress(input: {
     region: {
         region: "{$newAddress['region']['region']}"
         region_id: {$newAddress['region']['region_id']}
@@ -112,16 +110,16 @@ public function testAddCustomerAddressWithValidCredentials()
         $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
         $customer = $customerRepository->get($userName);
         $response = $this->graphQlQuery($mutation, [], '', $headerMap);
-        $this->assertArrayHasKey('customerAddressCreate', $response);
-        $this->assertArrayHasKey('customer_id', $response['customerAddressCreate']);
-        $this->assertEquals($customer->getId(), $response['customerAddressCreate']['customer_id']);
-        $this->assertArrayHasKey('id', $response['customerAddressCreate']);
+        $this->assertArrayHasKey('createCustomerAddress', $response);
+        $this->assertArrayHasKey('customer_id', $response['createCustomerAddress']);
+        $this->assertEquals($customer->getId(), $response['createCustomerAddress']['customer_id']);
+        $this->assertArrayHasKey('id', $response['createCustomerAddress']);
         /** @var AddressRepositoryInterface $addressRepository */
         $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-        $addressId = $response['customerAddressCreate']['id'];
+        $addressId = $response['createCustomerAddress']['id'];
         $address = $addressRepository->getById($addressId);
-        $this->assertEquals($address->getId(), $response['customerAddressCreate']['id']);
-        $this->assertCustomerAddressesFields($address, $response['customerAddressCreate']);
+        $this->assertEquals($address->getId(), $response['createCustomerAddress']['id']);
+        $this->assertCustomerAddressesFields($address, $response['createCustomerAddress']);
         $this->assertCustomerAddressesFields($address, $newAddress);
     }
 
@@ -136,8 +134,8 @@ public function testAddCustomerAddressWithoutCredentials()
         $mutation
             = <<<MUTATION
 mutation{
-  customerAddressCreate(input: {
-  	prefix: "Mr."
+  createCustomerAddress(input: {
+    prefix: "Mr."
     firstname: "John"
     middlename: "A"
     lastname: "Smith"
@@ -175,7 +173,7 @@ public function testAddCustomerAddressWithMissingAttributeWithValidCredentials()
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressCreate(input: {
+  createCustomerAddress(input: {
     region_id: 4
     country_id: US
     street: ["Line 1 Street","Line 2"]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressDeleteTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
similarity index 95%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressDeleteTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
index e1371e47aab4a..31afe850253f1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressDeleteTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
@@ -14,7 +14,7 @@
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use PHPUnit\Framework\TestResult;
 
-class CustomerAddressDeleteTest extends GraphQlAbstract
+class DeleteCustomerAddressTest extends GraphQlAbstract
 {
     /**
      * Verify customers with valid credentials with a customer bearer token
@@ -38,7 +38,7 @@ public function testDeleteCustomerAddressWithValidCredentials()
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressDelete(id: {$addressId})
+  deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
         /** @var CustomerTokenServiceInterface $customerTokenService */
@@ -46,8 +46,8 @@ public function testDeleteCustomerAddressWithValidCredentials()
         $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
         $response = $this->graphQlQuery($mutation, [], '', $headerMap);
-        $this->assertArrayHasKey('customerAddressDelete', $response);
-        $this->assertEquals(true, $response['customerAddressDelete']);
+        $this->assertArrayHasKey('deleteCustomerAddress', $response);
+        $this->assertEquals(true, $response['deleteCustomerAddress']);
     }
 
     /**
@@ -71,7 +71,7 @@ public function testDeleteCustomerAddressWithoutCredentials()
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressDelete(id: {$addressId})
+  deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
         $this->expectException(\Exception::class);
@@ -105,7 +105,7 @@ public function testDeleteDefaultShippingCustomerAddressWithValidCredentials()
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressDelete(id: {$addressId})
+  deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
         /** @var CustomerTokenServiceInterface $customerTokenService */
@@ -143,7 +143,7 @@ public function testDeleteDefaultBillingCustomerAddressWithValidCredentials()
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressDelete(id: {$addressId})
+  deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
         /** @var CustomerTokenServiceInterface $customerTokenService */
@@ -169,7 +169,7 @@ public function testDeleteNonExistCustomerAddressWithValidCredentials()
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressDelete(id: 9999)
+  deleteCustomerAddress(id: 9999)
 }
 MUTATION;
         /** @var CustomerTokenServiceInterface $customerTokenService */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
similarity index 94%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
index 3f2cad1039452..4bbe2680f2183 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CustomerAddressUpdateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -14,7 +14,7 @@
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use PHPUnit\Framework\TestResult;
 
-class CustomerAddressUpdateTest extends GraphQlAbstract
+class UpdateCustomerAddressTest extends GraphQlAbstract
 {
     /**
      * Verify customers with valid credentials update address
@@ -63,7 +63,7 @@ public function testUpdateCustomerAddressWithValidCredentials()
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressUpdate(id: {$addressId}, input: {
+  updateCustomerAddress(id: {$addressId}, input: {
     region: {
         region: "{$updateAddress['region']['region']}"
         region_id: {$updateAddress['region']['region_id']}
@@ -120,15 +120,15 @@ public function testUpdateCustomerAddressWithValidCredentials()
         $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
         $customer = $customerRepository->get($userName);
         $response = $this->graphQlQuery($mutation, [], '', $headerMap);
-        $this->assertArrayHasKey('customerAddressUpdate', $response);
-        $this->assertArrayHasKey('customer_id', $response['customerAddressUpdate']);
-        $this->assertEquals($customer->getId(), $response['customerAddressUpdate']['customer_id']);
-        $this->assertArrayHasKey('id', $response['customerAddressUpdate']);
+        $this->assertArrayHasKey('updateCustomerAddress', $response);
+        $this->assertArrayHasKey('customer_id', $response['updateCustomerAddress']);
+        $this->assertEquals($customer->getId(), $response['updateCustomerAddress']['customer_id']);
+        $this->assertArrayHasKey('id', $response['updateCustomerAddress']);
         /** @var AddressRepositoryInterface $addressRepository */
         $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
         $address = $addressRepository->getById($addressId);
-        $this->assertEquals($address->getId(), $response['customerAddressUpdate']['id']);
-        $this->assertCustomerAddressesFields($address, $response['customerAddressUpdate']);
+        $this->assertEquals($address->getId(), $response['updateCustomerAddress']['id']);
+        $this->assertCustomerAddressesFields($address, $response['updateCustomerAddress']);
         $this->assertCustomerAddressesFields($address, $updateAddress);
     }
 
@@ -153,7 +153,7 @@ public function testUpdateCustomerAddressWithoutCredentials()
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressUpdate(id:{$addressId}, input: {
+  updateCustomerAddress(id:{$addressId}, input: {
   	city: "New City"
     postcode: "5555"
   }) {
@@ -192,7 +192,7 @@ public function testUpdateCustomerAddressWithMissingAttributeWithValidCredential
         $mutation
             = <<<MUTATION
 mutation {
-  customerAddressUpdate(id: {$addressId}, input: {
+  updateCustomerAddress(id: {$addressId}, input: {
     firstname: ""
     lastname: "Phillis"
   }) {

From c41ec765e1092cd8302eea39c97c634df90c850c Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 22:27:35 +0530
Subject: [PATCH 157/932] Update styles.less

updating suggestions
---
 .../Wishlist/view/frontend/web/css/styles.less     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/web/css/styles.less b/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
index e660fdc10eab4..ac6681b6780ac 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
+++ b/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
@@ -1,10 +1,13 @@
 
 .toolbar {
-    .wishlist-toolbar {
-        .pages {
+    &.wishlist-toolbar{
+        .limiter {
+            float: right;
+        }
+        .main .pages {
             display: inline-block;
             z-index: 0;
-            position: absolute;
+            position: relative;
         }
         .toolbar-amount, .limiter {
             z-index: 1;
@@ -12,8 +15,3 @@
         }
     }
 }
-.toolbar.wishlist-toolbar{
-    .limiter {
-        float: right;
-    }
-}

From e06804215e2b2ce55c8678815ff902db3bbfb7cc Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Thu, 22 Nov 2018 22:28:19 +0530
Subject: [PATCH 158/932] Update Wishlist.php

updating suggestion
---
 app/code/Magento/Wishlist/Block/Customer/Wishlist.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index f84696c928e7a..c4236ce02a0a3 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -108,7 +108,6 @@ public function getWishlistItems()
             $this->_prepareCollection($this->_collection);
             $this->paginateCollection();
         }
-
         return $this->_collection;
     }
 
@@ -119,7 +118,6 @@ public function getWishlistItems()
      */
     protected function _prepareLayout()
     {
-        $this->getWishlistItems();
         parent::_prepareLayout();
         $this->pageConfig->getTitle()->set(__('My Wish List'));
         $this->getChildBlock('wishlist_item_pager')
@@ -140,8 +138,7 @@ protected function _prepareLayout()
             )->setLimit(
                 $this->getLimit()
             )
-            ->setCollection($this->_collection);
-        $this->_collection->load();
+            ->setCollection($this->getWishlistItems());
         return $this;
     }
 

From 370543a7f155e7aff25bf2bbac96d256080a8eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torben=20Ho=CC=88hn?= <torhoehn@gmail.com>
Date: Thu, 22 Nov 2018 19:36:39 +0100
Subject: [PATCH 159/932] added config for newsletter in frontend

---
 .../Magento/Customer/Block/Form/Register.php  |   7 +-
 .../Test/Unit/Block/Form/RegisterTest.php     |  21 ++-
 .../PredispatchNewsletterObserver.php         |  70 +++++++++
 .../PredispatchNewsletterObserverTest.php     | 147 ++++++++++++++++++
 .../Newsletter/etc/adminhtml/system.xml       |   7 +
 app/code/Magento/Newsletter/etc/config.xml    |   3 +
 .../Newsletter/etc/frontend/events.xml        |  12 ++
 .../view/frontend/layout/customer_account.xml |   2 +-
 .../view/frontend/layout/default.xml          |   4 +-
 9 files changed, 265 insertions(+), 8 deletions(-)
 create mode 100644 app/code/Magento/Newsletter/Observer/PredispatchNewsletterObserver.php
 create mode 100644 app/code/Magento/Newsletter/Test/Unit/Observer/PredispatchNewsletterObserverTest.php
 create mode 100644 app/code/Magento/Newsletter/etc/frontend/events.xml

diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index f31012a52a98e..322dd2cbfe915 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -6,6 +6,7 @@
 namespace Magento\Customer\Block\Form;
 
 use Magento\Customer\Model\AccountManagement;
+use Magento\Newsletter\Observer\PredispatchNewsletterObserver;
 
 /**
  * Customer register form block
@@ -86,6 +87,8 @@ public function getConfig($path)
     }
 
     /**
+     * Prepare layout
+     *
      * @return $this
      */
     protected function _prepareLayout()
@@ -177,11 +180,13 @@ public function getRegion()
      */
     public function isNewsletterEnabled()
     {
-        return $this->_moduleManager->isOutputEnabled('Magento_Newsletter');
+        return $this->_moduleManager->isOutputEnabled('Magento_Newsletter')
+            && $this->getConfig(PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE);
     }
 
     /**
      * Restore entity data from session
+     *
      * Entity and form code must be defined for the form
      *
      * @param \Magento\Customer\Model\Metadata\Form $form
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php b/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php
index f1629d61fe924..d234ebfb334d6 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Form/RegisterTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Customer\Block\Form\Register;
 use Magento\Customer\Model\AccountManagement;
+use Magento\Newsletter\Observer\PredispatchNewsletterObserver;
 
 /**
  * Test class for \Magento\Customer\Block\Form\Register.
@@ -274,12 +275,13 @@ public function testGetRegionNull()
     }
 
     /**
-     * @param $isNewsletterEnabled
-     * @param $expectedValue
+     * @param boolean $isNewsletterEnabled
+     * @param string $isNewsletterActive
+     * @param boolean $expectedValue
      *
      * @dataProvider isNewsletterEnabledProvider
      */
-    public function testIsNewsletterEnabled($isNewsletterEnabled, $expectedValue)
+    public function testIsNewsletterEnabled($isNewsletterEnabled, $isNewsletterActive, $expectedValue)
     {
         $this->_moduleManager->expects(
             $this->once()
@@ -290,6 +292,17 @@ public function testIsNewsletterEnabled($isNewsletterEnabled, $expectedValue)
         )->will(
             $this->returnValue($isNewsletterEnabled)
         );
+
+        $this->_scopeConfig->expects(
+            $this->any()
+        )->method(
+            'getValue'
+        )->with(
+            PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE
+        )->will(
+            $this->returnValue($isNewsletterActive)
+        );
+
         $this->assertEquals($expectedValue, $this->_block->isNewsletterEnabled());
     }
 
@@ -298,7 +311,7 @@ public function testIsNewsletterEnabled($isNewsletterEnabled, $expectedValue)
      */
     public function isNewsletterEnabledProvider()
     {
-        return [[true, true], [false, false]];
+        return [[true, true, true], [true, false, false], [false, true, false], [false, false, false]];
     }
 
     /**
diff --git a/app/code/Magento/Newsletter/Observer/PredispatchNewsletterObserver.php b/app/code/Magento/Newsletter/Observer/PredispatchNewsletterObserver.php
new file mode 100644
index 0000000000000..9860798b2b9f3
--- /dev/null
+++ b/app/code/Magento/Newsletter/Observer/PredispatchNewsletterObserver.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\Newsletter\Observer;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Class PredispatchNewsletterObserver
+ */
+class PredispatchNewsletterObserver implements ObserverInterface
+{
+    /**
+     * Configuration path to newsletter active setting
+     */
+    const XML_PATH_NEWSLETTER_ACTIVE = 'newsletter/general/active';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * PredispatchNewsletterObserver constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param UrlInterface $url
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig, UrlInterface $url)
+    {
+        $this->scopeConfig = $scopeConfig;
+        $this->url = $url;
+    }
+
+    /**
+     * Redirect newsletter routes to 404 when newsletter module is disabled.
+     *
+     * @param Observer $observer
+     */
+    public function execute(Observer $observer) : void
+    {
+        if (!$this->scopeConfig->getValue(
+            self::XML_PATH_NEWSLETTER_ACTIVE,
+            ScopeInterface::SCOPE_STORE
+        )
+        ) {
+            $defaultNoRouteUrl = $this->scopeConfig->getValue(
+                'web/default/no_route',
+                ScopeInterface::SCOPE_STORE
+            );
+            $redirectUrl = $this->url->getUrl($defaultNoRouteUrl);
+            $observer->getControllerAction()
+                ->getResponse()
+                ->setRedirect($redirectUrl);
+        }
+    }
+}
diff --git a/app/code/Magento/Newsletter/Test/Unit/Observer/PredispatchNewsletterObserverTest.php b/app/code/Magento/Newsletter/Test/Unit/Observer/PredispatchNewsletterObserverTest.php
new file mode 100644
index 0000000000000..38d69e5128af1
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Unit/Observer/PredispatchNewsletterObserverTest.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\Newsletter\Test\Unit\Observer;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
+use Magento\Newsletter\Observer\PredispatchNewsletterObserver;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test class for \Magento\Newsletter\Observer\PredispatchNewsletterObserver
+ */
+class PredispatchNewsletterObserverTest extends TestCase
+{
+    /**
+     * @var Observer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mockObject;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlMock;
+
+    /**
+     * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $redirectMock;
+
+    /**
+     * @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseMock;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp() : void
+    {
+        $this->configMock = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->urlMock = $this->getMockBuilder(UrlInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->responseMock = $this->getMockBuilder(ResponseInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setRedirect'])
+            ->getMockForAbstractClass();
+        $this->redirectMock = $this->getMockBuilder(RedirectInterface::class)
+            ->getMock();
+        $this->objectManager = new ObjectManager($this);
+        $this->mockObject = $this->objectManager->getObject(
+            PredispatchNewsletterObserver::class,
+            [
+                'scopeConfig' => $this->configMock,
+                'url' => $this->urlMock
+            ]
+        );
+    }
+
+    /**
+     * Test with enabled newsletter active config.
+     */
+    public function testNewsletterEnabled() : void
+    {
+        $observerMock = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getResponse', 'getData', 'setRedirect'])
+            ->getMockForAbstractClass();
+
+        $this->configMock->method('getValue')
+            ->with(PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE, ScopeInterface::SCOPE_STORE)
+            ->willReturn(true);
+        $observerMock->expects($this->never())
+            ->method('getData')
+            ->with('controller_action')
+            ->willReturnSelf();
+
+        $observerMock->expects($this->never())
+            ->method('getResponse')
+            ->willReturnSelf();
+
+        $this->assertNull($this->mockObject->execute($observerMock));
+    }
+
+    /**
+     * Test with disabled newsletter active config.
+     */
+    public function testNewsletterDisabled() : void
+    {
+        $observerMock = $this->getMockBuilder(Observer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getControllerAction', 'getResponse'])
+            ->getMockForAbstractClass();
+
+        $this->configMock->expects($this->at(0))
+            ->method('getValue')
+            ->with(PredispatchNewsletterObserver::XML_PATH_NEWSLETTER_ACTIVE, ScopeInterface::SCOPE_STORE)
+            ->willReturn(false);
+
+        $expectedRedirectUrl = 'https://test.com/index';
+
+        $this->configMock->expects($this->at(1))
+            ->method('getValue')
+            ->with('web/default/no_route', ScopeInterface::SCOPE_STORE)
+            ->willReturn($expectedRedirectUrl);
+
+        $this->urlMock->expects($this->once())
+            ->method('getUrl')
+            ->willReturn($expectedRedirectUrl);
+
+        $observerMock->expects($this->once())
+            ->method('getControllerAction')
+            ->willReturnSelf();
+
+        $observerMock->expects($this->once())
+            ->method('getResponse')
+            ->willReturn($this->responseMock);
+
+        $this->responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->with($expectedRedirectUrl);
+
+        $this->assertNull($this->mockObject->execute($observerMock));
+    }
+}
diff --git a/app/code/Magento/Newsletter/etc/adminhtml/system.xml b/app/code/Magento/Newsletter/etc/adminhtml/system.xml
index 1173f64310304..682d0ff90447e 100644
--- a/app/code/Magento/Newsletter/etc/adminhtml/system.xml
+++ b/app/code/Magento/Newsletter/etc/adminhtml/system.xml
@@ -11,6 +11,13 @@
             <label>Newsletter</label>
             <tab>customer</tab>
             <resource>Magento_Newsletter::newsletter</resource>
+            <group id="general" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>General Options</label>
+                <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Enabled</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+            </group>
             <group id="subscription" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Subscription Options</label>
                 <field id="allow_guest_subscribe" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
diff --git a/app/code/Magento/Newsletter/etc/config.xml b/app/code/Magento/Newsletter/etc/config.xml
index f976ece8d712f..4c5e385105cf9 100644
--- a/app/code/Magento/Newsletter/etc/config.xml
+++ b/app/code/Magento/Newsletter/etc/config.xml
@@ -8,6 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <newsletter>
+            <general>
+                <active>1</active>
+            </general>
             <subscription>
                 <allow_guest_subscribe>1</allow_guest_subscribe>
                 <confirm>0</confirm>
diff --git a/app/code/Magento/Newsletter/etc/frontend/events.xml b/app/code/Magento/Newsletter/etc/frontend/events.xml
new file mode 100644
index 0000000000000..6c46d562f5167
--- /dev/null
+++ b/app/code/Magento/Newsletter/etc/frontend/events.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="controller_action_predispatch_newsletter">
+        <observer name="newsletter_enabled" instance="Magento\Newsletter\Observer\PredispatchNewsletterObserver" />
+    </event>
+</config>
diff --git a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
index 99190bb35fcf4..fd55fce8ee016 100644
--- a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="customer_account_navigation">
-            <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-newsletter-subscriptions-link">
+            <block class="Magento\Customer\Block\Account\SortLinkInterface" ifconfig="newsletter/general/active" name="customer-account-navigation-newsletter-subscriptions-link">
                 <arguments>
                     <argument name="path" xsi:type="string">newsletter/manage</argument>
                     <argument name="label" xsi:type="string" translate="true">Newsletter Subscriptions</argument>
diff --git a/app/code/Magento/Newsletter/view/frontend/layout/default.xml b/app/code/Magento/Newsletter/view/frontend/layout/default.xml
index d84f4894a9d2e..32a08359333c9 100644
--- a/app/code/Magento/Newsletter/view/frontend/layout/default.xml
+++ b/app/code/Magento/Newsletter/view/frontend/layout/default.xml
@@ -8,10 +8,10 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="head.components">
-            <block class="Magento\Framework\View\Element\Js\Components" name="newsletter_head_components" template="Magento_Newsletter::js/components.phtml"/>
+            <block class="Magento\Framework\View\Element\Js\Components" name="newsletter_head_components" template="Magento_Newsletter::js/components.phtml" ifconfig="newsletter/general/active"/>
         </referenceBlock>
         <referenceContainer name="footer">
-            <block class="Magento\Newsletter\Block\Subscribe" name="form.subscribe" as="subscribe" before="-" template="Magento_Newsletter::subscribe.phtml"/>
+            <block class="Magento\Newsletter\Block\Subscribe" name="form.subscribe" as="subscribe" before="-" template="Magento_Newsletter::subscribe.phtml" ifconfig="newsletter/general/active"/>
         </referenceContainer>
     </body>
 </page>

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 160/932] 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 8b06ed6f1bc5b1c72294b8c05518302915f3bb4f Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Fri, 23 Nov 2018 18:16:26 +0530
Subject: [PATCH 161/932] Update Wishlist.php

updating access level
---
 app/code/Magento/Wishlist/Block/Customer/Wishlist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index c4236ce02a0a3..cc9c95935eada 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -87,7 +87,7 @@ protected function _prepareCollection($collection)
      *
      * @return void
      */
-    public function paginateCollection()
+    private function paginateCollection()
     {
         $page = $this->getRequest()->getParam("p", 1);
         $limit = $this->getRequest()->getParam("limit", 10);

From 5e2bbb669eddbe6228e07a5caaf509c59880b0f2 Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Fri, 23 Nov 2018 18:17:04 +0530
Subject: [PATCH 162/932] Update wishlist_index_index.xml

removing head block
---
 .../Wishlist/view/frontend/layout/wishlist_index_index.xml     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
index 458cd6edfbe6b..d3f21dda9ccde 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
@@ -7,9 +7,6 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="customer_account"/>
-    <head>
-        <css src="Magento_Wishlist::css/styles.css"/>
-    </head>
     <body>
         <referenceBlock name="head.components">
             <block class="Magento\Framework\View\Element\Js\Components" name="wishlist_head_components" template="Magento_Wishlist::js/components.phtml"/>

From bd89f7b38ab05aa09adfdaa84c61eb252c5adbde Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Fri, 23 Nov 2018 18:17:44 +0530
Subject: [PATCH 163/932] Delete styles.less

no need of this file
---
 .../Wishlist/view/frontend/web/css/styles.less  | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 app/code/Magento/Wishlist/view/frontend/web/css/styles.less

diff --git a/app/code/Magento/Wishlist/view/frontend/web/css/styles.less b/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
deleted file mode 100644
index ac6681b6780ac..0000000000000
--- a/app/code/Magento/Wishlist/view/frontend/web/css/styles.less
+++ /dev/null
@@ -1,17 +0,0 @@
-
-.toolbar {
-    &.wishlist-toolbar{
-        .limiter {
-            float: right;
-        }
-        .main .pages {
-            display: inline-block;
-            z-index: 0;
-            position: relative;
-        }
-        .toolbar-amount, .limiter {
-            z-index: 1;
-            display: inline-block;
-        }
-    }
-}

From 35c033e764540a4950b16e5e0c1845fde8c861f6 Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Fri, 23 Nov 2018 18:18:53 +0530
Subject: [PATCH 164/932] Update _module.less

updating css for pagination toolbar
---
 .../web/css/source/_module.less                 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
index 0e8350261e002..83c5c4095a38d 100644
--- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
@@ -8,6 +8,23 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
+    .toolbar {
+        &.wishlist-toolbar{
+            .limiter {
+                float: right;
+            }
+            .main .pages {
+                display: inline-block;
+                z-index: 0;
+                position: relative;
+            }
+            .toolbar-amount, .limiter {
+                z-index: 1;
+                display: inline-block;
+            }
+        }
+    }
+
     .form.wishlist.items {
         .actions-toolbar {
             &:extend(.abs-reset-left-margin all);

From 4fbcf8c8a5f307b52d8bf4a17ca8d3bbb48469eb Mon Sep 17 00:00:00 2001
From: Ratnesh Kumar <ratnesh@webkul.com>
Date: Fri, 23 Nov 2018 18:19:11 +0530
Subject: [PATCH 165/932] Update _module.less

updating css for pagination toolbar
---
 .../web/css/source/_module.less                 | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 584eefb9bc643..3213c035df412 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -8,6 +8,23 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
+    .toolbar {
+        &.wishlist-toolbar{
+            .limiter {
+                float: right;
+            }
+            .main .pages {
+                display: inline-block;
+                z-index: 0;
+                position: relative;
+            }
+            .toolbar-amount, .limiter {
+                z-index: 1;
+                display: inline-block;
+            }
+        }
+    }
+
     .form.wishlist.items {
         .actions-toolbar {
             &:extend(.abs-reset-left-margin all);

From c6fdd50a082d1aae5de76958c35aa9da3e1e6212 Mon Sep 17 00:00:00 2001
From: Jasper Zeinstra <jasper.zeinstra@mediact.nl>
Date: Fri, 23 Nov 2018 14:39:25 +0100
Subject: [PATCH 166/932] Add unit test classes

---
 .../Model/Plugin/Frontend/ProductTest.php     | 73 ++++++++++++++++++
 .../Frontend/ProductIdentitiesExtender.php    | 10 +--
 .../ProductIdentitiesExtenderTest.php         | 77 +++++++++++++++++++
 3 files changed, 151 insertions(+), 9 deletions(-)
 create mode 100644 app/code/Magento/Bundle/Test/Unit/Model/Plugin/Frontend/ProductTest.php
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php

diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Plugin/Frontend/ProductTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/Frontend/ProductTest.php
new file mode 100644
index 0000000000000..ee08618eab5dd
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/Frontend/ProductTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Bundle\Test\Unit\Model\Plugin\Frontend;
+
+use Magento\Bundle\Model\Plugin\Frontend\Product as ProductPlugin;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Catalog\Model\Product;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class ProductTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var  \Magento\Bundle\Model\Plugin\Product */
+    private $plugin;
+
+    /** @var  MockObject|Type */
+    private $type;
+
+    /** @var  MockObject|\Magento\Catalog\Model\Product */
+    private $product;
+
+    protected function setUp()
+    {
+        $this->product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getEntityId'])
+            ->getMock();
+
+        $this->type = $this->getMockBuilder(Type::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getChildrenIds'])
+            ->getMock();
+
+        $this->plugin = new ProductPlugin($this->type);
+    }
+
+    public function testAfterGetIdentities()
+    {
+        $baseIdentities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+        ];
+        $id = 12345;
+        $childIds = [
+            1 => [1, 2, 5, 100500],
+            12 => [7, 22, 45, 24612]
+        ];
+        $expectedIdentities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+            Product::CACHE_TAG . '_' . 1,
+            Product::CACHE_TAG . '_' . 2,
+            Product::CACHE_TAG . '_' . 5,
+            Product::CACHE_TAG . '_' . 100500,
+            Product::CACHE_TAG . '_' . 7,
+            Product::CACHE_TAG . '_' . 22,
+            Product::CACHE_TAG . '_' . 45,
+            Product::CACHE_TAG . '_' . 24612,
+        ];
+        $this->product->expects($this->once())
+            ->method('getEntityId')
+            ->will($this->returnValue($id));
+        $this->type->expects($this->once())
+            ->method('getChildrenIds')
+            ->with($id)
+            ->will($this->returnValue($childIds));
+        $identities = $this->plugin->afterGetIdentities($this->product, $baseIdentities);
+        $this->assertEquals($expectedIdentities, $identities);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
index 2c002acf938f4..92b7ab0d88ea8 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtender.php
@@ -8,7 +8,6 @@
 namespace Magento\ConfigurableProduct\Model\Plugin\Frontend;
 
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 
 /**
@@ -21,19 +20,12 @@ class ProductIdentitiesExtender
      */
     private $configurableType;
 
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-
     /**
      * @param Configurable $configurableType
-     * @param ProductRepositoryInterface $productRepository
      */
-    public function __construct(Configurable $configurableType, ProductRepositoryInterface $productRepository)
+    public function __construct(Configurable $configurableType)
     {
         $this->configurableType = $configurableType;
-        $this->productRepository = $productRepository;
     }
 
     /**
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
new file mode 100644
index 0000000000000..b4fb5ccfaa558
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Model\Plugin\Frontend;
+
+use Magento\ConfigurableProduct\Model\Plugin\Frontend\ProductIdentitiesExtender;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Model\Product;
+
+/**
+ * Class ProductIdentitiesExtenderTest
+ */
+class ProductIdentitiesExtenderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|Configurable
+     */
+    private $configurableTypeMock;
+
+    /**
+     * @var ProductIdentitiesExtender
+     */
+    private $plugin;
+
+    /** @var  MockObject|\Magento\Catalog\Model\Product */
+    private $product;
+
+    protected function setUp()
+    {
+        $this->product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId'])
+            ->getMock();
+
+        $this->configurableTypeMock = $this->getMockBuilder(Configurable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->plugin = new ProductIdentitiesExtender($this->configurableTypeMock);
+    }
+
+    public function testAfterGetIdentities()
+    {
+        $identities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+        ];
+        $productId = 12345;
+        $childIdentities = [
+            0 => [1, 2, 5, 100500]
+        ];
+        $expectedIdentities = [
+            'SomeCacheId',
+            'AnotherCacheId',
+            Product::CACHE_TAG . '_' . 1,
+            Product::CACHE_TAG . '_' . 2,
+            Product::CACHE_TAG . '_' . 5,
+            Product::CACHE_TAG . '_' . 100500,
+        ];
+
+        $this->product->expects($this->once())
+            ->method('getId')
+            ->willReturn($productId);
+
+        $this->configurableTypeMock->expects($this->once())
+            ->method('getChildrenIds')
+            ->with($productId)
+            ->willReturn($childIdentities);
+
+        $productIdentities = $this->plugin->afterGetIdentities($this->product, $identities);
+        $this->assertEquals($expectedIdentities, $productIdentities);
+    }
+}

From c4f9a02b53bdc0aed4f0374731e6f785d30b02da Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Sat, 24 Nov 2018 15:11:29 +0530
Subject: [PATCH 167/932] fixed Negative order amount in dashboard - #18754

---
 .../Magento/Reports/Model/ResourceModel/Order/Collection.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 82ebc74a0468e..06b71ee0490bb 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -825,7 +825,7 @@ protected function getTotalsExpression(
     ) {
         $template = ($storeId != 0)
             ? '(main_table.base_subtotal - %2$s - %1$s - ABS(main_table.base_discount_amount) - %3$s)'
-            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) - %3$s) '
+            : '((main_table.base_subtotal - %1$s - %2$s - ABS(main_table.base_discount_amount) + %3$s) '
                 . ' * main_table.base_to_global_rate)';
         return sprintf($template, $baseSubtotalRefunded, $baseSubtotalCanceled, $baseDiscountCanceled);
     }

From 00f4f7dcbc1a9e236eb6c9c84001efcd49c92df1 Mon Sep 17 00:00:00 2001
From: Burlacu Vasilii <v.burlacu@atwix.com>
Date: Sun, 1 Apr 2018 13:48:22 +0300
Subject: [PATCH 168/932] Updated Magento_Rule rules.js file

Added calendar initializaton for Conditional Rules when a rule is created for the 1st time
---
 app/code/Magento/Rule/view/adminhtml/web/rules.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Rule/view/adminhtml/web/rules.js b/app/code/Magento/Rule/view/adminhtml/web/rules.js
index b094b9818364a..8e36562ebd7fe 100644
--- a/app/code/Magento/Rule/view/adminhtml/web/rules.js
+++ b/app/code/Magento/Rule/view/adminhtml/web/rules.js
@@ -220,6 +220,8 @@ define([
 
             var elem = Element.down(elemContainer, 'input.input-text');
 
+            jQuery(elem).trigger('contentUpdated');
+
             if (elem) {
                 elem.focus();
 

From 40086305aef6638d1004e8b4b0f86bc051732714 Mon Sep 17 00:00:00 2001
From: Vasilii Burlacu <v.burlacu@atwix.com>
Date: Sat, 11 Aug 2018 20:42:10 +0300
Subject: [PATCH 169/932] Disabled autocomplete for datepicker (calendar) input
 field

---
 lib/web/mage/calendar.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index ac154b333801d..e86bac6718112 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -379,6 +379,9 @@
                 .addClass('v-middle')
                 .text('') // Remove jQuery UI datepicker generated image
                 .append('<span>' + pickerButtonText + '</span>');
+
+            $(element).attr('autocomplete', 'off');
+
             this._setCurrentDate(element);
         },
 

From e6323fb113d97e6e03bfec9eb2760e584cc8f8a4 Mon Sep 17 00:00:00 2001
From: Vasilii Burlacu <v.burlacu@atwix.com>
Date: Thu, 8 Nov 2018 12:51:38 +0200
Subject: [PATCH 170/932] magento/magento2:#4136 - Widget condition with
 unexpected character not preventing from saving

- Restricted user to change date input value
- Open datepicker popup once user click on the date to be changed
---
 .../Model/Condition/AbstractCondition.php     |  3 +++
 .../Magento/backend/web/css/styles-old.less   | 20 +++++++++++++++++++
 .../Data/Form/Element/AbstractElement.php     |  1 +
 .../Framework/Data/Form/Element/Date.php      |  2 +-
 .../Unit/Form/Element/AbstractElementTest.php |  1 +
 lib/web/mage/calendar.js                      |  2 --
 6 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
index a1987f67e47f2..dcf742ee91103 100644
--- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -615,6 +615,9 @@ public function getValueElement()
             // date format intentionally hard-coded
             $elementParams['input_format'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
             $elementParams['date_format'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
+            $elementParams['placeholder'] = \Magento\Framework\Stdlib\DateTime::DATE_INTERNAL_FORMAT;
+            $elementParams['autocomplete'] = 'off';
+            $elementParams['readonly'] = 'true';
         }
         return $this->getForm()->addField(
             $this->getPrefix() . '__' . $this->getId() . '__value',
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 74098f127eb73..7dd80c158534d 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -3840,6 +3840,26 @@
 
     .rule-param-edit .element {
         display: inline;
+        position: relative;
+    }
+
+    .rule-param-edit .element input.input-date,
+    .rule-param-edit .element input.input-date[readonly] {
+        background-color: @color-white;
+        min-width: 140px;
+        width: 140px !important;
+        cursor: pointer;
+        text-align: center;
+        opacity: 1;
+        margin-right: 10px;
+        padding-right: 40px;
+
+        + .ui-datepicker-trigger {
+            position: absolute;
+            width: 140px;
+            text-align: right;
+            left: 0;
+        }
     }
 
     .rule-param-edit .element .addafter {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index a8451e43ade20..ac9cdd3822ec5 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -238,6 +238,7 @@ public function getHtmlAttributes()
             'onchange',
             'disabled',
             'readonly',
+            'autocomplete',
             'tabindex',
             'placeholder',
             'data-form-part',
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
index ed5457edc7f3f..1920115ff0a3a 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -146,7 +146,7 @@ public function getValueInstance()
      */
     public function getElementHtml()
     {
-        $this->addClass('admin__control-text  input-text');
+        $this->addClass('admin__control-text input-text input-date');
         $dateFormat = $this->getDateFormat() ?: $this->getFormat();
         $timeFormat = $this->getTimeFormat();
         if (empty($dateFormat)) {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
index e29b1dcf441e4..a85c1f4aa450c 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
@@ -195,6 +195,7 @@ public function testGetHtmlAttributes()
             'onchange',
             'disabled',
             'readonly',
+            'autocomplete',
             'tabindex',
             'placeholder',
             'data-form-part',
diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index e86bac6718112..6724a11b7b5b0 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -380,8 +380,6 @@
                 .text('') // Remove jQuery UI datepicker generated image
                 .append('<span>' + pickerButtonText + '</span>');
 
-            $(element).attr('autocomplete', 'off');
-
             this._setCurrentDate(element);
         },
 

From 80fed1b5348ee1f5038700ad4e7966c45ae805f4 Mon Sep 17 00:00:00 2001
From: Vasilii Burlacu <v.burlacu@atwix.com>
Date: Tue, 13 Nov 2018 09:30:40 +0200
Subject: [PATCH 171/932] magento/magento2:#4136 - Widget condition with
 unexpected character not preventing from saving

- Added autocomplete option for calendar.js
---
 lib/web/mage/calendar.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index 6724a11b7b5b0..a9ccf2cf787f9 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -66,6 +66,9 @@
      * Widget calendar
      */
     $.widget('mage.calendar', {
+        options: {
+            autoComplete: true
+        },
 
         /**
          * Merge global options with options passed to widget invoke
@@ -380,6 +383,8 @@
                 .text('') // Remove jQuery UI datepicker generated image
                 .append('<span>' + pickerButtonText + '</span>');
 
+            $(element).attr('autocomplete', this.options.autoComplete ? 'on' : 'off');
+
             this._setCurrentDate(element);
         },
 

From 6c2e4c774d8ec0dbca14c0c02c985b93728d1f5f Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Mon, 26 Nov 2018 11:23:43 +0400
Subject: [PATCH 172/932] MAGETWO-95820: Order placed by new customer before
 they registered is displayed in the admin under the name Guest

- Add fix after review
---
 .../Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
index 2e2dee82a6eaf..38a23e43d426a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -15,7 +15,8 @@
             <title value="Check Customer Information Created By Guest"/>
             <description value="Check customer information after placing the order as the guest who created an account"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-95820"/>
+            <testCaseId value="MAGETWO-95932"/>
+            <useCaseId value="MAGETWO-95820"/>
             <group value="checkout"/>
         </annotations>
 
@@ -29,6 +30,7 @@
         </before>
 
         <after>
+            <createData entity="DisableAllowGuestCheckout" stepKey="enableGuestCheckout"/>
             <deleteData createDataKey="product" stepKey="deleteProduct" />
             <deleteData createDataKey="category" stepKey="deleteCategory" />
             <actionGroup ref="logout" stepKey="logoutFromAdmin"/>

From 1ea5632e9a44e1b341273e1322c4a4bf161026d5 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Mon, 26 Nov 2018 12:28:59 +0400
Subject: [PATCH 173/932] MAGETWO-95820: Order placed by new customer before
 they registered is displayed in the admin under the name Guest

- Add minor change after internal review
---
 .../Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
index 38a23e43d426a..a781315f7cb0a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -30,7 +30,7 @@
         </before>
 
         <after>
-            <createData entity="DisableAllowGuestCheckout" stepKey="enableGuestCheckout"/>
+            <createData entity="DisableAllowGuestCheckout" stepKey="disableGuestCheckout"/>
             <deleteData createDataKey="product" stepKey="deleteProduct" />
             <deleteData createDataKey="category" stepKey="deleteCategory" />
             <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
@@ -50,7 +50,9 @@
             <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
             <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
         </actionGroup>
+        <wait stepKey="asd" time="15"/>
         <grabTextFrom selector="{{CheckoutSuccessRegisterSection.orderNumber}}" stepKey="grabOrderNumber"/>
+        <wait stepKey="asdasd" time="15"/>
         <click selector="{{CustomerAccountSection.createAccount}}" stepKey="clickToCreateAccount"/>
         <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CustomerData.password}}" stepKey="TypePassword"/>
         <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CustomerData.password}}" stepKey="TypeConfirmationPassword"/>

From 46fd447c15e196735ee88af0441fd96678afdfa8 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Mon, 26 Nov 2018 12:30:19 +0400
Subject: [PATCH 174/932] MAGETWO-95820: Order placed by new customer before
 they registered is displayed in the admin under the name Guest

- Add minor change after internal review
---
 .../Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
index a781315f7cb0a..740d75cb0ffe3 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -50,9 +50,7 @@
             <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
             <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
         </actionGroup>
-        <wait stepKey="asd" time="15"/>
         <grabTextFrom selector="{{CheckoutSuccessRegisterSection.orderNumber}}" stepKey="grabOrderNumber"/>
-        <wait stepKey="asdasd" time="15"/>
         <click selector="{{CustomerAccountSection.createAccount}}" stepKey="clickToCreateAccount"/>
         <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CustomerData.password}}" stepKey="TypePassword"/>
         <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CustomerData.password}}" stepKey="TypeConfirmationPassword"/>

From 62f708b296b5e6f9e96927d87c8a32c4f083fd94 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Mon, 26 Nov 2018 13:19:53 +0400
Subject: [PATCH 175/932] MAGETWO-95819: Customer registration fields not
 translated

- Delete test for moving it another module
---
 .../Test/StoreFrontSwitchStoreViewTest.xml    | 53 -------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 app/code/Magento/Eav/Test/Mftf/Test/StoreFrontSwitchStoreViewTest.xml

diff --git a/app/code/Magento/Eav/Test/Mftf/Test/StoreFrontSwitchStoreViewTest.xml b/app/code/Magento/Eav/Test/Mftf/Test/StoreFrontSwitchStoreViewTest.xml
deleted file mode 100644
index 518ca92b8789c..0000000000000
--- a/app/code/Magento/Eav/Test/Mftf/Test/StoreFrontSwitchStoreViewTest.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StoreFrontSwitchStoreViewTest">
-        <annotations>
-            <title value="Managing labels for customer attribute while creation new account"/>
-            <description value="Managing labels for customer attribute while creation new account"/>
-            <features value="Module/ Eav"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-95997"/>
-            <stories value="Guest should be able to switch store view"/>
-            <group value="eav"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSwedishStoreView">
-                <argument name="customStore" value="swedishStoreGroup"/>
-            </actionGroup>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFinnishStoreView">
-                <argument name="customStore" value="finnishStoreGroup"/>
-            </actionGroup>
-        </before>
-        <after>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteSwedishStoreView">
-                <argument name="customStore" value="swedishStoreGroup"/>
-            </actionGroup>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteFinnishStoreView">
-                <argument name="customStore" value="finnishStoreGroup"/>
-            </actionGroup>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <amOnPage url="{{CustomerAttributesLastNamePage.url}}" stepKey="amOnPageCustomerAttributePage"/>
-        <see stepKey="seeLastNamePage" userInput="Last Name"/>
-        <click stepKey="clickOnManageLabelTab" selector="{{AdminCustomerAttributeSection.manageLabel}}"/>
-        <fillField stepKey="fillSwedishLastName" selector="{{AdminCustomerLastNameAttributeSection.secondLastNameInput}}" userInput="{{AttributeLastName.swedish}}"/>
-        <fillField stepKey="fillFinnishLastName" selector="{{AdminCustomerLastNameAttributeSection.thirdLastNameInput}}" userInput="{{AttributeLastName.finnish}}"/>
-        <click stepKey="save" selector="{{CustomerAccountSection.save}}"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-        <amOnPage url="{{StorefrontCustomerCreatePage.url}}" stepKey="goToStoreFront"/>
-        <waitForPageLoad stepKey="waitForAccountCreationPage"/>
-        <reloadPage stepKey="refreshPage"/>
-        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStoreView">
-            <argument name="storeView" value="swedishStoreGroup"/>
-        </actionGroup>
-        <see stepKey="seeLastNameInSwedish" selector="{{StorefrontCustomerCreateFormSection.lastnameLabel}}" userInput="{{AttributeLastName.swedish}}"/>
-    </test>
-</tests>

From df27ac362cbf5dc36e7a5429ed36decebff2b2b5 Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Mon, 26 Nov 2018 16:42:48 +0300
Subject: [PATCH 176/932] MAGETWO-96408: [2.3.x] [Magento Cloud] Error when
 saving Bundle product with a Scheduled Update

- Fixed removing option values
---
 .../Bundle/Model/Product/SaveHandler.php        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
index fc215aa6b8e20..4f6d2d51ffda5 100644
--- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -58,6 +58,8 @@ public function __construct(
     }
 
     /**
+     * Perform action on Bundle product relation/extension attribute
+     *
      * @param object $entity
      * @param array $arguments
      *
@@ -83,7 +85,7 @@ public function execute($entity, $arguments = [])
             : [];
 
         if (!$entity->getCopyFromView()) {
-            $this->processRemovedOptions($entity->getSku(), $existingOptionsIds, $optionIds);
+            $this->processRemovedOptions($entity, $existingOptionsIds, $optionIds);
             $newOptionsIds = array_diff($optionIds, $existingOptionsIds);
             $this->saveOptions($entity, $bundleProductOptions, $newOptionsIds);
         } else {
@@ -96,6 +98,8 @@ public function execute($entity, $arguments = [])
     }
 
     /**
+     * Remove option product links
+     *
      * @param string $entitySku
      * @param \Magento\Bundle\Api\Data\OptionInterface $option
      * @return void
@@ -154,16 +158,19 @@ private function getOptionIds(array $options): array
     /**
      * Removes old options that no longer exists.
      *
-     * @param string $entitySku
+     * @param \Magento\Catalog\Api\Data\ProductInterface|object $entity
      * @param array $existingOptionsIds
      * @param array $optionIds
      * @return void
      */
-    private function processRemovedOptions(string $entitySku, array $existingOptionsIds, array $optionIds): void
+    private function processRemovedOptions(object $entity, array $existingOptionsIds, array $optionIds): void
     {
+        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $parentId = $entity->getData($metadata->getLinkField());
         foreach (array_diff($existingOptionsIds, $optionIds) as $optionId) {
-            $option = $this->optionRepository->get($entitySku, $optionId);
-            $this->removeOptionLinks($entitySku, $option);
+            $option = $this->optionRepository->get($entity->getSku(), $optionId);
+            $option->setParentId($parentId);
+            $this->removeOptionLinks($entity->getSku(), $option);
             $this->optionRepository->delete($option);
         }
     }

From 65018524ccfcdff8b60a49d30b099c6cbffdc31e Mon Sep 17 00:00:00 2001
From: Dave Macaulay <dmacaulay@magento.com>
Date: Mon, 26 Nov 2018 16:02:34 -0600
Subject: [PATCH 177/932] MC-3812: Text/Banner - Stage Inline Editor becomes
 focused and editable after clicking Save button on Edit Form
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Use correct API for setting content to ensure unexpected focusing doesn’t occur
---
 lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
index ede8dd2081fdf..2d7ea07cd823e 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
@@ -350,7 +350,7 @@ define([
          * @param {String} content
          */
         setContent: function (content) {
-            this.get(this.getId()).execCommand('mceSetContent', false, content);
+            this.get(this.getId()).setContent(content);
         },
 
         /**

From 0cabc15ce233e4b16c665733a6aad4aa1d9944ca Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal.solanki@krishtechnolabs.com>
Date: Tue, 27 Nov 2018 10:57:24 +0530
Subject: [PATCH 178/932] Remove ID selector from css fix-issue 19328

---
 .../Magento/backend/web/css/source/components/_messages.less  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
index 09ffa8e72720c..8a0af06cfdb5b 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
@@ -76,7 +76,7 @@
         position: absolute;
         speak: none;
         text-shadow: none;
-        top: 1.3rem;
+        top: 1.5rem;
         width: auto;
     }
 }
@@ -121,7 +121,7 @@
     }
 }
 
-#import_validation_container  {
+.adminhtml-import-index   {
     .message-success {
         &:before {
             color: @alert-icon__success__color;

From d0d8725d9a3534426394870cf7f02aa1ad442bbc Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Tue, 27 Nov 2018 11:03:41 +0530
Subject: [PATCH 179/932] Fixed-2.3-dev-19379: Tax Rate Checkbox alignment
 issue

---
 .../Magento/backend/web/css/source/forms/_fields.less          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index c87b8f2ca5cc0..5dde259d9c1ad 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -117,6 +117,9 @@
 
         > .admin__field-control {
             #mix-grid .column(@field-control-grid__column, @field-grid__columns);
+            input[type="checkbox"] {
+                margin-top: 1.2rem;
+            }
         }
 
         > .admin__field-label {

From 77fa7042941849ea40632b6704fd2d043ec59da1 Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Tue, 27 Nov 2018 11:14:33 +0530
Subject: [PATCH 180/932] fixed-2.3-dev-19371: Attribute Heading border
 misaligned

---
 .../adminhtml/Magento/backend/web/css/source/forms/_temp.less   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
index df031bebeb24a..bb0e4a573e643 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less
@@ -11,7 +11,7 @@
 .admin__fieldset-wrapper-title {
     &:extend(.abs-clearfix all);
     border-bottom: 1px solid @color-gray80;
-    line-height: 1.2;
+    line-height: 1.4;
     margin-bottom: 0;
     padding: 14px 0 16px;
 

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 181/932] 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 e0761b4860d7807968ea27b4a9ca0a45a1db7097 Mon Sep 17 00:00:00 2001
From: Yurii Borysov <yurii_borysov@epam.com>
Date: Tue, 27 Nov 2018 15:28:11 +0200
Subject: [PATCH 182/932] MAGETWO-96427: Offline refund warning not displayed
 for Express Checkout orders

- Update is_gateway option for paypal payment method.
---
 app/code/Magento/Paypal/Model/Express.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/Express.php b/app/code/Magento/Paypal/Model/Express.php
index 33fe5ec33002b..e52a85da3e829 100644
--- a/app/code/Magento/Paypal/Model/Express.php
+++ b/app/code/Magento/Paypal/Model/Express.php
@@ -44,7 +44,7 @@ class Express extends \Magento\Payment\Model\Method\AbstractMethod
      *
      * @var bool
      */
-    protected $_isGateway = false;
+    protected $_isGateway = true;
 
     /**
      * Availability option

From 83204d24e6911c605d40a4021035d85b22d07b1f Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Tue, 27 Nov 2018 17:26:52 +0300
Subject: [PATCH 183/932] MAGETWO-96417: Detaching category from product causes
 massive product url regeneration

- Delete URL rewrite instead of rewriting all of their
---
 ...ategoryProcessUrlRewriteSavingObserver.php | 47 ++++++++++++++++---
 .../Observer/UrlRewriteHandler.php            | 28 +++++++++++
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
index 5d7e323e8b2d8..3cfd49b1d210a 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
@@ -100,16 +100,19 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         $mapsGenerated = false;
-        if ($category->dataHasChangedFor('url_key')
-            || $category->dataHasChangedFor('is_anchor')
-            || !empty($category->getChangedProductIds())
-        ) {
+        if ($this->isCategoryHasChanged($category)) {
             if ($category->dataHasChangedFor('url_key')) {
                 $categoryUrlRewriteResult = $this->categoryUrlRewriteGenerator->generate($category);
                 $this->urlRewriteBunchReplacer->doBunchReplace($categoryUrlRewriteResult);
             }
-            $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
-            $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
+            if ($this->isChangedOnlyProduct($category)) {
+                $productUrlRewriteResult =
+                    $this->urlRewriteHandler->updateProductUrlRewritesForChangedProduct($category);
+                $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
+            } else {
+                $productUrlRewriteResult = $this->urlRewriteHandler->generateProductUrlRewrites($category);
+                $this->urlRewriteBunchReplacer->doBunchReplace($productUrlRewriteResult);
+            }
             $mapsGenerated = true;
         }
 
@@ -119,6 +122,38 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
     }
 
+    /**
+     * Check is category changed changed.
+     *
+     * @param Category $category
+     * @return bool
+     */
+    private function isCategoryHasChanged(Category $category): bool
+    {
+        if ($category->dataHasChangedFor('url_key')
+            || $category->dataHasChangedFor('is_anchor')
+            || !empty($category->getChangedProductIds())) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Check is only product changed.
+     *
+     * @param Category $category
+     * @return bool
+     */
+    private function isChangedOnlyProduct(Category $category): bool
+    {
+        if (!empty($category->getChangedProductIds())
+            && !$category->dataHasChangedFor('is_anchor')
+            && !$category->dataHasChangedFor('url_key')) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * In case store_id is not set for category then we can assume that it was passed through product import.
      * Store group must have only one root category, so receiving category's path and checking if one of it parts
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index c4ec0bb3a74b2..b4a35f323e1bc 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -24,6 +24,8 @@
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
+ * Class for management url rewrites.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UrlRewriteHandler
@@ -156,6 +158,30 @@ public function generateProductUrlRewrites(Category $category): array
     }
 
     /**
+     * Update product url rewrites for changed product.
+     *
+     * @param Category $category
+     * @return array
+     */
+    public function updateProductUrlRewritesForChangedProduct(Category $category): array
+    {
+        $mergeDataProvider = clone $this->mergeDataProviderPrototype;
+        $this->isSkippedProduct[$category->getEntityId()] = [];
+        $saveRewriteHistory = (bool)$category->getData('save_rewrites_history');
+        $storeIds = $this->getCategoryStoreIds($category);
+
+        if ($category->getChangedProductIds()) {
+            foreach ($storeIds as $storeId) {
+                $this->generateChangedProductUrls($mergeDataProvider, $category, (int)$storeId, $saveRewriteHistory);
+            }
+        }
+
+        return $mergeDataProvider->getData();
+    }
+
+    /**
+     * Delete category rewrites for children.
+     *
      * @param Category $category
      * @return void
      */
@@ -184,6 +210,8 @@ public function deleteCategoryRewritesForChildren(Category $category)
     }
 
     /**
+     * Get category products url rewrites.
+     *
      * @param Category $category
      * @param int $storeId
      * @param bool $saveRewriteHistory

From a7331a370a7a2fd43ed4af22c65b6fda5812bd53 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Tue, 27 Nov 2018 17:24:52 +0300
Subject: [PATCH 184/932] MAGETWO-96432: Payment method title does not update
 in the admin sales order grid

- Change title definition logic for offline payment methods
---
 app/code/Magento/Payment/Helper/Data.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 0a4990313fa82..5f7a5a97d94ed 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -84,6 +84,8 @@ public function __construct(
     }
 
     /**
+     * Get config name of method model
+     *
      * @param string $code
      * @return string
      */
@@ -259,10 +261,11 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
         $groupRelations = [];
 
         foreach ($this->getPaymentMethods() as $code => $data) {
-            if (isset($data['title'])) {
+            $storedTitle = $this->getMethodInstance($code)->getConfigData('title', $store);
+            if (isset($storedTitle)) {
+                $methods[$code] = $storedTitle;
+            } elseif (isset($data['title'])) {
                 $methods[$code] = $data['title'];
-            } else {
-                $methods[$code] = $this->getMethodInstance($code)->getConfigData('title', $store);
             }
             if ($asLabelValue && $withGroups && isset($data['group'])) {
                 $groupRelations[$code] = $data['group'];

From 27d3e660c4cbb9bc62399e027469f2279e8115b6 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Tue, 27 Nov 2018 18:49:18 +0300
Subject: [PATCH 185/932] MAGETWO-96406: [2.3.x] Swatch Attribute is not
 displayed in the Widget CMS

- Bug fix.
---
 .../Block/Product/ProductsList.php            | 64 +++++++++++++-
 .../layout/catalog_widget_product_list.xml    | 17 ++++
 .../product/widget/content/grid.phtml         | 87 ++++++++++---------
 .../layout/catalog_widget_product_list.xml    | 12 +++
 4 files changed, 136 insertions(+), 44 deletions(-)
 create mode 100644 app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
 create mode 100644 app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml

diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index 55f4d67273379..a2067bae7807d 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -6,10 +6,14 @@
 
 namespace Magento\CatalogWidget\Block\Product;
 
+use Magento\Catalog\Model\Product;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ActionInterface;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Url\Helper\Data as UrlHelper;
+use Magento\Framework\View\LayoutFactory;
 use Magento\Widget\Block\BlockInterface;
 
 /**
@@ -94,6 +98,21 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      */
     private $json;
 
+    /**
+     * @var LayoutFactory
+     */
+    private $layoutFactory;
+
+    /**
+     * @var UrlHelper
+     */
+    private $urlHelper;
+
+    /**
+     * @var \Magento\Framework\View\Element\RendererList
+     */
+    private $rendererListBlock;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
@@ -104,6 +123,10 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      * @param \Magento\Widget\Helper\Conditions $conditionsHelper
      * @param array $data
      * @param Json|null $json
+     * @param LayoutFactory|null $layoutFactory
+     * @param UrlHelper|null $urlHelper
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -114,7 +137,9 @@ public function __construct(
         \Magento\CatalogWidget\Model\Rule $rule,
         \Magento\Widget\Helper\Conditions $conditionsHelper,
         array $data = [],
-        Json $json = null
+        Json $json = null,
+        LayoutFactory $layoutFactory = null,
+        UrlHelper $urlHelper = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->catalogProductVisibility = $catalogProductVisibility;
@@ -123,6 +148,8 @@ public function __construct(
         $this->rule = $rule;
         $this->conditionsHelper = $conditionsHelper;
         $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
+        $this->layoutFactory = $layoutFactory ?: ObjectManager::getInstance()->get(LayoutFactory::class);
+        $this->urlHelper = $urlHelper ?: ObjectManager::getInstance()->get(UrlHelper::class);
         parent::__construct(
             $context,
             $data
@@ -217,6 +244,41 @@ public function getProductPriceHtml(
         return $price;
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function getDetailsRendererList()
+    {
+        if (empty($this->rendererListBlock)) {
+            /** @var $layout \Magento\Framework\View\LayoutInterface */
+            $layout = $this->layoutFactory->create(['cacheable' => false]);
+            $layout->getUpdate()->addHandle('catalog_widget_product_list')->load();
+            $layout->generateXml();
+            $layout->generateElements();
+
+            $this->rendererListBlock = $layout->getBlock('category.product.type.widget.details.renderers');
+        }
+        return $this->rendererListBlock;
+    }
+
+    /**
+     * Get post parameters.
+     *
+     * @param Product $product
+     * @return array
+     */
+    public function getAddToCartPostParams(Product $product)
+    {
+        $url = $this->getAddToCartUrl($product);
+        return [
+            'action' => $url,
+            'data' => [
+                'product' => $product->getEntityId(),
+                ActionInterface::PARAM_NAME_URL_ENCODED => $this->urlHelper->getEncodedUrl($url),
+            ]
+        ];
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml b/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
new file mode 100644
index 0000000000000..9a6d704ecce9b
--- /dev/null
+++ b/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ Copyright © Magento, Inc. All rights reserved.
+  ~ See COPYING.txt for license details.
+  -->
+
+<!--
+  ~ Copyright © Magento, Inc. All rights reserved.
+  ~ See COPYING.txt for license details.
+  -->
+
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <block class="Magento\Framework\View\Element\RendererList" name="category.product.type.widget.details.renderers" alias="details.renderers">
+            <block class="Magento\Framework\View\Element\Template" name="category.product.type.details.renderers.default" as="default"/>
+        </block>
+    </body>
+</page>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index f2273f7d44ff3..159d4010c0115 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\Framework\App\Action\Action;
 
 // @codingStandardsIgnoreFile
 
@@ -48,57 +49,57 @@
                                         <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
-                                <?php
-                                echo $block->getProductPriceHtml($_item, $type);
-                                ?>
-
                                 <?php if ($templateType): ?>
                                     <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
 
+                                <?= $block->getProductPriceHtml($_item, $type) ?>
+
+                                <?= $block->getProductDetailsHtml($_item) ?>
+
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                        </button>
+                                    <div class="product-item-inner">
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart): ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()): ?>
+                                                        <?php $postParams = $block->getAddToCartPostParams($_item); ?>
+                                                        <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_item->getSku()) ?>" action="<?= /* @NoEscape */ $postParams['action'] ?>" method="post">
+                                                            <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $postParams['data']['product'] ?>">
+                                                            <input type="hidden" name="<?= /* @escapeNotVerified */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @escapeNotVerified */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
+                                                            <?= $block->getBlockHtml('formkey') ?>
+                                                            <button type="submit"
+                                                                    title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
+                                                                    class="action tocart primary">
+                                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
+                                                            </button>
+                                                        </form>
                                                     <?php else: ?>
-                                                        <?php
-                                                        $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                        $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                        </button>
+                                                        <?php if ($_item->getIsSalable()): ?>
+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <?php else: ?>
+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                        <?php endif; ?>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                </div>
+                                            <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare): ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                        <a href="#"
+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-                                                        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
                                     </div>
                                 <?php endif; ?>
                             </div>
diff --git a/app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml b/app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml
new file mode 100644
index 0000000000000..91798cbd9947f
--- /dev/null
+++ b/app/code/Magento/Swatches/view/frontend/layout/catalog_widget_product_list.xml
@@ -0,0 +1,12 @@
+<!--
+  ~ Copyright © Magento, Inc. All rights reserved.
+  ~ See COPYING.txt for license details.
+  -->
+
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="category.product.type.widget.details.renderers">
+            <block class="Magento\Swatches\Block\Product\Renderer\Listing\Configurable" name="category.product.type.details.renderers.configurable" as="configurable" template="Magento_Swatches::product/listing/renderer.phtml" ifconfig="catalog/frontend/show_swatches_in_product_list"/>
+        </referenceBlock>
+    </body>
+</page>
\ No newline at end of file

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 186/932] 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 9459ed626a59eb3ae1f943c62da4c0796ed4cb6f Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Wed, 28 Nov 2018 13:56:05 +0300
Subject: [PATCH 187/932] MAGETWO-96408: [2.3.x] [Magento Cloud] Error when
 saving Bundle product with a Scheduled Update

- Fixed type hinting
---
 app/code/Magento/Bundle/Model/Product/SaveHandler.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
index 4f6d2d51ffda5..99e8188146bbb 100644
--- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -158,14 +158,14 @@ private function getOptionIds(array $options): array
     /**
      * Removes old options that no longer exists.
      *
-     * @param \Magento\Catalog\Api\Data\ProductInterface|object $entity
+     * @param ProductInterface $entity
      * @param array $existingOptionsIds
      * @param array $optionIds
      * @return void
      */
-    private function processRemovedOptions(object $entity, array $existingOptionsIds, array $optionIds): void
+    private function processRemovedOptions(ProductInterface $entity, array $existingOptionsIds, array $optionIds): void
     {
-        $metadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
         $parentId = $entity->getData($metadata->getLinkField());
         foreach (array_diff($existingOptionsIds, $optionIds) as $optionId) {
             $option = $this->optionRepository->get($entity->getSku(), $optionId);

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 188/932] 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 ba74d84687f3c44134a0b8df6038d720bee04746 Mon Sep 17 00:00:00 2001
From: vprohorov <prohorov.vital@gmail.com>
Date: Wed, 28 Nov 2018 15:54:41 +0300
Subject: [PATCH 189/932] MAGETWO-94444: [2.3] Order total value is limited by
 8 round digits

- Changed shipping, tax, discount fields
---
 .../Adminhtml/Category/Helper/Pricestep.php   |   5 +-
 .../Magento/CatalogRule/etc/db_schema.xml     |   4 +-
 .../etc/adminhtml/system.xml                  |   2 +-
 .../Magento/Quote/Model/QuoteValidator.php    |   2 +-
 app/code/Magento/Quote/etc/db_schema.xml      |  86 ++---
 app/code/Magento/Sales/etc/db_schema.xml      | 338 +++++++++---------
 6 files changed, 220 insertions(+), 217 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
index b77a5e2e95241..3266922d116ec 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
 
+/**
+ * Pricestep Helper
+ */
 class Pricestep extends \Magento\Framework\Data\Form\Element\Text
 {
     /**
@@ -40,7 +43,7 @@ public function getElementHtml()
             $disabled = true;
         }
 
-        parent::addClass('validate-number validate-number-range number-range-0.01-1000000000');
+        parent::addClass('validate-number validate-number-range number-range-0.01-9999999999999999');
         $html = parent::getElementHtml();
         $htmlId = 'use_config_' . $this->getHtmlId();
         $html .= '<br/><input id="' . $htmlId . '" name="use_config[]" value="' . $this->getId() . '"';
diff --git a/app/code/Magento/CatalogRule/etc/db_schema.xml b/app/code/Magento/CatalogRule/etc/db_schema.xml
index 6f7d713e49fe3..894f057ba73d1 100644
--- a/app/code/Magento/CatalogRule/etc/db_schema.xml
+++ b/app/code/Magento/CatalogRule/etc/db_schema.xml
@@ -23,7 +23,7 @@
         <column xsi:type="int" name="sort_order" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Sort Order"/>
         <column xsi:type="varchar" name="simple_action" nullable="true" length="32" comment="Simple Action"/>
-        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Discount Amount"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="rule_id"/>
@@ -49,7 +49,7 @@
                 default="0" comment="Product Id"/>
         <column xsi:type="varchar" name="action_operator" nullable="true" length="10" default="to_fixed"
                 comment="Action Operator"/>
-        <column xsi:type="decimal" name="action_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="action_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Action Amount"/>
         <column xsi:type="smallint" name="action_stop" padding="6" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Action Stop"/>
diff --git a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml b/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
index de4637847456e..8d3f70c2806aa 100644
--- a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
+++ b/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
@@ -20,7 +20,7 @@
                 </field>
                 <field id="price_range_step" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Default Price Navigation Step</label>
-                    <validate>validate-number validate-number-range number-range-0.01-1000000000</validate>
+                    <validate>validate-number validate-number-range number-range-0.01-9999999999999999</validate>
                     <depends>
                         <field id="price_range_calculation">manual</field>
                     </depends>
diff --git a/app/code/Magento/Quote/Model/QuoteValidator.php b/app/code/Magento/Quote/Model/QuoteValidator.php
index 062cf76bcaa1a..e67a0f1356262 100644
--- a/app/code/Magento/Quote/Model/QuoteValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteValidator.php
@@ -25,7 +25,7 @@ class QuoteValidator
     /**
      * Maximum available number
      */
-    const MAXIMUM_AVAILABLE_NUMBER = 99999999;
+    const MAXIMUM_AVAILABLE_NUMBER = 10000000000000000;
 
     /**
      * @var AllowedCountries
diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 3bf6e48a3b545..3361d497d8d8d 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -151,21 +151,21 @@
                 nullable="false" default="0" comment="Subtotal With Discount"/>
         <column xsi:type="decimal" name="base_subtotal_with_discount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Base Subtotal With Discount"/>
-        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Tax Amount"/>
-        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Base Tax Amount"/>
-        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Shipping Amount"/>
-        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Base Shipping Amount"/>
-        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Tax Amount"/>
-        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Tax Amount"/>
-        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Discount Amount"/>
-        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Base Discount Amount"/>
         <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Grand Total"/>
@@ -175,25 +175,25 @@
         <column xsi:type="text" name="applied_taxes" nullable="true" comment="Applied Taxes"/>
         <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
                 comment="Discount Description"/>
-        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Shipping Discount Amount"/>
-        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Discount Amount"/>
         <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Incl Tax"/>
         <column xsi:type="decimal" name="base_subtotal_total_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Total Incl Tax"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Incl Tax"/>
-        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Incl Tax"/>
         <column xsi:type="text" name="vat_id" nullable="true" comment="Vat Id"/>
         <column xsi:type="smallint" name="vat_is_valid" padding="6" unsigned="false" nullable="true" identity="false"
@@ -249,45 +249,45 @@
                 comment="Custom Price"/>
         <column xsi:type="decimal" name="discount_percent" scale="4" precision="12" unsigned="false" nullable="true"
                 default="0" comment="Discount Percent"/>
-        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Discount Amount"/>
-        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" default="0" comment="Base Discount Amount"/>
         <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="true"
                 default="0" comment="Tax Percent"/>
-        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Tax Amount"/>
-        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Base Tax Amount"/>
-        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Row Total"/>
-        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Base Row Total"/>
-        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="20" unsigned="false"
                 nullable="true" default="0" comment="Row Total With Discount"/>
         <column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
                 default="0" comment="Row Weight"/>
         <column xsi:type="varchar" name="product_type" nullable="true" length="255" comment="Product Type"/>
-        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Tax Before Discount"/>
-        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Tax Before Discount"/>
         <column xsi:type="decimal" name="original_custom_price" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Original Custom Price"/>
         <column xsi:type="varchar" name="redirect_url" nullable="true" length="255" comment="Redirect Url"/>
         <column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Cost"/>
-        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Price Incl Tax"/>
-        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Price Incl Tax"/>
-        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Row Total Incl Tax"/>
-        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Row Total Incl Tax"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="item_id"/>
@@ -330,19 +330,19 @@
                 comment="Weight"/>
         <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="false" default="0"
                 comment="Qty"/>
-        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Discount Amount"/>
-        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Tax Amount"/>
-        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Row Total"/>
-        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Base Row Total"/>
-        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="row_total_with_discount" scale="4" precision="20" unsigned="false"
                 nullable="true" default="0" comment="Row Total With Discount"/>
-        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" default="0" comment="Base Discount Amount"/>
-        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Base Tax Amount"/>
         <column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
                 default="0" comment="Row Weight"/>
@@ -370,17 +370,17 @@
                 comment="Base Price"/>
         <column xsi:type="decimal" name="base_cost" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Cost"/>
-        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Price Incl Tax"/>
         <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Price Incl Tax"/>
         <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Row Total Incl Tax"/>
-        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Row Total Incl Tax"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="address_item_id"/>
@@ -472,7 +472,7 @@
         <column xsi:type="varchar" name="code" nullable="true" length="255" comment="Code"/>
         <column xsi:type="varchar" name="method" nullable="true" length="255" comment="Method"/>
         <column xsi:type="text" name="method_description" nullable="true" comment="Method Description"/>
-        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="false" default="0"
+        <column xsi:type="decimal" name="price" scale="4" precision="20" unsigned="false" nullable="false" default="0"
                 comment="Price"/>
         <column xsi:type="text" name="error_message" nullable="true" comment="Error Message"/>
         <column xsi:type="text" name="method_title" nullable="true" comment="Method Title"/>
diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
index ef0bbf80a2a2a..a76305fd04963 100644
--- a/app/code/Magento/Sales/etc/db_schema.xml
+++ b/app/code/Magento/Sales/etc/db_schema.xml
@@ -22,27 +22,27 @@
                 comment="Store Id"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Customer Id"/>
-        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Discount Amount"/>
-        <column xsi:type="decimal" name="base_discount_canceled" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_canceled" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Discount Canceled"/>
-        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Discount Invoiced"/>
-        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Discount Refunded"/>
         <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
-        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Amount"/>
-        <column xsi:type="decimal" name="base_shipping_canceled" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_canceled" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Canceled"/>
-        <column xsi:type="decimal" name="base_shipping_invoiced" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_invoiced" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Invoiced"/>
-        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Refunded"/>
-        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Tax Amount"/>
-        <column xsi:type="decimal" name="base_shipping_tax_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_tax_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Tax Refunded"/>
         <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Subtotal"/>
@@ -52,15 +52,15 @@
                 nullable="true" comment="Base Subtotal Invoiced"/>
         <column xsi:type="decimal" name="base_subtotal_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Refunded"/>
-        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Tax Amount"/>
-        <column xsi:type="decimal" name="base_tax_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_canceled" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Tax Canceled"/>
-        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Tax Invoiced"/>
-        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Tax Refunded"/>
-        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base To Global Rate"/>
         <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base To Order Rate"/>
@@ -80,27 +80,27 @@
                 nullable="true" comment="Base Total Qty Ordered"/>
         <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Total Refunded"/>
-        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Discount Amount"/>
-        <column xsi:type="decimal" name="discount_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_canceled" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Discount Canceled"/>
-        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Discount Invoiced"/>
-        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Discount Refunded"/>
         <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Grand Total"/>
-        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Amount"/>
-        <column xsi:type="decimal" name="shipping_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_canceled" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Canceled"/>
-        <column xsi:type="decimal" name="shipping_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Invoiced"/>
-        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Refunded"/>
-        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Tax Amount"/>
-        <column xsi:type="decimal" name="shipping_tax_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="shipping_tax_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Shipping Tax Refunded"/>
         <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Store To Base Rate"/>
@@ -114,17 +114,17 @@
                 comment="Subtotal Invoiced"/>
         <column xsi:type="decimal" name="subtotal_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Refunded"/>
-        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Tax Amount"/>
-        <column xsi:type="decimal" name="tax_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_canceled" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Tax Canceled"/>
-        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Tax Invoiced"/>
-        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Tax Refunded"/>
-        <column xsi:type="decimal" name="total_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="total_canceled" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Total Canceled"/>
-        <column xsi:type="decimal" name="total_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="total_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Total Invoiced"/>
         <column xsi:type="decimal" name="total_offline_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Total Offline Refunded"/>
@@ -163,15 +163,15 @@
                 comment="Quote Id"/>
         <column xsi:type="int" name="shipping_address_id" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Shipping Address Id"/>
-        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Adjustment Negative"/>
-        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Adjustment Positive"/>
-        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Adjustment Negative"/>
-        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Adjustment Positive"/>
-        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Discount Amount"/>
         <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Incl Tax"/>
@@ -179,7 +179,7 @@
                 comment="Base Total Due"/>
         <column xsi:type="decimal" name="payment_authorization_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Payment Authorization Amount"/>
-        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="shipping_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Shipping Discount Amount"/>
         <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Incl Tax"/>
@@ -230,25 +230,25 @@
                 identity="false" default="0" comment="Total Item Count"/>
         <column xsi:type="int" name="customer_gender" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Customer Gender"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Invoiced"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Invoiced"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Refunded"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Refunded"/>
-        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Incl Tax"/>
-        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Incl Tax"/>
         <column xsi:type="varchar" name="coupon_rule_name" nullable="true" length="255"
                 comment="Coupon Sales Rule Name"/>
@@ -328,11 +328,11 @@
         <column xsi:type="varchar" name="customer_group" nullable="true" length="255" comment="Customer Group"/>
         <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
-        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Shipping and handling amount"/>
         <column xsi:type="varchar" name="customer_name" nullable="true" length="255" comment="Customer Name"/>
         <column xsi:type="varchar" name="payment_method" nullable="true" length="255" comment="Payment Method"/>
-        <column xsi:type="decimal" name="total_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Total Refunded"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
@@ -513,78 +513,78 @@
                 comment="Base Original Price"/>
         <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="true"
                 default="0" comment="Tax Percent"/>
-        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Tax Amount"/>
-        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Base Tax Amount"/>
-        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Tax Invoiced"/>
-        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Base Tax Invoiced"/>
         <column xsi:type="decimal" name="discount_percent" scale="4" precision="12" unsigned="false" nullable="true"
                 default="0" comment="Discount Percent"/>
-        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Discount Amount"/>
-        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" default="0" comment="Base Discount Amount"/>
-        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_invoiced" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Discount Invoiced"/>
-        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_invoiced" scale="4" precision="20" unsigned="false"
                 nullable="true" default="0" comment="Base Discount Invoiced"/>
-        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 default="0" comment="Amount Refunded"/>
-        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" default="0" comment="Base Amount Refunded"/>
-        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Row Total"/>
-        <column xsi:type="decimal" name="base_row_total" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="base_row_total" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Base Row Total"/>
-        <column xsi:type="decimal" name="row_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="row_invoiced" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Row Invoiced"/>
-        <column xsi:type="decimal" name="base_row_invoiced" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="base_row_invoiced" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Base Row Invoiced"/>
         <column xsi:type="decimal" name="row_weight" scale="4" precision="12" unsigned="false" nullable="true"
                 default="0" comment="Row Weight"/>
-        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_tax_before_discount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Tax Before Discount"/>
-        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_before_discount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Tax Before Discount"/>
         <column xsi:type="varchar" name="ext_order_item_id" nullable="true" length="255" comment="Ext Order Item Id"/>
         <column xsi:type="smallint" name="locked_do_invoice" padding="5" unsigned="true" nullable="true"
                 identity="false" comment="Locked Do Invoice"/>
         <column xsi:type="smallint" name="locked_do_ship" padding="5" unsigned="true" nullable="true" identity="false"
                 comment="Locked Do Ship"/>
-        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Price Incl Tax"/>
-        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_price_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Price Incl Tax"/>
-        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Row Total Incl Tax"/>
-        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_row_total_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Row Total Incl Tax"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_invoiced" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Invoiced"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_invoiced" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Invoiced"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Refunded"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_refunded" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Refunded"/>
         <column xsi:type="decimal" name="tax_canceled" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Tax Canceled"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_canceled" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_canceled" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Canceled"/>
-        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Tax Refunded"/>
-        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Tax Refunded"/>
-        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Discount Refunded"/>
-        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Discount Refunded"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="item_id"/>
@@ -605,41 +605,41 @@
                 comment="Entity Id"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Parent Id"/>
-        <column xsi:type="decimal" name="base_shipping_captured" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_captured" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Captured"/>
-        <column xsi:type="decimal" name="shipping_captured" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_captured" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Captured"/>
-        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="amount_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Amount Refunded"/>
-        <column xsi:type="decimal" name="base_amount_paid" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_amount_paid" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Amount Paid"/>
-        <column xsi:type="decimal" name="amount_canceled" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="amount_canceled" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Amount Canceled"/>
-        <column xsi:type="decimal" name="base_amount_authorized" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_amount_authorized" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Amount Authorized"/>
-        <column xsi:type="decimal" name="base_amount_paid_online" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_amount_paid_online" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Amount Paid Online"/>
-        <column xsi:type="decimal" name="base_amount_refunded_online" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_amount_refunded_online" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Amount Refunded Online"/>
-        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Amount"/>
-        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Amount"/>
-        <column xsi:type="decimal" name="amount_paid" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="amount_paid" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Amount Paid"/>
-        <column xsi:type="decimal" name="amount_authorized" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="amount_authorized" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Amount Authorized"/>
-        <column xsi:type="decimal" name="base_amount_ordered" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_amount_ordered" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Amount Ordered"/>
-        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Refunded"/>
-        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Refunded"/>
-        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_amount_refunded" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Amount Refunded"/>
-        <column xsi:type="decimal" name="amount_ordered" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="amount_ordered" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Amount Ordered"/>
-        <column xsi:type="decimal" name="base_amount_canceled" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_amount_canceled" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Amount Canceled"/>
         <column xsi:type="int" name="quote_payment_id" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Quote Payment Id"/>
@@ -840,9 +840,9 @@
                 comment="Entity Id"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Parent Id"/>
-        <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="row_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Row Total"/>
-        <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="price" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Price"/>
         <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Weight"/>
@@ -931,23 +931,23 @@
                 comment="Store Id"/>
         <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
-        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Tax Amount"/>
-        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Tax Amount"/>
-        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Tax Amount"/>
-        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Store To Order Rate"/>
-        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Tax Amount"/>
-        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Discount Amount"/>
-        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base To Order Rate"/>
         <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Grand Total"/>
-        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Amount"/>
         <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Incl Tax"/>
@@ -955,17 +955,17 @@
                 nullable="true" comment="Base Subtotal Incl Tax"/>
         <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Store To Base Rate"/>
-        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Amount"/>
         <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Total Qty"/>
-        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base To Global Rate"/>
         <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
         <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Subtotal"/>
-        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Discount Amount"/>
         <column xsi:type="int" name="billing_address_id" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Billing Address Id"/>
@@ -994,17 +994,17 @@
                 comment="Created At"/>
         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Updated At"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Incl Tax"/>
-        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Incl Tax"/>
         <column xsi:type="decimal" name="base_total_refunded" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Total Refunded"/>
@@ -1079,7 +1079,7 @@
                 comment="Shipping Method Name"/>
         <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
-        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Shipping and handling amount"/>
         <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Grand Total"/>
@@ -1220,53 +1220,53 @@
                 comment="Entity Id"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
                 comment="Store Id"/>
-        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Adjustment Positive"/>
-        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Tax Amount"/>
-        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="store_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Store To Order Rate"/>
-        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Discount Amount"/>
-        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_to_order_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base To Order Rate"/>
         <column xsi:type="decimal" name="grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Grand Total"/>
-        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_adjustment_negative" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Adjustment Negative"/>
         <column xsi:type="decimal" name="base_subtotal_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Subtotal Incl Tax"/>
-        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Amount"/>
         <column xsi:type="decimal" name="subtotal_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal Incl Tax"/>
-        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Adjustment Negative"/>
-        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Amount"/>
-        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="store_to_base_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Store To Base Rate"/>
-        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_to_global_rate" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base To Global Rate"/>
-        <column xsi:type="decimal" name="base_adjustment" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_adjustment" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Adjustment"/>
         <column xsi:type="decimal" name="base_subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Subtotal"/>
-        <column xsi:type="decimal" name="discount_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="discount_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Discount Amount"/>
         <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
-        <column xsi:type="decimal" name="adjustment" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="adjustment" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Adjustment"/>
         <column xsi:type="decimal" name="base_grand_total" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
-        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_adjustment_positive" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Adjustment Positive"/>
-        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Tax Amount"/>
-        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Tax Amount"/>
-        <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="tax_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Tax Amount"/>
         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Order Id"/>
@@ -1295,17 +1295,17 @@
                 comment="Created At"/>
         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Updated At"/>
-        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="discount_tax_compensation_amount" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="12"
+        <column xsi:type="decimal" name="shipping_discount_tax_compensation_amount" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Shipping Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="12"
+        <column xsi:type="decimal" name="base_shipping_discount_tax_compensation_amnt" scale="4" precision="20"
                 unsigned="false" nullable="true" comment="Base Shipping Discount Tax Compensation Amount"/>
-        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="shipping_incl_tax" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Shipping Incl Tax"/>
-        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="base_shipping_incl_tax" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Base Shipping Incl Tax"/>
         <column xsi:type="varchar" name="discount_description" nullable="true" length="255"
                 comment="Discount Description"/>
@@ -1378,13 +1378,13 @@
                 comment="Shipping Method Name"/>
         <column xsi:type="decimal" name="subtotal" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Subtotal"/>
-        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="shipping_and_handling" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Shipping and handling amount"/>
-        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Adjustment Positive"/>
-        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="adjustment_negative" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Adjustment Negative"/>
-        <column xsi:type="decimal" name="order_base_grand_total" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="order_base_grand_total" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Order Grand Total"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="entity_id"/>
@@ -1607,17 +1607,17 @@
                 default="0" comment="Total Paid Amount"/>
         <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Refunded Amount"/>
-        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Total Tax Amount"/>
-        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Tax Amount Actual"/>
-        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Shipping Amount"/>
-        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Shipping Amount Actual"/>
-        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Discount Amount"/>
-        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Discount Amount Actual"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
@@ -1661,17 +1661,17 @@
                 default="0" comment="Total Paid Amount"/>
         <column xsi:type="decimal" name="total_refunded_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Refunded Amount"/>
-        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="total_tax_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 default="0" comment="Total Tax Amount"/>
-        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_tax_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Tax Amount Actual"/>
-        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_shipping_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Shipping Amount"/>
-        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_shipping_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Shipping Amount Actual"/>
-        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_discount_amount" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Discount Amount"/>
-        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_discount_amount_actual" scale="4" precision="20" unsigned="false"
                 nullable="false" default="0" comment="Total Discount Amount Actual"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
@@ -1798,9 +1798,9 @@
                 comment="Shipping Description"/>
         <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Orders Count"/>
-        <column xsi:type="decimal" name="total_shipping" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="total_shipping" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Total Shipping"/>
-        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Total Shipping Actual"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
@@ -1829,9 +1829,9 @@
                 comment="Shipping Description"/>
         <column xsi:type="int" name="orders_count" padding="11" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Orders Count"/>
-        <column xsi:type="decimal" name="total_shipping" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="total_shipping" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Total Shipping"/>
-        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="12" unsigned="false"
+        <column xsi:type="decimal" name="total_shipping_actual" scale="4" precision="20" unsigned="false"
                 nullable="true" comment="Total Shipping Actual"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="id"/>
@@ -1957,17 +1957,17 @@
         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
         <column xsi:type="decimal" name="percent" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Percent"/>
-        <column xsi:type="decimal" name="amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Amount"/>
         <column xsi:type="int" name="priority" padding="11" unsigned="false" nullable="false" identity="false"
                 comment="Priority"/>
         <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
                 comment="Position"/>
-        <column xsi:type="decimal" name="base_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Amount"/>
         <column xsi:type="smallint" name="process" padding="6" unsigned="false" nullable="false" identity="false"
                 comment="Process"/>
-        <column xsi:type="decimal" name="base_real_amount" scale="4" precision="12" unsigned="false" nullable="true"
+        <column xsi:type="decimal" name="base_real_amount" scale="4" precision="20" unsigned="false" nullable="true"
                 comment="Base Real Amount"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="tax_id"/>
@@ -1987,13 +1987,13 @@
                 comment="Item Id"/>
         <column xsi:type="decimal" name="tax_percent" scale="4" precision="12" unsigned="false" nullable="false"
                 comment="Real Tax Percent For Item"/>
-        <column xsi:type="decimal" name="amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="amount" scale="4" precision="20" unsigned="false" nullable="false"
                 comment="Tax amount for the item and tax rate"/>
-        <column xsi:type="decimal" name="base_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="base_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 comment="Base tax amount for the item and tax rate"/>
-        <column xsi:type="decimal" name="real_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="real_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 comment="Real tax amount for the item and tax rate"/>
-        <column xsi:type="decimal" name="real_base_amount" scale="4" precision="12" unsigned="false" nullable="false"
+        <column xsi:type="decimal" name="real_base_amount" scale="4" precision="20" unsigned="false" nullable="false"
                 comment="Real base tax amount for the item and tax rate"/>
         <column xsi:type="int" name="associated_item_id" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Id of the associated item"/>

From 8b7924ca3754b0c5ec07b5bf20407c19dda198b5 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 27 Nov 2018 10:22:30 +0300
Subject: [PATCH 190/932] MAGETWO-96407: [2.3.x] Products with customizable
 options of type File aren't saved on requisition lists with the attachments

- Expand lib postData to render files.
---
 lib/web/mage/dataPost.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/web/mage/dataPost.js b/lib/web/mage/dataPost.js
index 5d052f12db8fb..07d282d89f9fd 100644
--- a/lib/web/mage/dataPost.js
+++ b/lib/web/mage/dataPost.js
@@ -57,7 +57,7 @@ define([
          */
         postData: function (params) {
             var formKey = $(this.options.formKeyInputSelector).val(),
-                $form;
+                $form, input;
 
             if (formKey) {
                 params.data['form_key'] = formKey;
@@ -67,6 +67,19 @@ define([
                 data: params
             }));
 
+            if (params.files) {
+                $form[0].enctype = 'multipart/form-data';
+                $.each(params.files, function(key, files) {
+                    if (files instanceof FileList) {
+                        input = document.createElement('input');
+                        input.type = 'file';
+                        input.name = key;
+                        input.files = files;
+                        $form[0].appendChild(input);
+                    }
+                });
+            }
+
             if (params.data.confirmation) {
                 uiConfirm({
                     content: params.data.confirmationMessage,

From 6ac61ae8730f3cbafa3a6bedb233aeef2f38b1b9 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Wed, 28 Nov 2018 16:36:27 +0100
Subject: [PATCH 191/932] Set response Sort Order

---
 .../Model/Resolver/Products/DataProvider/CategoryTree.php     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index 67b578836a6b6..a5fbd4f8c782b 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -103,6 +103,10 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterato
         $collection->addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
         $collection->addIsActiveFilter();
         $collection->setOrder('level');
+        $collection->setOrder(
+            'position',
+            \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::SORT_ORDER_DESC
+        );
         $collection->getSelect()->orWhere(
             $collection->getSelect()
                 ->getConnection()

From dabc8865967719c5e387c5c7576a978f5198ee22 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 28 Nov 2018 16:51:00 +0100
Subject: [PATCH 192/932] Added possibility to retrieve cart information

---
 .../Model/Cart/ExtractDataFromCart.php        |  3 +
 .../QuoteGraphQl/Model/Resolver/Cart.php      | 67 +++++++++++++++++++
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |  6 +-
 3 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php
index faefa686606e2..438f28980918d 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromCart.php
@@ -40,8 +40,11 @@ public function execute(Quote $cart): array
             ];
         }
 
+        $appliedCoupon = $cart->getCouponCode();
+
         return [
             'items' => $items,
+            'applied_coupon' => $appliedCoupon ? ['code' => $appliedCoupon] : null
         ];
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
new file mode 100644
index 0000000000000..5023c186f1e6c
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/Cart.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromCart;
+
+/**
+ * @inheritdoc
+ */
+class Cart implements ResolverInterface
+{
+    /**
+     * @var ExtractDataFromCart
+     */
+    private $extractDataFromCart;
+
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     * @param ExtractDataFromCart $extractDataFromCart
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser,
+        ExtractDataFromCart $extractDataFromCart
+    ) {
+        $this->getCartForUser = $getCartForUser;
+        $this->extractDataFromCart = $extractDataFromCart;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($args['cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        }
+        $maskedCartId = $args['cart_id'];
+
+        $currentUserId = $context->getUserId();
+        $cart = $this->getCartForUser->execute($maskedCartId, $currentUserId);
+
+        $data = array_merge(
+            [
+                'cart_id' => $maskedCartId,
+                'model' => $cart
+            ],
+            $this->extractDataFromCart->execute($cart)
+        );
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index edc643973ce77..4c1101a5f90a8 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -2,7 +2,7 @@
 # See COPYING.txt for license details.
 
 type Query {
-    getAvailableShippingMethodsOnCart(input: AvailableShippingMethodsOnCartInput): AvailableShippingMethodsOnCartOutput @doc(description:"Returns available shipping methods for cart by address/address_id")
+    Cart(cart_id: String!): Cart @resolver (class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\Cart") @doc(description:"Returns information about shopping cart")
 }
 
 type Mutation {
@@ -84,10 +84,6 @@ input AvailableShippingMethodsOnCartInput {
     address: CartAddressInput
 }
 
-type AvailableShippingMethodsOnCartOutput {
-    available_shipping_methods: [CheckoutShippingMethod]
-}
-
 input ApplyCouponToCartInput {
     cart_id: String!
     coupon_code: String!

From af0b38bdcbb393d94db3422e34c072572165a3b9 Mon Sep 17 00:00:00 2001
From: Stepan Furman <furman.stepan@gmail.com>
Date: Wed, 28 Nov 2018 22:17:05 +0200
Subject: [PATCH 193/932] refactoring + first test

---
 .../Model/Resolver/CreateCustomer.php         | 27 +++++--
 .../GraphQl/Customer/CreateCustomerTest.php   | 73 +++++++++++++++++++
 2 files changed, 93 insertions(+), 7 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
index 2bf85eefe7617..a265dc300b923 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
@@ -7,18 +7,20 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Api\DataObjectHelper;
 
 /**
  * Create customer data resolver
@@ -102,16 +104,23 @@ public function resolve(
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
+
         return ['customer' => $data];
     }
 
+    /**
+     * @param $args
+     * @return CustomerInterface
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
     private function createUserAccount($args)
     {
         $customerDataObject = $this->customerFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customerDataObject,
             $args['input'],
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            CustomerInterface::class
         );
         $store = $this->storeManager->getStore();
         $customerDataObject->setWebsiteId($store->getWebsiteId());
@@ -122,6 +131,10 @@ private function createUserAccount($args)
         return $this->accountManagement->createAccount($customerDataObject, $password);
     }
 
+    /**
+     * @param $context
+     * @param CustomerInterface $customer
+     */
     private function setUpUserContext($context, $customer)
     {
         $context->setUserId((int)$customer->getId());
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
new file mode 100644
index 0000000000000..80a24eacb5f2c
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class CreateCustomerTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerRegistry
+     */
+    private $customerRegistry;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function testCreateCustomerAccount()
+    {
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $currentPassword = 'test123#';
+        $newEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+
+        $query = <<<QUERY
+mutation {
+    createCustomer(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            email: "{$newEmail}"
+            password: "{$currentPassword}"
+          	is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
+        $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
+        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
+        $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
+    }
+}

From 1a73b8a5d32f8b05eedcf20fbc57818c5a056aaf Mon Sep 17 00:00:00 2001
From: Brendan Tull <brendan.tull@classyllama.com>
Date: Wed, 28 Nov 2018 18:06:54 -0600
Subject: [PATCH 194/932] Use semantic color variables for theme, including
 global primary & secondary colors

---
 .../Magento_Braintree/web/css/source/_module.less      |  6 +++---
 .../web/css/source/module/checkout/_progress-bar.less  |  2 +-
 .../web/css/source/module/checkout/_shipping.less      |  2 +-
 .../blank/Magento_Customer/web/css/source/_module.less |  2 +-
 .../Magento_Multishipping/web/css/source/_module.less  |  4 ++--
 .../blank/Magento_Swatches/web/css/source/_module.less |  6 +++---
 .../Magento_Checkout/web/css/source/module/_cart.less  |  6 ------
 .../web/css/source/module/checkout/_progress-bar.less  |  4 ++--
 .../web/css/source/module/checkout/_shipping.less      |  2 +-
 .../Magento_GiftMessage/web/css/source/_module.less    |  2 +-
 .../web/css/source/_module.less                        |  2 +-
 .../Magento_Multishipping/web/css/source/_module.less  |  4 ++--
 .../frontend/Magento/luma/web/css/source/_extends.less |  2 +-
 .../frontend/Magento/luma/web/css/source/_theme.less   | 10 ++--------
 lib/web/css/source/lib/variables/_buttons.less         |  8 ++++----
 lib/web/css/source/lib/variables/_colors.less          |  8 ++++++--
 lib/web/css/source/lib/variables/_navigation.less      |  8 ++++----
 lib/web/css/source/lib/variables/_rating.less          |  2 +-
 lib/web/css/source/lib/variables/_typography.less      |  4 ++--
 lib/web/mage/gallery/gallery.less                      |  6 +++---
 lib/web/mage/gallery/module/_extends.less              |  2 +-
 21 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
index b70bab6f320d8..8c1ec09afec1e 100644
--- a/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Braintree/web/css/source/_module.less
@@ -9,9 +9,9 @@
 
 @braintree-input-border__color: @color-gray76;
 
-@braintree-error__color: @color-red10;
-@braintree-focus__color: @color-blue2;
-@braintree-success__color: @color-dark-green1;
+@braintree-error__color: @message-error__color;
+@braintree-focus__color: @theme__color__primary-alt;
+@braintree-success__color: @message-success__color;
 
 @braintree-paypal-icon__height: 16px;
 @braintree-paypal-icon__width: 16px;
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
index 301517c6d0cd6..4792cb7b17924 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
@@ -16,7 +16,7 @@
 @checkout-progress-bar-item__color: @primary__color;
 @checkout-progress-bar-item__margin: @indent__s;
 @checkout-progress-bar-item__width: 185px;
-@checkout-progress-bar-item__active__background-color: @color-orange-red1;
+@checkout-progress-bar-item__active__background-color: @active__color;
 @checkout-progress-bar-item__complete__color: @link__color;
 
 @checkout-progress-bar-item-element__height: @checkout-progress-bar-item-element__width;
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
index 158cb0ebc0ed1..af6127fd2ca9f 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_shipping.less
@@ -22,7 +22,7 @@
 @checkout-shipping-item__width: 100%/3;
 @checkout-shipping-item-tablet__width: 100%/2;
 @checkout-shipping-item-mobile__width: 100%;
-@checkout-shipping-item__active__border-color: @color-orange-red1;
+@checkout-shipping-item__active__border-color: @active__color;
 
 @checkout-shipping-item-icon__selected__height: 27px;
 @checkout-shipping-item-icon__selected__width: 29px;
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index 3ffaeb82cdc2a..0e88449d9141e 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -11,7 +11,7 @@
 @account-nav-color: false;
 
 @account-nav-current-border: 3px solid transparent;
-@account-nav-current-border-color: @color-orange-red1;
+@account-nav-current-border-color: @active__color;
 @account-nav-current-color: false;
 @account-nav-current-font-weight: @font-weight__semibold;
 
diff --git a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
index 96648f504af80..46f9661d8281d 100644
--- a/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Multishipping/web/css/source/_module.less
@@ -47,7 +47,7 @@
                     }
 
                     .error-block {
-                        color: @color-red10;
+                        color: @error__color;
 
                         .error-label {
                             font-weight: @font-weight__bold;
@@ -222,7 +222,7 @@
             }
 
             .error-description {
-                color: @color-red10;
+                color: @error__color;
                 font-weight: @font-weight__regular;
                 margin-bottom: @indent__s;
                 margin-top: -@indent__s;
diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
index f42efa3569598..bfa009d89986b 100644
--- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
@@ -18,7 +18,7 @@
 
 @swatch-option__selected__border: @swatch-option__hover__border;
 @swatch-option__selected__color: @swatch-option__hover__color;
-@swatch-option__selected__outline: 2px solid @color-orange-red1;
+@swatch-option__selected__outline: 2px solid @active__color;
 
 @swatch-option__disabled__background: @color-red10;
 
@@ -38,7 +38,7 @@
 
 //  Image and Color swatch
 @img-color-swatch-option__hover__border: @swatch-option__hover__border;
-@img-color-swatch-option__hover__outline: 2px solid #e00;
+@img-color-swatch-option__hover__outline: 2px solid darken(@active__color, 12%);
 
 //  Tooltip
 @swatch-option-tooltip__background: @color-white;
@@ -54,7 +54,7 @@
 @swatch-option-tooltip-layered-title__color: @swatch-option-tooltip-title__color;
 
 //  Layered Features
-@swatch-option-link-layered__focus__box-shadow: 0 0 3px 1px @color-sky-blue1;
+@swatch-option-link-layered__focus__box-shadow: 0 0 3px 1px @focus__color;
 
 //
 //  Common
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 58582d344e75a..9cb0ec7ce65e8 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -145,12 +145,6 @@
         }
 
         &:extend(.abs-adjustment-incl-excl-tax all);
-
-        .action {
-            &.multicheckout {
-                color: @color-blue2;
-            }
-        }
     }
 
     //  Totals block
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
index e2378eeeef0c1..ad1ac36237ca4 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
@@ -18,7 +18,7 @@
 @checkout-progress-bar-item__transition: background .3s;
 @checkout-progress-bar-item__width: 185px;
 
-@checkout-progress-bar-item__active__background-color: @color-orange-red1;
+@checkout-progress-bar-item__active__background-color: @active__color;
 @checkout-progress-bar-item__active__color: @primary__color;
 @checkout-progress-bar-item__active__font-weight: @font-weight__semibold;
 @checkout-progress-bar-item__complete__color: @link__color;
@@ -32,7 +32,7 @@
 @checkout-progress-bar-item-element-inner__color: @primary__color;
 @checkout-progress-bar-item-element-inner__height: @checkout-progress-bar-item-element-inner__width;
 @checkout-progress-bar-item-element-inner__width: @checkout-progress-bar-item-element__width - ( @checkout-progress-bar-item-element-outer-radius__width*2 );
-@checkout-progress-bar-item-element-inner__active__border-color: @color-orange-red1;
+@checkout-progress-bar-item-element-inner__active__border-color: @active__color;
 @checkout-progress-bar-item-element-inner__active__content: @icon-checkmark;
 
 @checkout-progress-bar-item-element-outer-radius__width: 6px;
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less
index d0ce87beb6ad3..d0edf245dc5b8 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less
@@ -22,7 +22,7 @@
 @checkout-shipping-item__width: 100%/3;
 @checkout-shipping-item-tablet__width: 100%/2;
 @checkout-shipping-item-mobile__width: 100%;
-@checkout-shipping-item__active__border-color: @color-orange-red1;
+@checkout-shipping-item__active__border-color: @active__color;
 
 @checkout-shipping-item-icon__selected__height: 27px;
 @checkout-shipping-item-icon__selected__width: 29px;
diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
index 388ec32b4fc5a..4b73b73405486 100644
--- a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
@@ -12,7 +12,7 @@
 @gift-item-block__border-color: @color-gray-light5;
 @gift-item-block__border-width: @border-width__base;
 
-@gift-item-block-title__color: @color-blue1;
+@gift-item-block-title__color: @link__color;
 @gift-item-block-title-icon__content: @icon-down;
 @gift-item-block-title-icon__active__content: @icon-up;
 @gift-item-block-title-icon__color: @color-gray52;
diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
index 48461892fa631..76baec87e0054 100644
--- a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
@@ -32,7 +32,7 @@
 
                 &[data-count]:after {
                     .lib-css(color, @color-white);
-                    background: @color-orange-red1;
+                    background: @theme__color__secondary;
                     border-radius: 2px;
                     content: attr(data-count);
                     display: inline-block;
diff --git a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
index 7662c60734a1b..ed6b53727da52 100644
--- a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
@@ -48,7 +48,7 @@
                     }
 
                     .error-block {
-                        color: @color-red10;
+                        color: @error__color;
 
                         .error-label {
                             font-weight: @font-weight__bold;
@@ -230,7 +230,7 @@
             }
 
             .error-description {
-                color: @color-red10;
+                color: @error__color;
                 font-weight: @font-weight__regular;
                 margin-bottom: @indent__s;
                 margin-top: -@indent__s;
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index 7c9f5b7a65ab4..60b50cdb91eeb 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1859,7 +1859,7 @@
 
             > .title {
                 strong {
-                    color: @color-blue1;
+                    color: @link__color;
                     font-weight: @font-weight__regular;
                 }
             }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_theme.less b/app/design/frontend/Magento/luma/web/css/source/_theme.less
index 957e622d6a0bb..114fb7b817267 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_theme.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_theme.less
@@ -28,7 +28,7 @@
 @h3__margin-top: @indent__base;
 
 //  Links
-@link__color: @color-blue2;
+@link__color: @theme__color__primary-alt;
 
 //  Focus
 @focus__color: @color-blue3;
@@ -60,14 +60,9 @@
 
 @navigation__background: @color-gray94;
 @navigation-level0-item__active__color: @primary__color;
-@navigation-level0-item__active__border-color: @active__color;
-@navigation-desktop-level0-item__active__border-color: @active__color;
 
-@submenu-desktop-item__active__border-color: @active__color;
-@submenu-item__active__border-color: @active__color;
 @submenu-item__active__color: @navigation-level0-item__active__color;
 
-
 //  Desktop navigation
 @navigation-desktop-level0-item__line-height: 47px;
 @submenu-desktop__font-weight: @font-weight__regular;
@@ -225,7 +220,6 @@
 
 @rating-icon__font-size: 16px;
 @rating-icon__letter-spacing: 2px;
-@rating-icon__active__color: @active__color;
 
 //
 //  Dropdowns
@@ -252,7 +246,7 @@
 @breadcrumbs-icon__font-margin: 0 @indent__s;
 
 @breadcrumbs-current__color: @color-gray-middle5;
-@breadcrumbs-link__color: @color-blue2;
+@breadcrumbs-link__color: @link__color;
 @breadcrumbs-link__visited__color: @breadcrumbs-link__color;
 @breadcrumbs-link__hover__color: @breadcrumbs-link__color;
 @breadcrumbs-link__active__color: @breadcrumbs-link__color;
diff --git a/lib/web/css/source/lib/variables/_buttons.less b/lib/web/css/source/lib/variables/_buttons.less
index 8c31c16143859..8729eca6aca6d 100644
--- a/lib/web/css/source/lib/variables/_buttons.less
+++ b/lib/web/css/source/lib/variables/_buttons.less
@@ -57,14 +57,14 @@
 @button-primary__gradient: false;
 @button-primary__gradient-direction: false;
 
-@button-primary__background: @color-blue1;
-@button-primary__border: 1px solid @color-blue1;
+@button-primary__background: @theme__color__primary;
+@button-primary__border: 1px solid @theme__color__primary;
 @button-primary__color: @color-white;
 @button-primary__gradient-color-start: false;
 @button-primary__gradient-color-end: false;
 
-@button-primary__hover__background: @color-blue2;
-@button-primary__hover__border: 1px solid @color-blue2;
+@button-primary__hover__background: @theme__color__primary-alt;
+@button-primary__hover__border: 1px solid @theme__color__primary-alt;
 @button-primary__hover__color: @button-primary__color;
 @button-primary__hover__gradient-color-start: false;
 @button-primary__hover__gradient-color-end: false;
diff --git a/lib/web/css/source/lib/variables/_colors.less b/lib/web/css/source/lib/variables/_colors.less
index 01e0db03adcdc..9c694468e9f62 100644
--- a/lib/web/css/source/lib/variables/_colors.less
+++ b/lib/web/css/source/lib/variables/_colors.less
@@ -78,7 +78,7 @@
 @color-sky-blue1: #68a8e0;
 
 @color-pink1: #fae5e5;
-@color-dark-pink1: #800080;
+@color-dark-pink1: #800080; // Legacy pink
 
 @color-brownie1: #6f4400;
 @color-brownie-light1: #c07600;
@@ -92,6 +92,10 @@
 //  Color nesting
 //  ---------------------------------------------
 
+@theme__color__primary: @color-blue1;
+@theme__color__primary-alt: @color-blue2;
+@theme__color__secondary: @color-orange-red1;
+
 @primary__color: @color-gray20;
 @primary__color__dark: darken(@primary__color, 35%); // #000
 @primary__color__darker: darken(@primary__color, 13.5%); // #111
@@ -104,5 +108,5 @@
 @page__background-color: @color-white;
 @panel__background-color: darken(@page__background-color, 6%);
 
-@active__color: @color-orange-red1;
+@active__color: @theme__color__secondary;
 @error__color: @color-red10;
diff --git a/lib/web/css/source/lib/variables/_navigation.less b/lib/web/css/source/lib/variables/_navigation.less
index 2a4aa11014dce..3ef1742547426 100644
--- a/lib/web/css/source/lib/variables/_navigation.less
+++ b/lib/web/css/source/lib/variables/_navigation.less
@@ -23,7 +23,7 @@
 @navigation-level0-item__text-decoration: none;
 
 @navigation-level0-item__active__background: '';
-@navigation-level0-item__active__border-color: @color-orange-red1;
+@navigation-level0-item__active__border-color: @active__color;
 @navigation-level0-item__active__border-style: solid;
 @navigation-level0-item__active__border-width: 0 0 0 8px;
 @navigation-level0-item__active__color: '';
@@ -47,7 +47,7 @@
 
 @submenu-item__active__background: '';
 @submenu-item__active__border: 8px;
-@submenu-item__active__border-color: @color-orange-red1;
+@submenu-item__active__border-color: @active__color;
 @submenu-item__active__border-style: solid;
 @submenu-item__active__border-width: 0 0 0 @submenu-item__active__border;
 @submenu-item__active__color: '';
@@ -77,7 +77,7 @@
 @navigation-desktop-level0-item__hover__text-decoration: @navigation-desktop-level0-item__text-decoration;
 
 @navigation-desktop-level0-item__active__background: '';
-@navigation-desktop-level0-item__active__border-color: @color-orange-red1;
+@navigation-desktop-level0-item__active__border-color: @active__color;
 @navigation-desktop-level0-item__active__border-style: solid;
 @navigation-desktop-level0-item__active__border-width: 0 0 3px;
 @navigation-desktop-level0-item__active__color: @navigation-desktop-level0-item__hover__color;
@@ -109,7 +109,7 @@
 @submenu-desktop-item__hover__text-decoration: @navigation-desktop-level0-item__text-decoration;
 
 @submenu-desktop-item__active__background: '';
-@submenu-desktop-item__active__border-color: @color-orange-red1;
+@submenu-desktop-item__active__border-color: @active__color;
 @submenu-desktop-item__active__border-style: solid;
 @submenu-desktop-item__active__border-width: 0 0 0 3px;
 @submenu-desktop-item__active__color: '';
diff --git a/lib/web/css/source/lib/variables/_rating.less b/lib/web/css/source/lib/variables/_rating.less
index 2ffdab8beddfc..ec60d5916315c 100644
--- a/lib/web/css/source/lib/variables/_rating.less
+++ b/lib/web/css/source/lib/variables/_rating.less
@@ -14,6 +14,6 @@
 @rating-icon__letter-spacing: -10px;
 @rating-icon__color: @color-gray78;
 
-@rating-icon__active__color: @color-orange-red1;
+@rating-icon__active__color: @active__color;
 
 @rating-label__hide: false;
diff --git a/lib/web/css/source/lib/variables/_typography.less b/lib/web/css/source/lib/variables/_typography.less
index bf88990fe05c8..205b1fa9c7a3b 100644
--- a/lib/web/css/source/lib/variables/_typography.less
+++ b/lib/web/css/source/lib/variables/_typography.less
@@ -83,13 +83,13 @@
 //  Links
 //  ---------------------------------------------
 
-@link__color: @color-blue1;
+@link__color: @theme__color__primary;
 @link__text-decoration: none;
 
 @link__visited__color: @link__color;
 @link__visited__text-decoration: none;
 
-@link__hover__color: @color-blue2;
+@link__hover__color: @theme__color__primary-alt;
 @link__hover__text-decoration: underline;
 
 @link__active__color: @active__color;
diff --git a/lib/web/mage/gallery/gallery.less b/lib/web/mage/gallery/gallery.less
index ebd6bdd003b81..373708ac35a00 100644
--- a/lib/web/mage/gallery/gallery.less
+++ b/lib/web/mage/gallery/gallery.less
@@ -181,8 +181,8 @@
 
 .fotorama__active {
     .fotorama__dot {
-        background-color: @color-orange-red1;
-        border-color: @color-orange-red1;
+        background-color: @active__color;
+        border-color: @active__color;
     }
 }
 
@@ -237,7 +237,7 @@
     &:extend(.fotorama-print-background);
     backface-visibility: hidden;
     background-image: linear-gradient(to bottom right, rgba(255, 255, 255, 0.25), rgba(64, 64, 64, 0.1));
-    border: 1px solid @color-orange-red1;
+    border: 1px solid @active__color;
     left: 0;
     position: absolute;
     top: 0;
diff --git a/lib/web/mage/gallery/module/_extends.less b/lib/web/mage/gallery/module/_extends.less
index cfcec77603409..ab38cf40f63d9 100644
--- a/lib/web/mage/gallery/module/_extends.less
+++ b/lib/web/mage/gallery/module/_extends.less
@@ -42,7 +42,7 @@
 .fotorama-focus-overlay {
     &:after {
         &:extend(.fotorama-stretch);
-        background-color: @color-blue2;
+        background-color: @theme__color__primary-alt;
         border-radius: inherit;
         content: '';
     }

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 195/932] 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 cf78277532586acf046da9b3c63c40370089fc0b Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Wed, 26 Sep 2018 17:24:02 +0400
Subject: [PATCH 196/932] MAGETWO-91688: Exception when login as restricted
 admin with access only to CMS Block

- Add automated test
---
 .../Mftf/ActionGroup/AdminRoleActionGroup.xml | 51 --------------
 .../Mftf/ActionGroup/AdminUserActionGroup.xml | 56 ----------------
 .../Mftf/Section/AdminCreateRoleSection.xml   | 24 -------
 .../Mftf/Section/AdminDeleteRoleSection.xml   | 15 -----
 .../Mftf/Section/AdminDeleteUserSection.xml   | 15 -----
 .../Mftf/Section/AdminRoleGridSection.xml     | 17 -----
 .../Mftf/Section/AdminUserGridSection.xml     | 17 -----
 ...AnAdminOrderUsingBraintreePaymentTest1.xml | 55 ++++++++--------
 ...inRestrictedUserOnlyAccessCmsBlockTest.xml | 66 +++++++++++++++++++
 .../AdminCreateRoleActionGroup.xml            | 27 ++++++++
 .../AdminCreateUserActionGroup.xml            | 25 +++----
 .../AdminDeleteCreatedRoleActionGroup.xml     | 24 +++++++
 .../AdminDeleteUserActionGroup.xml            | 25 +++++++
 .../Mftf/Section/AdminEditRoleInfoSection.xml |  1 +
 .../Mftf/Section/AdminRoleGridSection.xml     |  7 ++
 .../Mftf/Section/AdminUserGridSection.xml     |  7 ++
 16 files changed, 197 insertions(+), 235 deletions(-)
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedRoleActionGroup.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml

diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
deleted file mode 100644
index e86d5403e11eb..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
-    <actionGroup name="GoToUserRoles">
-        <click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
-        <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
-        <click selector="//span[contains(text(), 'User Roles')]" stepKey="clickToSelectUserRoles"/>
-        <waitForPageLoad stepKey="waitForUserRolesPageToOpen"/>
-    </actionGroup>
-
-    <!--Create new role-->
-    <actionGroup name="AdminCreateRole">
-        <arguments>
-            <argument name="role" type="string" defaultValue=""/>
-            <argument name="resource" type="string" defaultValue="All"/>
-            <argument name="scope" type="string" defaultValue="Custom"/>
-            <argument name="websites" type="string" defaultValue="Main Website"/>
-        </arguments>
-        <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
-        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
-        <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
-        <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
-        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
-        <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
-        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
-        <see userInput="You saved the role." stepKey="seeSuccessMessage" />
-    </actionGroup>
-
-
-    <!--Delete role-->
-    <actionGroup name="AdminDeleteRoleActionGroup">
-        <arguments>
-            <argument name="role" defaultValue=""/>
-        </arguments>
-        <click stepKey="clickOnRole" selector="{{AdminDeleteRoleSection.theRole}}"/>
-        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteRoleSection.current_pass}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-        <click stepKey="clickToDeleteRole" selector="{{AdminDeleteRoleSection.delete}}"/>
-        <waitForAjaxLoad stepKey="waitForDeleteConfirmationPopup" time="5"/>
-        <click stepKey="clickToConfirm" selector="{{AdminDeleteRoleSection.confirm}}"/>
-        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
-        <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
-    </actionGroup>
-</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
deleted file mode 100644
index 23c322083773c..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
-    <!--Go to all users-->
-    <actionGroup name="GoToAllUsers">
-        <click selector="{{AdminCreateUserSection.system}}" stepKey="clickOnSystemIcon"/>
-        <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
-        <click selector="{{AdminCreateUserSection.allUsers}}" stepKey="clickToSelectUserRoles"/>
-        <waitForPageLoad stepKey="waitForUserRolesPageToOpen"/>
-    </actionGroup>
-
-    <!--Create new user with specified role-->
-    <actionGroup name="AdminCreateUserAction">
-        <click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
-        <waitForPageLoad stepKey="waitForNewUserPageLoad" time="10"/>
-        <fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{NewAdmin.username}}" stepKey="enterUserName" />
-        <fillField selector="{{AdminCreateUserSection.firstNameTextField}}" userInput="{{NewAdmin.firstName}}" stepKey="enterFirstName" />
-        <fillField selector="{{AdminCreateUserSection.lastNameTextField}}" userInput="{{NewAdmin.lastName}}" stepKey="enterLastName" />
-        <fillField selector="{{AdminCreateUserSection.emailTextField}}" userInput="{{NewAdmin.email}}" stepKey="enterEmail" />
-        <fillField selector="{{AdminCreateUserSection.passwordTextField}}" userInput="{{NewAdmin.password}}" stepKey="enterPassword" />
-        <fillField selector="{{AdminCreateUserSection.pwConfirmationTextField}}" userInput="{{NewAdmin.password}}" stepKey="confirmPassword" />
-        <fillField selector="{{AdminCreateUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
-        <scrollToTopOfPage stepKey="scrollToTopOfPage" />
-        <click selector="{{AdminCreateUserSection.userRoleTab}}" stepKey="clickUserRole" />
-        <waitForAjaxLoad stepKey="waitForRoles" time="5"/>
-        <fillField selector="{{AdminCreateRoleSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
-        <click selector="{{AdminCreateRoleSection.searchButton}}" stepKey="clickSearch" />
-        <waitForPageLoad stepKey="waitForSearch" time="10"/>
-        <click selector="{{AdminCreateRoleSection.searchResultFirstRow}}" stepKey="selectRole" />
-        <click selector="{{AdminCreateUserSection.saveButton}}" stepKey="clickSaveUser" />
-        <waitForPageLoad stepKey="waitForSaveUser" time="10"/>
-        <see userInput="You saved the user." stepKey="seeSuccessMessage" />
-    </actionGroup>
-
-
-    <!--Delete User-->
-    <actionGroup name="AdminDeleteUserActionGroup">
-
-        <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
-        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
-        <scrollToTopOfPage stepKey="scrollToTop"/>
-        <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
-        <waitForPageLoad stepKey="waitForDeletePopupOpen" time="5"/>
-        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
-        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
-        <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
-    </actionGroup>
-
-</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
deleted file mode 100644
index 1158f471d51f0..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminCreateRoleSection">
-        <element name="create" type="button" selector="#add"/>
-        <element name="name" type="button" selector="#role_name"/>
-        <element name="password" type="input" selector="#current_password"/>
-        <element name="roleResources" type="button" selector="#role_info_tabs_account"/>
-        <element name="roleResource" type="button" selector="#gws_is_all"/>
-        <element name="resourceValue" type="button" selector="//*[text()='{{arg1}}']" parameterized="true"/>
-        <element name="roleScope" type="button" selector="#all"/>
-        <element name="scopeValue" type="button" selector="//select[@id='all']/*[text()='{{arg2}}']" parameterized="true"/>
-        <element name="website" type="checkbox" selector="//*[contains(text(), '{{arg3}}')]" parameterized="true"/>
-        <element name="save" type="button" selector="//button[@title='Save Role']"/>
-        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
deleted file mode 100644
index 220c9a444b02f..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminDeleteRoleSection">
-        <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
-        <element name="current_pass" type="button" selector="#current_password"/>
-        <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
-        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
deleted file mode 100644
index bf2e2b44eb602..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminDeleteUserSection">
-        <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
-        <element name="password" selector="#user_current_password" type="input"/>
-        <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
-        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
deleted file mode 100644
index 63cbadc71d3d3..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminRoleGridSection">
-        <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
-        <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
deleted file mode 100644
index 9564bc61f799c..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminUserGridSection">
-        <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="usernameInFirstRow" type="text" selector=".col-username"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-        <element name="successMessage" type="text" selector=".message-success"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
index df2e98816f0d3..0f1216d1652d1 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -22,42 +22,40 @@
             </skip>
         </annotations>
 
-
         <before>
             <!--Login As Admin-->
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-
             <!--CreateNewProduct-->
             <actionGroup ref="CreateNewProductActionGroup" stepKey="CreateNewProduct"/>
-
             <!--Create New Customer-->
             <actionGroup ref="CreateCustomerActionGroup" stepKey="CreateCustomer"/>
-
         </before>
 
-
         <!--Configure Braintree-->
         <actionGroup ref="ConfigureBraintree" stepKey="configureBraintree"/>
 
         <!--Create New Role-->
-        <actionGroup ref="GoToUserRoles" stepKey="GoToUserRoles"/>
-        <actionGroup ref="AdminCreateRole" stepKey="AdminCreateNewRole"/>
-
-        <!--Create New User With Specific Role-->
-        <actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
-        <actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
-
-        <!--SignOut-->
-        <actionGroup ref="SignOut" stepKey="signOutFromAdmin"/>
-
-        <!--SignIn New User-->
-        <actionGroup ref="LoginNewUser" stepKey="signInNewUser"/>
-        <waitForPageLoad stepKey="waitForLogin" time="3"/>
+        <actionGroup ref="AdminCreateRoleActionGroup" stepKey="adminCreateRole">
+            <argument name="restrictedRole" value="Sales"/>
+            <argument name="User" value="adminRole"/>
+        </actionGroup>
+
+        <!--Create new admin user-->
+        <actionGroup ref="AdminCreateUserActionGroup" stepKey="adminCreateUser">
+            <argument name="role" value="adminRole"/>
+        </actionGroup>
+
+        <!--Log out-->
+        <actionGroup ref="SignOut" stepKey="SignOut"/>
+        <!--Log in as new user-->
+        <actionGroup ref="LoginAsAnyUser" stepKey="LoginActionGroup">
+            <argument name="uname" value="{{newAdmin.username}}"/>
+            <argument name="passwd" value="{{newAdmin.password}}"/>
+        </actionGroup>
 
         <!--Create New Order-->
         <actionGroup ref="CreateNewOrderActionGroup" stepKey="createNewOrder"/>
 
-
         <after>
             <!--SignOut-->
             <actionGroup ref="SignOut" stepKey="signOutFromNewUser"/>
@@ -73,15 +71,16 @@
                 <argument name="lastName" value="NewCustomerData.LastName"/>
             </actionGroup>
 
-            <!--Delete User -->
-            <actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>
-            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
-
-            <!--Delete Role-->
-            <actionGroup ref="GoToUserRoles" stepKey="GoBackToUserRoles"/>
-            <actionGroup ref="AdminDeleteRoleActionGroup" stepKey="AdminDeleteRoleActionGroup"/>
-
+            <!--Delete created user-->
+            <actionGroup ref="DeleteCreatedUserActionGroup" stepKey="AdminDeleteUserActionGroup">
+                <argument name="user" value="adminRole"/>
+            </actionGroup>
+            <!--Delete created role-->
+            <actionGroup ref="AdminDeleteCreatedRoleActionGroup" stepKey="AdminDeleteRoleActionGroup">
+                <argument name="role" value="adminRole"/>
+            </actionGroup>
+            <!--Log Out-->
+            <actionGroup ref="logout" stepKey="logOut2"/>
         </after>
-
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml
new file mode 100644
index 0000000000000..f39912b6c9440
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml
@@ -0,0 +1,66 @@
+<?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="AdminRestrictedUserOnlyAccessCmsBlockTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="MAGETWO-91688: Exception when login as restricted admin with access only to CMS Block"/>
+            <title value="Check: restricted admin with access only to CMS Block"/>
+            <description value="Check that the system shows information only in Blocks"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94804"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
+        </before>
+
+        <!--Create restricted roles for this user. Access to Content->Blocks only-->
+        <actionGroup ref="AdminCreateRoleActionGroup" stepKey="adminCreateRole">
+            <argument name="restrictedRole" value="Blocks"/>
+            <argument name="User" value="adminRole"/>
+        </actionGroup>
+
+        <!--Create new admin user-->
+        <actionGroup ref="AdminCreateUserActionGroup" stepKey="adminCreateUser">
+            <argument name="role" value="adminRole"/>
+        </actionGroup>
+
+        <!--Log out-->
+        <actionGroup ref="SignOut" stepKey="SignOut"/>
+        <!--Log in as new user-->
+        <actionGroup ref="LoginAsAnyUser" stepKey="LoginActionGroup">
+            <argument name="uname" value="{{newAdmin.username}}"/>
+            <argument name="passwd" value="{{newAdmin.password}}"/>
+        </actionGroup>
+
+        <!--Verify that The system shows information included in "Blocks"-->
+        <see stepKey="seeBlocksPage" userInput="Blocks"/>
+        <seeInCurrentUrl url="{{CmsBlocksPage.url}}" stepKey="assertUrl"/>
+
+        <!--Log Out-->
+        <actionGroup ref="logout" stepKey="logOut1"/>
+
+        <after>
+            <!--Login as Admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="logInForDeletingCreatedData"/>
+            <!--Delete created user-->
+            <actionGroup ref="DeleteCreatedUserActionGroup" stepKey="AdminDeleteUserActionGroup">
+                <argument name="user" value="adminRole"/>
+            </actionGroup>
+            <!--Delete created role-->
+            <actionGroup ref="AdminDeleteCreatedRoleActionGroup" stepKey="AdminDeleteRoleActionGroup">
+                <argument name="role" value="adminRole"/>
+            </actionGroup>
+            <!--Log Out-->
+            <actionGroup ref="logout" stepKey="logOut2"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
new file mode 100644
index 0000000000000..7fec1b95bdddb
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateRoleActionGroup">
+        <arguments>
+            <argument name="restrictedRole"/>
+            <argument name="User"/>
+        </arguments>
+        <amOnPage url="{{AdminEditRolePage.url}}" stepKey="navigateToNewRole"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <fillField selector="{{AdminEditRoleInfoSection.roleName}}" userInput="{{User.name}}" stepKey="fillRoleName" />
+        <fillField selector="{{AdminEditRoleInfoSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterPassword" />
+        <click selector="{{AdminEditRoleInfoSection.roleResourcesTab}}" stepKey="clickRoleResourcesTab" />
+        <waitForElementVisible selector="{{AdminEditRoleResourcesSection.roleScopes}}"  stepKey="waitForScopeSelection" />
+        <selectOption selector="{{AdminEditRoleResourcesSection.resourceAccess}}" userInput="0" stepKey="selectResourceAccessCustom"/>
+        <waitForElementVisible stepKey="waitForElementVisible" selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}" time="30"/>
+        <click stepKey="clickContentBlockCheckbox" selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}"/>
+        <click selector="{{AdminEditRoleInfoSection.saveButton}}" stepKey="clickSaveRoleButton" />
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
index e8aff30ff8d67..10bff39b7a46c 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
@@ -10,23 +10,24 @@
     <actionGroup name="AdminCreateUserActionGroup">
         <arguments>
             <argument name="role"/>
-            <argument name="User" defaultValue="admin2"/>
+            <argument name="User" defaultValue="newAdmin"/>
         </arguments>
-        <amOnPage url="{{AdminEditUserPage.url}}" stepKey="navigateToNewUser"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
-        <fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{admin2.username}}" stepKey="enterUserName" />
-        <fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{admin2.firstName}}" stepKey="enterFirstName" />
-        <fillField selector="{{AdminEditUserSection.lastNameTextField}}" userInput="{{admin2.lastName}}" stepKey="enterLastName" />
-        <fillField selector="{{AdminEditUserSection.emailTextField}}" userInput="{{admin2.username}}@magento.com" stepKey="enterEmail" />
-        <fillField selector="{{AdminEditUserSection.passwordTextField}}" userInput="{{admin2.password}}" stepKey="enterPassword" />
-        <fillField selector="{{AdminEditUserSection.pwConfirmationTextField}}" userInput="{{admin2.password}}" stepKey="confirmPassword" />
+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
+        <waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
+        <click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
+        <fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{newAdmin.username}}" stepKey="enterUserName" />
+        <fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{newAdmin.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{AdminEditUserSection.lastNameTextField}}" userInput="{{newAdmin.lastName}}" stepKey="enterLastName" />
+        <fillField selector="{{AdminEditUserSection.emailTextField}}" userInput="{{newAdmin.username}}@magento.com" stepKey="enterEmail" />
+        <fillField selector="{{AdminEditUserSection.passwordTextField}}" userInput="{{newAdmin.password}}" stepKey="enterPassword" />
+        <fillField selector="{{AdminEditUserSection.pwConfirmationTextField}}" userInput="{{newAdmin.password}}" stepKey="confirmPassword" />
         <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
         <scrollToTopOfPage stepKey="scrollToTopOfPage" />
         <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRole" />
-        <fillField selector="{{AdminEditUserRoleSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
-        <click selector="{{AdminEditUserRoleSection.searchButton}}" stepKey="clickSearch" />
+        <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
+        <click selector="{{AdminEditUserSection.searchButton}}" stepKey="clickSearch" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
-        <click selector="{{AdminEditUserRoleSection.searchResultFirstRow}}" stepKey="selectRole" />
+        <click selector="{{AdminEditUserSection.searchResultFirstRow}}" stepKey="selectRole" />
         <click selector="{{AdminEditUserSection.saveButton}}" stepKey="clickSaveUser" />
         <waitForPageLoad stepKey="waitForPageLoad2" />
         <see userInput="You saved the user." stepKey="seeSuccessMessage" />
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedRoleActionGroup.xml
new file mode 100644
index 0000000000000..813e22df227c8
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedRoleActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteCreatedRoleActionGroup">
+        <arguments>
+            <argument name="role" defaultValue=""/>
+        </arguments>
+        <amOnPage url="{{AdminRolesPage.url}}" stepKey="amOnAdminUsersPage"/>
+        <waitForPageLoad stepKey="waitForUserRolePageLoad"/>
+        <click stepKey="clickToAddNewRole" selector="{{AdminDeleteRoleSection.role(role.name)}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteRoleSection.current_pass}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click stepKey="clickToDeleteRole" selector="{{AdminDeleteRoleSection.delete}}"/>
+        <waitForElementVisible stepKey="wait" selector="{{AdminDeleteRoleSection.confirm}}" time="30"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteRoleSection.confirm}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
new file mode 100644
index 0000000000000..39c54b54b1222
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeleteCreatedUserActionGroup">
+        <arguments>
+            <argument name="user"/>
+        </arguments>
+        <amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
+        <waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
+        <click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.name)}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="clickToDeleteRole" selector="{{AdminDeleteUserSection.delete}}"/>
+        <waitForElementVisible stepKey="wait" selector="{{AdminDeleteRoleSection.confirm}}" time="30"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see stepKey="seeDeleteMessageForUser" userInput="You deleted the user."/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
index feb7b3e3bba8b..c9664c92826e5 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -17,5 +17,6 @@
         <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
         <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
         <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
+        <element name="blockName" type="checkbox" selector="//*[text()='{{var}}']//*[@class='jstree-checkbox']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
index 1e1f3457995fe..cef4b0c188d00 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
@@ -14,4 +14,11 @@
         <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
     </section>
+
+    <section name="AdminDeleteRoleSection">
+        <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
+        <element name="current_pass" type="button" selector="#current_password"/>
+        <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
+        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
+    </section>
 </sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
index b6d2645ac7384..48b0d13622450 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml
@@ -14,4 +14,11 @@
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
         <element name="successMessage" type="text" selector=".message-success"/>
     </section>
+
+    <section name="AdminDeleteUserSection">
+        <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
+        <element name="password" selector="#user_current_password" type="input"/>
+        <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
+        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
+    </section>
 </sections>

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 197/932] 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 9c6b710b33fb56ef7c9db5e260c05358714e7357 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 29 Nov 2018 13:41:05 +0400
Subject: [PATCH 198/932] MAGETWO-95812: Required RMA Attributes are not
 validated while Customer submits a return

- Updated automated test
---
 .../ActionGroup/OrderAndReturnActionGroup.xml  | 18 +++++++++---------
 .../Page/StorefrontCreateNewReturnPage.xml     |  2 +-
 .../Page/StorefrontOrderInformationPage.xml    |  2 +-
 ...> StorefrontCreateNewReturnMainSection.xml} |  2 +-
 ...efrontOrderAndReturnInformationSection.xml} |  2 +-
 ... StorefrontOrderInformationMainSection.xml} |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename app/code/Magento/Sales/Test/Mftf/Section/{CreateNewReturnMainSection.xml => StorefrontCreateNewReturnMainSection.xml} (94%)
 rename app/code/Magento/Sales/Test/Mftf/Section/{OrderAndReturnInformationSection.xml => StorefrontOrderAndReturnInformationSection.xml} (93%)
 rename app/code/Magento/Sales/Test/Mftf/Section/{OrderInformationMainSection.xml => StorefrontOrderInformationMainSection.xml} (89%)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml
index 69f6637301bd0..c46dd612022fd 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/OrderAndReturnActionGroup.xml
@@ -9,7 +9,7 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Fill order information fields and click continue-->
-    <actionGroup name="fillOrderInformationActionGroup">
+    <actionGroup name="StorefrontFillOrderInformationActionGroup">
         <arguments>
             <argument name="orderId" type="string"/>
             <argument name="orderLastName"/>
@@ -17,20 +17,20 @@
         </arguments>
         <amOnPage url="{{StorefrontOrdersAndReturnsPage.url}}" stepKey="navigateToOrderAndReturnPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <fillField selector="{{OrderAndReturnInformationSection.orderId}}" userInput="{{orderId}}" stepKey="fillOrderId"/>
-        <fillField selector="{{OrderAndReturnInformationSection.bilingLastName}}" userInput="{{orderLastName}}" stepKey="fillBillingLastName"/>
-        <fillField selector="{{OrderAndReturnInformationSection.email}}" userInput="{{orderEmail}}" stepKey="fillEmail"/>
-        <click selector="{{OrderAndReturnInformationSection.continueButton}}" stepKey="clickContinue"/>
+        <fillField selector="{{StorefrontOrderAndReturnInformationSection.orderId}}" userInput="{{orderId}}" stepKey="fillOrderId"/>
+        <fillField selector="{{StorefrontOrderAndReturnInformationSection.bilingLastName}}" userInput="{{orderLastName}}" stepKey="fillBillingLastName"/>
+        <fillField selector="{{StorefrontOrderAndReturnInformationSection.email}}" userInput="{{orderEmail}}" stepKey="fillEmail"/>
+        <click selector="{{StorefrontOrderAndReturnInformationSection.continueButton}}" stepKey="clickContinue"/>
         <waitForPageLoad stepKey="waitForOrderInformationPageLoad"/>
         <seeInCurrentUrl url="{{StorefrontOrderInformationPage.url}}" stepKey="seeOrderInformationUrl"/>
     </actionGroup>
 
     <!--Enter quantity to return and submit-->
-    <actionGroup name="fillQuantityToReturnActionGroup">
-        <click selector="{{OrderInformationMainSection.return}}" stepKey="gotToCreateNewReturnPage"/>
+    <actionGroup name="StorefrontFillQuantityToReturnActionGroup">
+        <click selector="{{StorefrontOrderInformationMainSection.return}}" stepKey="gotToCreateNewReturnPage"/>
         <waitForPageLoad stepKey="waitForReturnPageLoad"/>
-        <fillField selector="{{CreateNewReturnMainSection.quantityToReturn}}" userInput="1" stepKey="fillQuantityToReturn"/>
-        <click selector="{{CreateNewReturnMainSection.submit}}" stepKey="clickSubmit"/>
+        <fillField selector="{{StorefrontCreateNewReturnMainSection.quantityToReturn}}" userInput="1" stepKey="fillQuantityToReturn"/>
+        <click selector="{{StorefrontCreateNewReturnMainSection.submit}}" stepKey="clickSubmit"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml
index f578626156fee..2a14f814eac16 100644
--- a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCreateNewReturnPage.xml
@@ -9,6 +9,6 @@
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="StorefrontCreateNewReturnPage" url="rma/guest/create/order_id/" area="guest" module="Magento_Sales">
-        <section name="CreateNewReturnMainSection"/>
+        <section name="StorefrontCreateNewReturnMainSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
index e18a80eb45fb1..4159f9435c866 100644
--- a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontOrderInformationPage.xml
@@ -9,6 +9,6 @@
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="StorefrontOrderInformationPage" url="sales/guest/view" area="guest" module="Magento_Sales">
-        <section name="OrderInformationMainSection"/>
+        <section name="StorefrontOrderInformationMainSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/CreateNewReturnMainSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontCreateNewReturnMainSection.xml
similarity index 94%
rename from app/code/Magento/Sales/Test/Mftf/Section/CreateNewReturnMainSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/StorefrontCreateNewReturnMainSection.xml
index e1349520e2742..fe8391cf3c28f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/CreateNewReturnMainSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontCreateNewReturnMainSection.xml
@@ -8,7 +8,7 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="CreateNewReturnMainSection">
+    <section name="StorefrontCreateNewReturnMainSection">
         <element name="quantityToReturn" type="input" selector="#items:qty_requested0"/>
         <element name="submit" type="submit" selector="//span[contains(text(), 'Submit')]"/>
         <element name="resolutionError" type="text" selector="//*[@id='items:resolution0']/following-sibling::div[contains(text(),'Please select an option')]"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrderAndReturnInformationSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml
similarity index 93%
rename from app/code/Magento/Sales/Test/Mftf/Section/OrderAndReturnInformationSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml
index 65f7f8c701d72..aa57dd9bc17ba 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/OrderAndReturnInformationSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderAndReturnInformationSection.xml
@@ -8,7 +8,7 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="OrderAndReturnInformationSection">
+    <section name="StorefrontOrderAndReturnInformationSection">
         <element name="orderId" type="input" selector="#oar-order-id"/>
         <element name="bilingLastName" type="input" selector="#oar-billing-lastname"/>
         <element name="findOrderBy" type="select" selector="#quick-search-type-id"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrderInformationMainSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml
similarity index 89%
rename from app/code/Magento/Sales/Test/Mftf/Section/OrderInformationMainSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml
index b5c21db09332d..e42c301206152 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/OrderInformationMainSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderInformationMainSection.xml
@@ -8,7 +8,7 @@
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="OrderInformationMainSection">
+    <section name="StorefrontOrderInformationMainSection">
         <element name="orderTitle" type="span" selector="#page-title-wrapper"/>
         <element name="return" type="span" selector="//span[contains(text(), 'Return')]"/>
     </section>

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 199/932] 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 6b3e090b3977e4bc9f56b6deac390da10514f8d8 Mon Sep 17 00:00:00 2001
From: Wilko Nienhaus <wilko.nienhaus@vaimo.com>
Date: Thu, 29 Nov 2018 16:49:21 +0100
Subject: [PATCH 200/932] ensure topic is always lower case

---
 app/code/Magento/WebapiAsync/Model/Config.php                 | 2 +-
 app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php   | 4 ++--
 .../Magento/AsynchronousOperations/Model/MassScheduleTest.php | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/WebapiAsync/Model/Config.php b/app/code/Magento/WebapiAsync/Model/Config.php
index 723a5960b42d6..cfb9ebe0c40ea 100644
--- a/app/code/Magento/WebapiAsync/Model/Config.php
+++ b/app/code/Magento/WebapiAsync/Model/Config.php
@@ -158,7 +158,7 @@ private function generateLookupKeyByRouteData($routeUrl, $httpMethod)
     private function generateTopicNameFromService($serviceInterface, $serviceMethod, $httpMethod)
     {
         $typeName = strtolower(sprintf('%s.%s', $serviceInterface, $serviceMethod));
-        return self::TOPIC_PREFIX . $this->generateKey($typeName, $httpMethod, '\\', false);
+        return strtolower(self::TOPIC_PREFIX . $this->generateKey($typeName, $httpMethod, '\\', false));
     }
 
     /**
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
index 3bf78aeb4008f..563af162c6f89 100644
--- a/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
@@ -77,13 +77,13 @@ public function testGetServicesSetsTopicFromServiceContractName()
             'async.V1.products.POST' => [
                 'interface' => 'Magento\Catalog\Api\ProductRepositoryInterface',
                 'method' => 'save',
-                'topic' => 'async.magento.catalog.api.productrepositoryinterface.save.POST',
+                'topic' => 'async.magento.catalog.api.productrepositoryinterface.save.post',
             ]
         ];
         */
         $result = $this->config->getServices();
 
-        $expectedTopic = 'async.magento.catalog.api.productrepositoryinterface.save.POST';
+        $expectedTopic = 'async.magento.catalog.api.productrepositoryinterface.save.post';
         $lookupKey = 'async.V1.products.POST';
         $this->assertArrayHasKey($lookupKey, $result);
         $this->assertEquals($result[$lookupKey]['topic'], $expectedTopic);
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
index 85bea246c3bda..c43db401da208 100644
--- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
@@ -128,7 +128,7 @@ public function sendBulk($products)
         }
         $this->clearProducts();
 
-        $result = $this->massSchedule->publishMass('async.magento.catalog.api.productrepositoryinterface.save.POST', $products);
+        $result = $this->massSchedule->publishMass('async.magento.catalog.api.productrepositoryinterface.save.post', $products);
 
         //assert bulk accepted with no errors
         $this->assertFalse($result->isErrors());
@@ -206,7 +206,7 @@ public function testScheduleMassOneEntityFailure($products)
 
             $expectedErrorMessage = "Data item corresponding to \"product\" " .
                 "must be specified in the message with topic " .
-                "\"async.magento.catalog.api.productrepositoryinterface.save.POST\".";
+                "\"async.magento.catalog.api.productrepositoryinterface.save.post\".";
             $this->assertEquals(
                 $expectedErrorMessage,
                 $reasonException->getMessage()

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 201/932] 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 202/932] 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 203/932] 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 400f22bd9aa2a816ed978cf2bc66448140343aa4 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 30 Nov 2018 12:19:49 -0600
Subject: [PATCH 204/932] MC-5554: [GraphQL] Not valid scenario's name in
 GraphQL PAT builds

---
 setup/performance-toolkit/benchmark.jmx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 7c864cce930a3..c631cc27e9ebc 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -41079,7 +41079,7 @@ if (totalCount == null) {
       <hashTree/>
     </hashTree>
   
-    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search only" enabled="true">
+    <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Query products with full text search and filters" enabled="true">
       <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
       <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
         <collectionProp name="Arguments.arguments">

From 3ebea0e0ba2ea9bd7ab4e56224bea9086b563770 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <dmacaulay@magento.com>
Date: Fri, 30 Nov 2018 15:45:41 -0600
Subject: [PATCH 205/932] MC-3812: Text/Banner - Stage Inline Editor becomes
 focused and editable after clicking Save button on Edit Form

- Resolve issue with fixRangeSelection function
---
 lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
index 2d7ea07cd823e..ccfc82dcb0b75 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
@@ -559,10 +559,12 @@ define([
             var selection = editor.selection,
                 dom = editor.dom,
                 rng = dom.createRng(),
+                doc = editor.getDoc(),
                 markerHtml,
                 marker;
 
-            if (!selection.getContent().length) {
+            // Validate the range we're trying to fix is contained within the current editors document
+            if (!selection.getContent().length && jQuery.contains(doc, selection.getRng().startContainer)) {
                 markerHtml = '<span id="mce_marker" data-mce-type="bookmark">\uFEFF</span>';
                 selection.setContent(markerHtml);
                 marker = dom.get('mce_marker');

From 5d7cd50277d2a9115e839b694fda01b76548bf4d Mon Sep 17 00:00:00 2001
From: Abrar pathan <abrarkhan@krishtechnolabs.com>
Date: Sat, 1 Dec 2018 16:27:47 +0530
Subject: [PATCH 206/932] Fix sale Order Budnle Product Alignment issue- 19501

---
 .../Magento/backend/web/css/source/forms/_fields.less       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index 3503abcc30468..c2c78c52d228a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -121,6 +121,7 @@
 
         > .admin__field-control {
             #mix-grid .column(@field-control-grid__column, @field-grid__columns);
+            padding-top: 7px;
         }
 
         > .admin__field-label {
@@ -148,6 +149,11 @@
             }
         }
     }
+    &.composite-bundle{
+        .admin__field-option{
+            padding-top: 0;
+        }
+    }
 }
 
 .admin__fieldset-product-websites {

From fbf5ebb57de8836ac9ac7480cec7afa0deca8ff8 Mon Sep 17 00:00:00 2001
From: Abrar pathan <abrarkhan@krishtechnolabs.com>
Date: Mon, 3 Dec 2018 14:33:30 +0530
Subject: [PATCH 207/932] used more strict selector for bundle product and add
 space before bracket

---
 .../Magento/backend/web/css/source/forms/_fields.less  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index c2c78c52d228a..d0f8d78067034 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -120,8 +120,7 @@
         }
 
         > .admin__field-control {
-            #mix-grid .column(@field-control-grid__column, @field-grid__columns);
-            padding-top: 7px;
+            #mix-grid .column(@field-control-grid__column, @field-grid__columns); 
         }
 
         > .admin__field-label {
@@ -149,8 +148,11 @@
             }
         }
     }
-    &.composite-bundle{
-        .admin__field-option{
+    &.composite-bundle {
+        > .admin__field-control {
+            padding-top: 7px;
+        }
+        .admin__field-option {
             padding-top: 0;
         }
     }

From acf541e7ba9967be7932bdac5c329fb3841829e1 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 29 Nov 2018 11:54:39 +0400
Subject: [PATCH 208/932] MAGETWO-96106: CMS Block status is not staged

- Updated automated test
---
 .../Magento/Cms/Test/Mftf/Data/BlockData.xml  | 18 ++++++++
 .../Test/Mftf/Page/AdminCmsEditBlockPage.xml  | 14 ++++++
 .../Mftf/Section/AdminBlockGridSection.xml    | 18 ++++++++
 .../ActionGroup/AdminWidgetActionGroup.xml    | 44 +++++++++++++++++++
 .../Widget/Test/Mftf/Data/WidgetData.xml      | 19 ++++++++
 .../Test/Mftf/Page/AdminNewWidgetPage.xml     |  4 +-
 .../Mftf/Section/AdminNewWidgetSection.xml    |  8 +++-
 7 files changed, 122 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
 create mode 100644 app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml
 create mode 100644 app/code/Magento/Widget/Test/Mftf/Data/WidgetData.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml b/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml
new file mode 100644
index 0000000000000..dea047ec43568
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Data/BlockData.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Sales25offBlock" type="block">
+        <data key="title" unique="suffix">Sales25off</data>
+        <data key="identifier" unique="suffix">Sales25off</data>
+        <data key="store_id">All Store Views</data>
+        <data key="content">sales25off everything!</data>
+        <data key="is_active">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml
new file mode 100644
index 0000000000000..3fd100ee02aa2
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Page/AdminCmsEditBlockPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminEditBlockPage" url="cms/block/edit/block_id" area="admin" module="Magento_Cms">
+        <section name="AdminUpdateBlockSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
new file mode 100644
index 0000000000000..ab15570a01f40
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminBlockGridSection">
+        <element name="search" type="input" selector="//input[@placeholder='Search by keyword']"/>
+        <element name="searchButton" type="button" selector="//div[@class='data-grid-search-control-wrap']//label[@class='data-grid-search-label']/following-sibling::button[@class='action-submit']"/>
+        <element name="checkbox" type="checkbox" selector="//label[@class='data-grid-checkbox-cell-inner']//input[@class='admin__control-checkbox']"/>
+        <element name="select" type="select" selector="//tr[@class='data-row']//button[@class='action-select']"/>
+        <element name="editInSelect" type="text" selector="//a[contains(text(), 'Edit')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml
new file mode 100644
index 0000000000000..05c56f588c5d0
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateWidgetActionGroup">
+    <arguments>
+        <argument name="widget"/>
+        <argument name="block" type="string"/>
+    </arguments>
+        <amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="createWidgetPage"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="selectWidgetType"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.designTheme}}" stepKey="selectWidgetDesignTheme"/>
+        <click selector="{{AdminNewWidgetSection.continue}}" stepKey="continue"/>
+        <waitForElement selector="{{AdminNewWidgetSection.widgetTitle}}" time="30" stepKey="waitForElement"/>
+        <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillWidgetTitle"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_id}}" stepKey="selectWidgetStoreView"/>
+        <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
+        <waitForPageLoad stepKey="waitForLoad1"/>
+        <scrollTo selector="{{AdminNewWidgetSection.selectDisplayOn}}" stepKey="scrollToElement" />
+        <selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display}}" stepKey="selectWidgetDisplayOn"/>
+        <waitForElement selector="{{AdminNewWidgetSection.selectContainer}}" time="30" stepKey="waitForContainer"/>
+        <selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="selectWidgetContainer"/>
+        <scrollToTopOfPage stepKey="scrollToAddresses"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad1"/>
+        <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="goToWidgetOptions"/>
+        <waitForElement selector="{{AdminNewWidgetSection.widgetSelectBlock}}" time="60" stepKey="waitForSelectBlock"/>
+        <click selector="{{AdminNewWidgetSection.widgetSelectBlock}}" stepKey="openSelectBlock"/>
+        <waitForPageLoad stepKey="waitForLoadBlocks"/>
+        <selectOption selector="{{AdminNewWidgetSection.blockStatus}}" userInput="Disable" stepKey="chooseStatus"/>
+        <fillField selector="{{AdminNewWidgetSection.selectBlockTitle}}" userInput="{{block}}" stepKey="fillBlockTitle"/>
+        <click selector="{{AdminNewWidgetSection.searchBlock}}" stepKey="searchBlock"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+        <click selector="{{AdminNewWidgetSection.searchedBlock}}" stepKey="clickSearchedBlock"/>
+        <waitForPageLoad stepKey="wait"/>
+        <click selector="{{AdminNewWidgetSection.saveWidget}}" stepKey="saveWidget"/>
+        <waitForPageLoad stepKey="waitForSaving"/>
+        <see userInput="The widget instance has been saved." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetData.xml
new file mode 100644
index 0000000000000..4c6e98aafd765
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetData.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="WidgetWithBlock" type="widget">
+        <data key="type">CMS Static Block</data>
+        <data key="designTheme">Magento Luma</data>
+        <data key="name" unique="suffix">testName</data>
+        <data key="store_id">All Store Views</data>
+        <data key="display">All Pages</data>
+        <data key="container">Page Top</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
index 8eb0a5f65318e..d495a36f68d0a 100644
--- a/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
@@ -7,8 +7,8 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminNewWidgetPage" url="admin/admin/widget_instance/new/" area="admin" module="Magento_Widget">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminNewWidgetPage" url="admin/widget_instance/new/" area="admin" module="Magento_Widget">
         <section name="AdminNewWidgetSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index 38b4df335ea83..bc90c45ae5d5f 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminNewWidgetSection">
         <element name="widgetType" type="select" selector="#code"/>
         <element name="widgetDesignTheme" type="select" selector="#theme_id"/>
@@ -25,5 +25,11 @@
         <element name="applyParameter" type="button" selector=".rule-param-apply"/>
         <element name="openChooser" type="button" selector=".rule-chooser-trigger"/>
         <element name="selectAll" type="checkbox" selector=".admin__control-checkbox"/>
+        <element name="widgetSelectBlock" type="button" selector="//button[@class='action-default scalable btn-chooser']"/>
+        <element name="selectBlockTitle" type="input" selector="//input[@name='chooser_title']"/>
+        <element name="searchBlock" type="button" selector="//div[@class='admin__filter-actions']/button[@title='Search']"/>
+        <element name="blockStatus" type="select" selector="//select[@name='chooser_is_active']"/>
+        <element name="searchedBlock" type="button" selector="//*[@class='magento-message']//tbody/tr/td[1]"/>
+        <element name="saveWidget" type="select" selector="#save"/>
     </section>
 </sections>

From b979a079dac4dd084ccc859091396f6ca32e4435 Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Mon, 3 Dec 2018 13:37:18 +0300
Subject: [PATCH 209/932] MAGETWO-95819: Customer registration fields not
 translated

- Fixed intergration test
---
 .../testsuite/Magento/Customer/Block/Widget/TaxvatTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
index 3650a7e95a36c..77cff328319fa 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
@@ -22,7 +22,7 @@ public function testToHtml()
             \Magento\Customer\Block\Widget\Taxvat::class
         );
 
-        $this->assertContains('title="Tax&#x2F;VAT&#x20;number"', $block->toHtml());
+        $this->assertContains('title="Tax&#x2F;VAT&#x20;Number"', $block->toHtml());
         $this->assertNotContains('required', $block->toHtml());
     }
 
@@ -44,7 +44,7 @@ public function testToHtmlRequired()
             \Magento\Customer\Block\Widget\Taxvat::class
         );
 
-        $this->assertContains('title="Tax&#x2F;VAT&#x20;number"', $block->toHtml());
+        $this->assertContains('title="Tax&#x2F;VAT&#x20;Number"', $block->toHtml());
         $this->assertContains('required', $block->toHtml());
     }
 

From 390877ccc91cdc890a5ae26b738eb9450a9c3293 Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Mon, 3 Dec 2018 15:17:45 +0300
Subject: [PATCH 210/932] MAGETWO-95819: Customer registration fields not
 translated

- Fixed intergration tests
---
 .../Magento/Customer/Block/Widget/GenderTest.php      |  8 +++++++-
 .../Magento/Customer/Block/Widget/TaxvatTest.php      | 11 +++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
index 2cc2c2a426d12..3883f3f88ee5e 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/GenderTest.php
@@ -15,6 +15,9 @@ class GenderTest extends \PHPUnit\Framework\TestCase
     /** @var Gender */
     protected $_block;
 
+    /** @var \Magento\Customer\Model\Attribute */
+    private $_model;
+
     /**
      * Test initialization and set up. Create the Gender block.
      * @return void
@@ -28,6 +31,8 @@ protected function setUp()
         )->createBlock(
             \Magento\Customer\Block\Widget\Gender::class
         );
+        $this->_model = $objectManager->create(\Magento\Customer\Model\Attribute::class);
+        $this->_model->loadByCode('customer', 'gender');
     }
 
     /**
@@ -49,7 +54,8 @@ public function testGetGenderOptions()
     public function testToHtml()
     {
         $html = $this->_block->toHtml();
-        $this->assertContains('<span>Gender</span>', $html);
+        $attributeLabel = $this->_model->getStoreLabel();
+        $this->assertContains('<span>' . $attributeLabel . '</span>', $html);
         $this->assertContains('<option value="1">Male</option>', $html);
         $this->assertContains('<option value="2">Female</option>', $html);
         $this->assertContains('<option value="3">Not Specified</option>', $html);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
index 77cff328319fa..3bc9fea5db381 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Widget/TaxvatTest.php
@@ -22,7 +22,13 @@ public function testToHtml()
             \Magento\Customer\Block\Widget\Taxvat::class
         );
 
-        $this->assertContains('title="Tax&#x2F;VAT&#x20;Number"', $block->toHtml());
+        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Customer\Model\Attribute::class
+        );
+        $model->loadByCode('customer', 'taxvat');
+        $attributeLabel = $model->getStoreLabel();
+
+        $this->assertContains('title="' . $block->escapeHtmlAttr($attributeLabel) . '"', $block->toHtml());
         $this->assertNotContains('required', $block->toHtml());
     }
 
@@ -38,13 +44,14 @@ public function testToHtmlRequired()
         );
         $model->loadByCode('customer', 'taxvat')->setIsRequired(true);
         $model->save();
+        $attributeLabel = $model->getStoreLabel();
 
         /** @var \Magento\Customer\Block\Widget\Taxvat $block */
         $block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Customer\Block\Widget\Taxvat::class
         );
 
-        $this->assertContains('title="Tax&#x2F;VAT&#x20;Number"', $block->toHtml());
+        $this->assertContains('title="' . $block->escapeHtmlAttr($attributeLabel) . '"', $block->toHtml());
         $this->assertContains('required', $block->toHtml());
     }
 

From 64ee8e937481efa0212e63a367d939332b84bb74 Mon Sep 17 00:00:00 2001
From: Suneet <suneet64@gmail.com>
Date: Mon, 3 Dec 2018 21:48:01 +0530
Subject: [PATCH 211/932] Resolved issue if checkbox custom option is not
 required

---
 app/code/Magento/Catalog/Model/Product/Option/Type/Select.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
index 4a257a4781063..d88dd58362896 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -71,7 +71,7 @@ public function validateUserValue($values)
         }
         if (!$this->_isSingleSelection()) {
             $valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId())->load();
-            $valueCount = is_array($value) ? count($value) : 1;
+            $valueCount = is_array($value) ? count($value) : 0;
             if ($valuesCollection->count() != $valueCount) {
                 $this->setIsValid(false);
                 throw new LocalizedException(

From da7f2933f06ea53a2aee396540e159da6ea14d6c Mon Sep 17 00:00:00 2001
From: Tommy Quissens <tommy.quissens@storefront.be>
Date: Fri, 15 Jun 2018 10:48:04 +0200
Subject: [PATCH 212/932] added json hex tag serializer and use it.

code formatting

Backwards compatibility fix

use JSON_HEX_TAG option for not breaking things

use new serializer instead of json_encode

use correct serializer in test

declare return type

use serializer

updated unit testing, now uses serializer

removed space

declare strict type

improved comment

Test new serializer

Test for greater than and lesser than symbol, required by JSON_HEX_TAG option

split comment for readability

Declare strict type on test

Use di to inject

cleanup curly brackets

code cleanup

removed empty phpdoc

Fix BC
---
 app/code/Magento/Checkout/Block/Onepage.php   |  17 +--
 .../Checkout/Test/Unit/Block/OnepageTest.php  |   9 +-
 app/code/Magento/Checkout/etc/frontend/di.xml |   1 +
 .../Ui/TemplateEngine/Xhtml/Result.php        |  14 ++-
 .../Magento/Framework/Serialize/README.md     |   1 +
 .../Serialize/Serializer/JsonHexTag.php       |  35 ++++++
 .../Test/Unit/Serializer/JsonHexTagTest.php   | 116 ++++++++++++++++++
 7 files changed, 180 insertions(+), 13 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
 create mode 100644 lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php

diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index ca6b045ddbb5d..6beba481d4ec8 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -38,7 +38,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
     protected $layoutProcessors;
 
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var \Magento\Framework\Serialize\SerializerInterface
      */
     private $serializer;
 
@@ -48,8 +48,8 @@ class Onepage extends \Magento\Framework\View\Element\Template
      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
      * @param array $data
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @throws \RuntimeException
+     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param \Magento\Framework\Serialize\SerializerInterface $serializerInterface
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -57,7 +57,8 @@ public function __construct(
         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
         array $layoutProcessors = [],
         array $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        \Magento\Framework\Serialize\SerializerInterface $serializerInterface = null
     ) {
         parent::__construct($context, $data);
         $this->formKey = $formKey;
@@ -65,8 +66,8 @@ public function __construct(
         $this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
         $this->configProvider = $configProvider;
         $this->layoutProcessors = $layoutProcessors;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->serializer = $serializerInterface ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
     }
 
     /**
@@ -78,7 +79,7 @@ public function getJsLayout()
             $this->jsLayout = $processor->process($this->jsLayout);
         }
 
-        return json_encode($this->jsLayout, JSON_HEX_TAG);
+        return $this->serializer->serialize($this->jsLayout);
     }
 
     /**
@@ -120,6 +121,6 @@ public function getBaseUrl()
      */
     public function getSerializedCheckoutConfig()
     {
-        return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
+        return  $this->serializer->serialize($this->getCheckoutConfig());
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 54f77c95148ac..b54339aa2c1d8 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -35,7 +35,7 @@ class OnepageTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $serializer;
+    private $serializerMock;
 
     protected function setUp()
     {
@@ -49,7 +49,7 @@ protected function setUp()
             \Magento\Checkout\Block\Checkout\LayoutProcessorInterface::class
         );
 
-        $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->serializerMock = $this->createMock(\Magento\Framework\Serialize\Serializer\JsonHexTag::class);
 
         $this->model = new \Magento\Checkout\Block\Onepage(
             $contextMock,
@@ -57,7 +57,8 @@ protected function setUp()
             $this->configProviderMock,
             [$this->layoutProcessorMock],
             [],
-            $this->serializer
+            $this->serializerMock,
+            $this->serializerMock
         );
     }
 
@@ -93,6 +94,7 @@ public function testGetJsLayout()
         $processedLayout = ['layout' => ['processed' => true]];
         $jsonLayout = '{"layout":{"processed":true}}';
         $this->layoutProcessorMock->expects($this->once())->method('process')->with([])->willReturn($processedLayout);
+        $this->serializerMock->expects($this->once())->method('serialize')->willReturn($jsonLayout);
 
         $this->assertEquals($jsonLayout, $this->model->getJsLayout());
     }
@@ -101,6 +103,7 @@ public function testGetSerializedCheckoutConfig()
     {
         $checkoutConfig = ['checkout', 'config'];
         $this->configProviderMock->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
+        $this->serializerMock->expects($this->once())->method('serialize')->willReturn(json_encode($checkoutConfig));
 
         $this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
     }
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 889689e6c0d16..e9f24f2871395 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -59,6 +59,7 @@
                 <item name="totalsSortOrder" xsi:type="object">Magento\Checkout\Block\Checkout\TotalsProcessor</item>
                 <item name="directoryData" xsi:type="object">Magento\Checkout\Block\Checkout\DirectoryDataProcessor</item>
             </argument>
+            <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\JsonHexTag</argument>
         </arguments>
     </type>
     <type name="Magento\Checkout\Block\Cart\Totals">
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
index e249a64861d43..9304d25cc8a98 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Ui\TemplateEngine\Xhtml;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\JsonHexTag;
 use Magento\Framework\View\Layout\Generator\Structure;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\TemplateEngine\Xhtml\Template;
@@ -42,25 +44,33 @@ class Result implements ResultInterface
      */
     protected $logger;
 
+    /**
+     * @var JsonHexTag
+     */
+    private $jsonSerializer;
+
     /**
      * @param Template $template
      * @param CompilerInterface $compiler
      * @param UiComponentInterface $component
      * @param Structure $structure
      * @param LoggerInterface $logger
+     * @param JsonHexTag $jsonSerializer
      */
     public function __construct(
         Template $template,
         CompilerInterface $compiler,
         UiComponentInterface $component,
         Structure $structure,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        JsonHexTag $jsonSerializer = null
     ) {
         $this->template = $template;
         $this->compiler = $compiler;
         $this->component = $component;
         $this->structure = $structure;
         $this->logger = $logger;
+        $this->jsonSerializer = $jsonSerializer ?? ObjectManager::getInstance()->get(JsonHexTag::class);
     }
 
     /**
@@ -81,7 +91,7 @@ public function getDocumentElement()
     public function appendLayoutConfiguration()
     {
         $layoutConfiguration = $this->wrapContent(
-            json_encode($this->structure->generate($this->component), JSON_HEX_TAG)
+            $this->jsonSerializer->serialize($this->structure->generate($this->component))
         );
         $this->template->append($layoutConfiguration);
     }
diff --git a/lib/internal/Magento/Framework/Serialize/README.md b/lib/internal/Magento/Framework/Serialize/README.md
index 5af8fb7f71b6b..d900f89208a54 100644
--- a/lib/internal/Magento/Framework/Serialize/README.md
+++ b/lib/internal/Magento/Framework/Serialize/README.md
@@ -3,6 +3,7 @@
 **Serialize** library provides interface *SerializerInterface* and multiple implementations:
 
  * *Json* - default implementation. Uses PHP native json_encode/json_decode functions;
+ * *JsonHexTag* - default implementation. Uses PHP native json_encode/json_decode functions with `JSON_HEX_TAG` option enabled;
  * *Serialize* - less secure than *Json*, but gives higher performance on big arrays. Uses PHP native serialize/unserialize functions, does not unserialize objects on PHP 7.
  
 Using *Serialize* implementation directly is discouraged, always use *SerializerInterface*, using *Serialize* implementation may lead to security vulnerabilities.
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
new file mode 100644
index 0000000000000..4a5406ff3fd99
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Serialize\Serializer;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Serialize data to JSON with the JSON_HEX_TAG option enabled
+ * (All < and > are converted to \u003C and \u003E),
+ * unserialize JSON encoded data
+ *
+ * @api
+ * @since 100.2.0
+ */
+class JsonHexTag extends Json implements SerializerInterface
+{
+    /**
+     * @inheritDoc
+     * @since 100.2.0
+     */
+    public function serialize($data): string
+    {
+        $result = json_encode($data, JSON_HEX_TAG);
+        if (false === $result) {
+            throw new \InvalidArgumentException('Unable to serialize value.');
+        }
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
new file mode 100644
index 0000000000000..f8197a279c62a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Serialize\Test\Unit\Serializer;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\Serialize\Serializer\JsonHexTag;
+
+class JsonHexTagTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $json;
+    
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->json = $objectManager->getObject(JsonHexTag::class);
+    }
+
+    /**
+     * @param string|int|float|bool|array|null $value
+     * @param string $expected
+     * @dataProvider serializeDataProvider
+     */
+    public function testSerialize($value, $expected)
+    {
+        $this->assertEquals(
+            $expected,
+            $this->json->serialize($value)
+        );
+    }
+
+    public function serializeDataProvider()
+    {
+        $dataObject = new DataObject(['something']);
+        return [
+            ['', '""'],
+            ['string', '"string"'],
+            [null, 'null'],
+            [false, 'false'],
+            [['a' => 'b', 'd' => 123], '{"a":"b","d":123}'],
+            [123, '123'],
+            [10.56, '10.56'],
+            [$dataObject, '{}'],
+            ['< >', '"\u003C \u003E"'],
+        ];
+    }
+
+    /**
+     * @param string $value
+     * @param string|int|float|bool|array|null $expected
+     * @dataProvider unserializeDataProvider
+     */
+    public function testUnserialize($value, $expected)
+    {
+        $this->assertEquals(
+            $expected,
+            $this->json->unserialize($value)
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function unserializeDataProvider(): array {
+        return [
+            ['""', ''],
+            ['"string"', 'string'],
+            ['null', null],
+            ['false', false],
+            ['{"a":"b","d":123}', ['a' => 'b', 'd' => 123]],
+            ['123', 123],
+            ['10.56', 10.56],
+            ['{}', []],
+            ['"\u003C \u003E"', '< >'],
+        ];
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Unable to serialize value.
+     */
+    public function testSerializeException()
+    {
+        $this->json->serialize(STDOUT);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Unable to unserialize value.
+     * @dataProvider unserializeExceptionDataProvider
+     */
+    public function testUnserializeException($value)
+    {
+        $this->json->unserialize($value);
+    }
+
+    /**
+     * @return array
+     */
+    public function unserializeExceptionDataProvider(): array {
+        return [
+            [''],
+            [false],
+            [null],
+            ['{']
+        ];
+    }
+}

From bcfae0ce0eeeb1203ba114d274d53b816c117c3e Mon Sep 17 00:00:00 2001
From: Stepan Furman <furman.stepan@gmail.com>
Date: Mon, 3 Dec 2018 23:27:04 +0200
Subject: [PATCH 213/932] extend CustomerInput schema

---
 .../Magento/CustomerGraphQl/etc/schema.graphqls    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index a6b48b62568d1..9e33b8a0d3fa7 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -18,10 +18,16 @@ type CustomerToken {
 }
 
 input CustomerInput {
-    firstname: String
-    lastname: String
-    email: String
-    password: String
+    prefix: String
+    firstname: String!
+    middlename: String!
+    lastname: String!
+    suffix: String
+    dob: String
+    taxvat: String
+    gender: String
+    email: String!
+    password: String!
     is_subscribed: Boolean
 }
 

From 9bf12ccb6439e611c762e973ccc5f3d68568669f Mon Sep 17 00:00:00 2001
From: Stepan Furman <furman.stepan@gmail.com>
Date: Tue, 4 Dec 2018 00:52:16 +0200
Subject: [PATCH 214/932] subscription implementetion way changed, schema
 required fields removed, gender input type changed

---
 .../Model/Resolver/CreateCustomer.php         | 21 +++++++++++--------
 .../CustomerGraphQl/etc/schema.graphqls       | 12 +++++------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
index a265dc300b923..51353cd5b27aa 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
@@ -11,6 +11,7 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\CustomerGraphQl\Model\Customer\ChangeSubscriptionStatus;
 use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Exception\LocalizedException;
@@ -22,26 +23,20 @@
 use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Store\Model\StoreManagerInterface;
 
-/**
- * Create customer data resolver
- */
 class CreateCustomer implements ResolverInterface
 {
     /**
      * @var CustomerDataProvider
      */
     private $customerDataProvider;
-
     /**
      * @var AccountManagementInterface
      */
     private $accountManagement;
-
     /**
      * @var CustomerInterfaceFactory
      */
     private $customerFactory;
-
     /**
      * @var DataObjectHelper
      */
@@ -54,6 +49,10 @@ class CreateCustomer implements ResolverInterface
      * @var SubscriberFactory
      */
     private $subscriberFactory;
+    /**
+     * @var ChangeSubscriptionStatus
+     */
+    private $changeSubscriptionStatus;
 
     /**
      * @param DataObjectHelper $dataObjectHelper
@@ -62,6 +61,7 @@ class CreateCustomer implements ResolverInterface
      * @param StoreManagerInterface $storeManager
      * @param SubscriberFactory $subscriberFactory
      * @param CustomerDataProvider $customerDataProvider
+     * @param ChangeSubscriptionStatus $changeSubscriptionStatus
      */
     public function __construct(
         DataObjectHelper $dataObjectHelper,
@@ -69,7 +69,8 @@ public function __construct(
         AccountManagementInterface $accountManagement,
         StoreManagerInterface $storeManager,
         SubscriberFactory $subscriberFactory,
-        CustomerDataProvider $customerDataProvider
+        CustomerDataProvider $customerDataProvider,
+        ChangeSubscriptionStatus $changeSubscriptionStatus
     ) {
         $this->customerDataProvider = $customerDataProvider;
         $this->accountManagement = $accountManagement;
@@ -77,6 +78,7 @@ public function __construct(
         $this->dataObjectHelper = $dataObjectHelper;
         $this->storeManager = $storeManager;
         $this->subscriberFactory = $subscriberFactory;
+        $this->changeSubscriptionStatus = $changeSubscriptionStatus;
     }
 
     /**
@@ -94,13 +96,14 @@ public function resolve(
         }
         try {
             $customer = $this->createUserAccount($args);
+            $customerId = (int)$customer->getId();
             $this->setUpUserContext($context, $customer);
             if (array_key_exists('is_subscribed', $args['input'])) {
                 if ($args['input']['is_subscribed']) {
-                    $this->subscriberFactory->create()->subscribeCustomerById($customer->getId());
+                    $this->changeSubscriptionStatus->execute($customerId, true);
                 }
             }
-            $data = $this->customerDataProvider->getCustomerById((int)$customer->getId());
+            $data = $this->customerDataProvider->getCustomerById($customerId);
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index 9e33b8a0d3fa7..9ff16eddbe5f3 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -19,15 +19,15 @@ type CustomerToken {
 
 input CustomerInput {
     prefix: String
-    firstname: String!
-    middlename: String!
-    lastname: String!
+    firstname: String
+    middlename: String
+    lastname: String
     suffix: String
     dob: String
     taxvat: String
-    gender: String
-    email: String!
-    password: String!
+    gender: Int
+    email: String
+    password: String
     is_subscribed: Boolean
 }
 

From 906aeb25f9c1dd4cf45e343f6405fef0766ab5fd Mon Sep 17 00:00:00 2001
From: Stepan Furman <furman.stepan@gmail.com>
Date: Tue, 4 Dec 2018 09:47:25 +0200
Subject: [PATCH 215/932] added customer input fields doc block, changed try
 catch block for handling only validation exceptions

---
 .../Model/Resolver/CreateCustomer.php         | 15 +++++++++++--
 .../CustomerGraphQl/etc/schema.graphqls       | 22 +++++++++----------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
index 51353cd5b27aa..503c7203233f8 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
@@ -18,8 +18,11 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Validator\Exception as ValidatorException;
 use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -82,7 +85,15 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return array|Value|mixed
+     * @throws GraphQlInputException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function resolve(
         Field $field,
@@ -104,7 +115,7 @@ public function resolve(
                 }
             }
             $data = $this->customerDataProvider->getCustomerById($customerId);
-        } catch (LocalizedException $e) {
+        } catch (ValidatorException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         }
 
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index 9ff16eddbe5f3..d7a00b70303e4 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -18,17 +18,17 @@ type CustomerToken {
 }
 
 input CustomerInput {
-    prefix: String
-    firstname: String
-    middlename: String
-    lastname: String
-    suffix: String
-    dob: String
-    taxvat: String
-    gender: Int
-    email: String
-    password: String
-    is_subscribed: Boolean
+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
+    firstname: String @doc(description: "The customer's first name")
+    middlename: String @doc(description: "The customer's middle name")
+    lastname: String @doc(description: "The customer's family name")
+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
+    email: String @doc(description: "The customer's email address. Required")
+    dob: String @doc(description: "The customer's date of birth")
+    taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
+    gender: Int @doc(description: "The customer's gender(Male - 1, Female - 2)")
+    password: String @doc(description: "The customer's password")
+    is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter")
 }
 
 type CustomerOutput {

From 0136faf798d7c67907981ab25f4db0850aeeaa03 Mon Sep 17 00:00:00 2001
From: Stepan Furman <furman.stepan@gmail.com>
Date: Tue, 4 Dec 2018 11:25:48 +0200
Subject: [PATCH 216/932] turn InputMismatchException into
 GraphQlInputException

---
 .../Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
index 503c7203233f8..ad09fd71efde3 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
@@ -16,6 +16,7 @@
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\State\InputMismatchException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -117,6 +118,8 @@ public function resolve(
             $data = $this->customerDataProvider->getCustomerById($customerId);
         } catch (ValidatorException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
+        } catch (InputMismatchException $e) {
+            throw new GraphQlInputException(__($e->getMessage()));
         }
 
         return ['customer' => $data];

From 72b3c93f37c4c559ec2eab76b16b943d94961527 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <Veronika_Kurochkina@epam.com>
Date: Tue, 4 Dec 2018 14:59:07 +0300
Subject: [PATCH 217/932] MAGETWO-95820: Order placed by new customer before
 they registered is displayed in the admin under the name Guest

- Update automated test
---
 .../Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
index 740d75cb0ffe3..52eb0c3eb69e4 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -51,7 +51,7 @@
             <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
         </actionGroup>
         <grabTextFrom selector="{{CheckoutSuccessRegisterSection.orderNumber}}" stepKey="grabOrderNumber"/>
-        <click selector="{{CustomerAccountSection.createAccount}}" stepKey="clickToCreateAccount"/>
+        <click selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="clickToCreateAccount"/>
         <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CustomerData.password}}" stepKey="TypePassword"/>
         <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CustomerData.password}}" stepKey="TypeConfirmationPassword"/>
         <click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickOnCreateAccount"/>

From 064b76e914ef2f95f8f1476e107194e4a0deae9a Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <Veronika_Kurochkina@epam.com>
Date: Tue, 4 Dec 2018 15:57:38 +0300
Subject: [PATCH 218/932] MAGETWO-95820: Order placed by new customer before
 they registered is displayed in the admin under the name Guest

- Update automated test
---
 .../Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
index 52eb0c3eb69e4..e489f80ab6281 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -52,8 +52,8 @@
         </actionGroup>
         <grabTextFrom selector="{{CheckoutSuccessRegisterSection.orderNumber}}" stepKey="grabOrderNumber"/>
         <click selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="clickToCreateAccount"/>
-        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CustomerData.password}}" stepKey="TypePassword"/>
-        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CustomerData.password}}" stepKey="TypeConfirmationPassword"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{customerData.password}}" stepKey="TypePassword"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{customerData.password}}" stepKey="TypeConfirmationPassword"/>
         <click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickOnCreateAccount"/>
         <see userInput="Thank you for registering" stepKey="verifyAccountCreated"/>
         <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>

From 579772cd4a0813cb8c0c12891707835d37806dd6 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Tue, 4 Dec 2018 16:48:43 +0300
Subject: [PATCH 219/932] MAGETWO-95310: [2.3] Wrong color image when filtering
 by color filter

- CM test fix.
---
 .../Swatches/Block/Product/Renderer/Listing/Configurable.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
index 287134d6bb70a..2e4980c2fbfd0 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
@@ -192,6 +192,7 @@ protected function getOptionImages()
      * Add images to result json config in case of Layered Navigation is used
      *
      * @return array
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      * @since 100.2.0
      */
     protected function _getAdditionalConfig()

From 7ddb7a7633acf47bf27d0616e5a7d28a3e9163bb Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 4 Dec 2018 15:53:48 +0200
Subject: [PATCH 220/932] ENGCOM-3464: Static test fix.

---
 app/code/Magento/Quote/Model/Quote/Address/Total.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 8179b2b19707f..00060c15c10d8 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -7,6 +7,7 @@
 
 /**
  * Class Total
+ *
  * @method string getCode()
  *
  * @api
@@ -172,6 +173,7 @@ public function getAllBaseTotalAmounts()
 
     /**
      * Set the full info, which is used to capture tax related information.
+     *
      * If a string is used, it is assumed to be serialized.
      *
      * @param array|string $info

From 9f80c0106f59bb1d2e5d4409c17045901fee1534 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <Veronika_Kurochkina@epam.com>
Date: Tue, 4 Dec 2018 16:59:39 +0300
Subject: [PATCH 221/932] MAGETWO-95820: Order placed by new customer before
 they registered is displayed in the admin under the name Guest

- Update automated test
---
 .../Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
index e489f80ab6281..79936776ab0ac 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -51,9 +51,9 @@
             <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
         </actionGroup>
         <grabTextFrom selector="{{CheckoutSuccessRegisterSection.orderNumber}}" stepKey="grabOrderNumber"/>
-        <click selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="clickToCreateAccount"/>
-        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{customerData.password}}" stepKey="TypePassword"/>
-        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{customerData.password}}" stepKey="TypeConfirmationPassword"/>
+        <click selector="{{CheckoutSuccessRegisterSection.createAccountButton}}" stepKey="clickCreateAccountButton"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.passwordField}}" userInput="{{CustomerEntityOne.password}}" stepKey="TypePassword"/>
+        <fillField selector="{{StorefrontCustomerCreateFormSection.confirmPasswordField}}" userInput="{{CustomerEntityOne.password}}" stepKey="TypeConfirmationPassword"/>
         <click selector="{{StorefrontCustomerCreateFormSection.createAccountButton}}" stepKey="clickOnCreateAccount"/>
         <see userInput="Thank you for registering" stepKey="verifyAccountCreated"/>
         <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>

From 255b8f226400a1a5f2e2d93b877bfffe1a8f60ea Mon Sep 17 00:00:00 2001
From: Stepan Furman <furman.stepan@gmail.com>
Date: Tue, 4 Dec 2018 20:30:20 +0200
Subject: [PATCH 222/932] split class, format changes

---
 .../Model/Customer/CreateAccount.php          |  78 ++++++++++++
 .../Model/Customer/SetUpUserContext.php       |  23 ++++
 .../Model/Resolver/CreateCustomer.php         | 113 ++++--------------
 3 files changed, 125 insertions(+), 89 deletions(-)
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
new file mode 100644
index 0000000000000..355bd1c6ec853
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Class CreateAccount creates new customer account
+ */
+class CreateAccount
+{
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var AccountManagementInterface
+     */
+    private $accountManagement;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param DataObjectHelper $dataObjectHelper
+     * @param CustomerInterfaceFactory $customerFactory
+     * @param StoreManagerInterface $storeManager
+     * @param AccountManagementInterface $accountManagement
+     */
+    public function __construct(
+        DataObjectHelper $dataObjectHelper,
+        CustomerInterfaceFactory $customerFactory,
+        StoreManagerInterface $storeManager,
+        AccountManagementInterface $accountManagement
+    ) {
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->customerFactory = $customerFactory;
+        $this->accountManagement = $accountManagement;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @param array $args
+     * @return CustomerInterface
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function execute($args)
+    {
+        $customerDataObject = $this->customerFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $customerDataObject,
+            $args['input'],
+            CustomerInterface::class
+        );
+        $store = $this->storeManager->getStore();
+        $customerDataObject->setWebsiteId($store->getWebsiteId());
+        $customerDataObject->setStoreId($store->getId());
+
+        $password = array_key_exists('password', $args['input']) ? $args['input']['password'] : null;
+
+        return $this->accountManagement->createAccount($customerDataObject, $password);
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php b/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
new file mode 100644
index 0000000000000..94131722e5a9f
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Authorization\Model\UserContextInterface;
+
+/**
+ * Set up user context after creating new customer account
+ */
+class SetUpUserContext
+{
+    /**
+     * @param ContextInterface $context
+     * @param CustomerInterface $customer
+     */
+    public function execute(ContextInterface $context, CustomerInterface $customer)
+    {
+        $context->setUserId((int)$customer->getId());
+        $context->setUserType(UserContextInterface::USER_TYPE_CUSTOMER);
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
index ad09fd71efde3..299045c6b62b0 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomer.php
@@ -7,94 +7,62 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Authorization\Model\UserContextInterface;
-use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\CustomerGraphQl\Model\Customer\ChangeSubscriptionStatus;
+use Magento\CustomerGraphQl\Model\Customer\CreateAccount;
 use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
-use Magento\Framework\Api\DataObjectHelper;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\CustomerGraphQl\Model\Customer\SetUpUserContext;
 use Magento\Framework\Exception\State\InputMismatchException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\Validator\Exception as ValidatorException;
-use Magento\Newsletter\Model\SubscriberFactory;
-use Magento\Store\Model\StoreManagerInterface;
 
+/**
+ * Create customer account resolver
+ */
 class CreateCustomer implements ResolverInterface
 {
     /**
      * @var CustomerDataProvider
      */
     private $customerDataProvider;
+
     /**
-     * @var AccountManagementInterface
-     */
-    private $accountManagement;
-    /**
-     * @var CustomerInterfaceFactory
-     */
-    private $customerFactory;
-    /**
-     * @var DataObjectHelper
+     * @var ChangeSubscriptionStatus
      */
-    private $dataObjectHelper;
+    private $changeSubscriptionStatus;
+
     /**
-     * @var StoreManagerInterface
+     * @var CreateAccount
      */
-    private $storeManager;
+    private $createAccount;
+
     /**
-     * @var SubscriberFactory
+     * @var SetUpUserContext
      */
-    private $subscriberFactory;
-    /**
-     * @var ChangeSubscriptionStatus
-     */
-    private $changeSubscriptionStatus;
+    private $setUpUserContext;
 
     /**
-     * @param DataObjectHelper $dataObjectHelper
-     * @param CustomerInterfaceFactory $customerFactory
-     * @param AccountManagementInterface $accountManagement
-     * @param StoreManagerInterface $storeManager
-     * @param SubscriberFactory $subscriberFactory
      * @param CustomerDataProvider $customerDataProvider
      * @param ChangeSubscriptionStatus $changeSubscriptionStatus
+     * @param SetUpUserContext $setUpUserContext
+     * @param CreateAccount $createAccount
      */
     public function __construct(
-        DataObjectHelper $dataObjectHelper,
-        CustomerInterfaceFactory $customerFactory,
-        AccountManagementInterface $accountManagement,
-        StoreManagerInterface $storeManager,
-        SubscriberFactory $subscriberFactory,
         CustomerDataProvider $customerDataProvider,
-        ChangeSubscriptionStatus $changeSubscriptionStatus
+        ChangeSubscriptionStatus $changeSubscriptionStatus,
+        SetUpUserContext $setUpUserContext,
+        CreateAccount $createAccount
     ) {
         $this->customerDataProvider = $customerDataProvider;
-        $this->accountManagement = $accountManagement;
-        $this->customerFactory = $customerFactory;
-        $this->dataObjectHelper = $dataObjectHelper;
-        $this->storeManager = $storeManager;
-        $this->subscriberFactory = $subscriberFactory;
         $this->changeSubscriptionStatus = $changeSubscriptionStatus;
+        $this->createAccount = $createAccount;
+        $this->setUpUserContext = $setUpUserContext;
     }
 
     /**
-     * @param Field $field
-     * @param ContextInterface $context
-     * @param ResolveInfo $info
-     * @param array|null $value
-     * @param array|null $args
-     * @return array|Value|mixed
-     * @throws GraphQlInputException
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
+     * @inheritdoc
      */
     public function resolve(
         Field $field,
@@ -107,9 +75,9 @@ public function resolve(
             throw new GraphQlInputException(__('"input" value should be specified'));
         }
         try {
-            $customer = $this->createUserAccount($args);
+            $customer = $this->createAccount->execute($args);
             $customerId = (int)$customer->getId();
-            $this->setUpUserContext($context, $customer);
+            $this->setUpUserContext->execute($context, $customer);
             if (array_key_exists('is_subscribed', $args['input'])) {
                 if ($args['input']['is_subscribed']) {
                     $this->changeSubscriptionStatus->execute($customerId, true);
@@ -124,37 +92,4 @@ public function resolve(
 
         return ['customer' => $data];
     }
-
-    /**
-     * @param $args
-     * @return CustomerInterface
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
-     */
-    private function createUserAccount($args)
-    {
-        $customerDataObject = $this->customerFactory->create();
-        $this->dataObjectHelper->populateWithArray(
-            $customerDataObject,
-            $args['input'],
-            CustomerInterface::class
-        );
-        $store = $this->storeManager->getStore();
-        $customerDataObject->setWebsiteId($store->getWebsiteId());
-        $customerDataObject->setStoreId($store->getId());
-
-        $password = array_key_exists('password', $args['input']) ? $args['input']['password'] : null;
-
-        return $this->accountManagement->createAccount($customerDataObject, $password);
-    }
-
-    /**
-     * @param $context
-     * @param CustomerInterface $customer
-     */
-    private function setUpUserContext($context, $customer)
-    {
-        $context->setUserId((int)$customer->getId());
-        $context->setUserType(UserContextInterface::USER_TYPE_CUSTOMER);
-    }
 }

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 223/932] 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 3e44f8c891d4398db8f94ecf421b39bdb953eed7 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Wed, 5 Dec 2018 16:52:03 +0200
Subject: [PATCH 224/932] MAGETWO-96908: [2.3] Wrong attribute value in flat
 table

---
 .../Indexer/Product/Flat/FlatTableBuilder.php | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index fbe0d4b550fa6..538d0e3a63488 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -346,12 +346,20 @@ protected function _updateTemporaryTableByStoreValues(
                 }
 
                 //Update not simple attributes (eg. dropdown)
-                if (isset($flatColumns[$attributeCode . $valueFieldSuffix])) {
-                    $select = $this->_connection->select()->joinInner(
-                        ['t' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
-                        't.option_id = et.' . $attributeCode . ' AND t.store_id=' . $storeId,
-                        [$attributeCode . $valueFieldSuffix => 't.value']
-                    );
+                $columnName = $attributeCode . $valueFieldSuffix;
+                if (isset($flatColumns[$columnName])) {
+                    $select = $this->_connection->select();
+                    $select->joinLeft(
+                        ['t0' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
+                        't0.option_id = et.' . $attributeCode . ' AND t0.store_id = 0',
+                        []
+                    )->joinLeft(
+                        ['ts' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
+                        'ts.option_id = et.' . $attributeCode . ' AND ts.store_id = ' . $storeId,
+                        []
+                    )->columns(
+                        [$columnName => $this->_connection->getIfNullSql('ts.value', 't0.value')]
+                    )->where($columnName . ' IS NOT NULL');
                     if (!empty($changedIds)) {
                         $select->where($this->_connection->quoteInto('et.entity_id IN (?)', $changedIds));
                     }

From e8f52d92cb37e88794352261454039661f047ab0 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Wed, 5 Dec 2018 16:57:44 +0200
Subject: [PATCH 225/932] MAGETWO-96908: [2.3] Wrong attribute value in flat
 table

---
 .../Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index 538d0e3a63488..3b73d229d77a6 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -11,6 +11,7 @@
 
 /**
  * Class FlatTableBuilder
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FlatTableBuilder
@@ -382,6 +383,8 @@ protected function _getTemporaryTableName($tableName)
     }
 
     /**
+     * Get metadata pool
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()

From 0e94d502b7717ab0abbc4e552007c96d3f02cbc0 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Wed, 5 Dec 2018 17:24:05 +0200
Subject: [PATCH 226/932] MAGETWO-96908: [2.3] Wrong attribute value in flat
 table

---
 .../Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index 3b73d229d77a6..a3322b3231755 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -10,7 +10,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
- * Class FlatTableBuilder
+ * Class for building flat index
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */

From aa180bd125868e08141dc9d919aa216cec5b3b82 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Thu, 6 Dec 2018 10:51:15 +0300
Subject: [PATCH 227/932] MAGETWO-96842: [2.3.x] [Magento Cloud] [QUANS] Tiered
 block displayed on configurable products without any tiered pricing

- Added additional checking for simple products to show tier block.
---
 .../Pricing/Render/TierPriceBox.php           | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php b/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
index 611523a60b06d..447ba16d72710 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\ConfigurableProduct\Pricing\Render;
 
+use Magento\Catalog\Pricing\Price\TierPrice;
+
 /**
  * Responsible for displaying tier price box on configurable product page.
  *
@@ -17,9 +19,27 @@ class TierPriceBox extends FinalPriceBox
      */
     public function toHtml()
     {
-        // Hide tier price block in case of MSRP.
-        if (!$this->isMsrpPriceApplicable()) {
+        // Hide tier price block in case of MSRP or in case when no options with tier price.
+        if (!$this->isMsrpPriceApplicable() && $this->isTierPriceApplicable()) {
             return parent::toHtml();
         }
     }
+
+    /**
+     * Check if at least one of simple products has tier price.
+     *
+     * @return bool
+     */
+    private function isTierPriceApplicable()
+    {
+        $product = $this->getSaleableItem();
+        foreach ($product->getTypeInstance()->getUsedProducts($product) as $simpleProduct) {
+            if ($simpleProduct->isSalable() &&
+                !empty($simpleProduct->getPriceInfo()->getPrice(TierPrice::PRICE_CODE)->getTierPriceList())
+            ) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

From 669928e0c7b8c449ce22910732cf959ed9ac3e5b Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 6 Dec 2018 10:32:04 +0200
Subject: [PATCH 228/932] MAGETWO-95068: Checkout data (shipping address etc)
 not persistant after cart update

---
 ...StorefrontGuestCheckoutDataPersistTest.xml | 57 +++++++++++++++++++
 .../view/frontend/web/js/customer-data.js     |  3 +
 2 files changed, 60 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.xml
new file mode 100644
index 0000000000000..626f095604fa2
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutDataPersistTest.xml
@@ -0,0 +1,57 @@
+<?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="StorefrontGuestCheckoutDataPersistTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="MAGETWO-95068: Checkout data (shipping address etc) not persistant after cart update"/>
+            <title value="Check that checkout data persist after cart update"/>
+            <description value="Checkout data should be persist after updating cart"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-96979"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <!-- Navigate to checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <!-- Fill shipping address -->
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart1">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+        <!-- Navigate to checkout -->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="assertGuestEmail"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="assertGuestFirstName"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="assertGuestLastName"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="assertGuestStreet"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="assertGuestCity"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="assertGuestRegion"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="assertGuestPostcode"/>
+        <seeInField selector="{{CheckoutShippingGuestInfoSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="assertGuestTelephone"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
index 39e3f8d95ee3b..66d37cb84e9cb 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -216,6 +216,9 @@ define([
                     $.cookieStorage.set(privateContentVersion, privateContent);
                 }
                 $.localStorage.set(privateContentVersion, privateContent);
+                _.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
+                    buffer.notify(sectionName, sectionData);
+                });
                 this.reload([], false);
                 isLoading = true;
             } else if (expiredSectionNames.length > 0) {

From 9c0458974065d77e62ac95bbf18f85dae79c1cc5 Mon Sep 17 00:00:00 2001
From: Abrar pathan <abrarkhan@krishtechnolabs.com>
Date: Thu, 6 Dec 2018 14:12:24 +0530
Subject: [PATCH 229/932] issue resolved

---
 .../adminhtml/Magento/backend/web/css/source/forms/_fields.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index d0f8d78067034..17490a4b4c163 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -149,7 +149,7 @@
         }
     }
     &.composite-bundle {
-        > .admin__field-control {
+        .admin__field-control {
             padding-top: 7px;
         }
         .admin__field-option {

From 21c67b9bcbd985fe1a76e29aea7d9852904f1b4f Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Thu, 6 Dec 2018 15:16:44 +0300
Subject: [PATCH 230/932] MAGETWO-95816: Invoice PDF contain different address
 when use arabic symbols

- Added processing for additional fields
---
 .../Sales/Model/Order/Address/Renderer.php    | 46 ++++++++++++++++++-
 .../Sales/Model/Order/Pdf/AbstractPdf.php     | 38 ++-------------
 .../Pdf/Items/Invoice/DefaultInvoice.php      | 18 +++++++-
 3 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Address/Renderer.php b/app/code/Magento/Sales/Model/Order/Address/Renderer.php
index 947c92e04942f..5cbf938214f13 100644
--- a/app/code/Magento/Sales/Model/Order/Address/Renderer.php
+++ b/app/code/Magento/Sales/Model/Order/Address/Renderer.php
@@ -9,6 +9,8 @@
 use Magento\Customer\Model\Address\Config as AddressConfig;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Sales\Model\Order\Address;
+use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Renderer used for formatting an order address
@@ -27,18 +29,26 @@ class Renderer
      */
     protected $eventManager;
 
+    /**
+     * @var StringUtils
+     */
+    private $stringUtils;
+
     /**
      * Constructor
      *
      * @param AddressConfig $addressConfig
      * @param EventManager $eventManager
+     * @param StringUtils $stringUtils
      */
     public function __construct(
         AddressConfig $addressConfig,
-        EventManager $eventManager
+        EventManager $eventManager,
+        StringUtils $stringUtils = null
     ) {
         $this->addressConfig = $addressConfig;
         $this->eventManager = $eventManager;
+        $this->stringUtils = $stringUtils ?: ObjectManager::getInstance()->get(StringUtils::class);
     }
 
     /**
@@ -58,4 +68,38 @@ public function format(Address $address, $type)
         $this->eventManager->dispatch('customer_address_format', ['type' => $formatType, 'address' => $address]);
         return $formatType->getRenderer()->renderArray($address->getData());
     }
+
+    /**
+     * Detect an input string is Arabic
+     *
+     * @param string $subject
+     * @return bool
+     */
+    public function isArabic(string $subject): bool
+    {
+        return (preg_match('/\p{Arabic}/u', $subject) > 0);
+    }
+
+    /**
+     * Reverse text with Arabic characters
+     *
+     * @param string $string
+     * @return string
+     */
+    public function reverseArabicText($string)
+    {
+        $splitText = explode(' ', $string);
+        for ($i = 0; $i < count($splitText); $i++) {
+            if ($this->isArabic($splitText[$i])) {
+                for ($j = $i + 1; $j < count($splitText); $j++) {
+                    $tmp = ($this->isArabic($splitText[$j]))
+                        ? $this->stringUtils->strrev($splitText[$j]) : $splitText[$j];
+                    $splitText[$j] = ($this->isArabic($splitText[$i]))
+                        ? $this->stringUtils->strrev($splitText[$i]) : $splitText[$i];
+                    $splitText[$i] = $tmp;
+                }
+            }
+        }
+        return implode(' ', $splitText);
+    }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index 8cdc90972bbb0..5830d236b1a6d 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -363,38 +363,6 @@ protected function _calcAddressHeight($address)
         return $y;
     }
 
-    /**
-     * Detect an input string is Arabic
-     *
-     * @param string $subject
-     * @return bool
-     */
-    private function isArabic(string $subject): bool
-    {
-        return (preg_match('/\p{Arabic}/u', $subject) > 0);
-    }
-
-    /**
-     * Reverse text with Arabic characters
-     *
-     * @param string $string
-     * @return string
-     */
-    private function reverseArabicText($string)
-    {
-        $splitText = explode(' ', $string);
-        for ($i = 0; $i < count($splitText); $i++) {
-            if ($this->isArabic($splitText[$i])) {
-                for ($j = $i + 1; $j < count($splitText); $j++) {
-                    $tmp = $this->string->strrev($splitText[$j]);
-                    $splitText[$j] = $this->string->strrev($splitText[$i]);
-                    $splitText[$i] = $tmp;
-                }
-            }
-        }
-        return implode(' ', $splitText);
-    }
-
     /**
      * Insert order to pdf page
      *
@@ -506,7 +474,8 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
             if ($value !== '') {
                 $text = [];
                 foreach ($this->string->split($value, 45, true, true) as $_value) {
-                    $text[] = ($this->isArabic($_value)) ? $this->reverseArabicText($_value) : $_value;
+                    $text[] = ($this->addressRenderer->isArabic($_value))
+                        ? $this->addressRenderer->reverseArabicText($_value) : $_value;
                 }
                 foreach ($text as $part) {
                     $page->drawText(strip_tags(ltrim($part)), 35, $this->y, 'UTF-8');
@@ -523,7 +492,8 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
                 if ($value !== '') {
                     $text = [];
                     foreach ($this->string->split($value, 45, true, true) as $_value) {
-                        $text[] = ($this->isArabic($_value)) ? $this->reverseArabicText($_value) : $_value;
+                        $text[] = ($this->addressRenderer->isArabic($_value))
+                            ? $this->addressRenderer->reverseArabicText($_value) : $_value;
                     }
                     foreach ($text as $part) {
                         $page->drawText(strip_tags(ltrim($part)), 285, $this->y, 'UTF-8');
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
index 8562328025540..2b3ee0eb5b971 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Model\Order\Pdf\Items\Invoice;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Model\Order\Address\Renderer;
+
 /**
  * Sales Order Invoice Pdf default items renderer
  */
@@ -17,6 +20,11 @@ class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
      */
     protected $string;
 
+    /**
+     * @var \Magento\Sales\Model\Order\Address\Renderer
+     */
+    private $renderer;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -27,6 +35,8 @@ class DefaultInvoice extends \Magento\Sales\Model\Order\Pdf\Items\AbstractItems
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param \Magento\Sales\Model\Order\Address\Renderer $renderer
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -37,7 +47,8 @@ public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        Renderer $renderer = null
     ) {
         $this->string = $string;
         parent::__construct(
@@ -50,6 +61,7 @@ public function __construct(
             $resourceCollection,
             $data
         );
+        $this->renderer = $renderer ?: ObjectManager::getInstance()->get(Renderer::class);
     }
 
     /**
@@ -66,7 +78,9 @@ public function draw()
         $lines = [];
 
         // draw Product name
-        $lines[0] = [['text' => $this->string->split($item->getName(), 35, true, true), 'feed' => 35]];
+        $productName = ($this->renderer->isArabic($item->getName()))
+            ? $this->renderer->reverseArabicText($item->getName()) : $item->getName();
+        $lines[0] = [['text' => $this->string->split($productName, 35, true, true), 'feed' => 35]];
 
         // draw SKU
         $lines[0][] = [

From 2f3396f7a852a3a820c9d9093029f8d389189e7b Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 6 Dec 2018 15:02:40 +0200
Subject: [PATCH 231/932] Fix static test.

---
 app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php b/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
index c1cb0e8b1bb8b..499f0cd2ca9c5 100644
--- a/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
+++ b/app/code/Magento/Bundle/Model/Plugin/Frontend/Product.php
@@ -10,6 +10,9 @@
 use Magento\Bundle\Model\Product\Type;
 use Magento\Catalog\Model\Product as CatalogProduct;
 
+/**
+ * Add child identities to product identities on storefront.
+ */
 class Product
 {
     /**

From 3a3eb308cab0c2e42b8ff440695ed9167fc2a2b3 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <lusine_papyan@epam.com>
Date: Thu, 6 Dec 2018 17:40:41 +0400
Subject: [PATCH 232/932] MAGETWO-96410: [2.3.x] The cart rule cannot effect
 the cart

- Add automated test script
---
 .../Section/AdminProductFormBundleSection.xml |   2 +
 .../AdminCreateCartPriceRuleActionGroup.xml   |  31 +++++
 .../Test/Mftf/Data/SalesRuleData.xml          |   7 +
 .../AdminCartPriceRulesFormSection.xml        |  10 ++
 ...inCartRulesAppliedForProductInCartTest.xml | 120 ++++++++++++++++++
 5 files changed, 170 insertions(+)
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
index 814d03c52f4be..516f40ac2e7b7 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
@@ -22,6 +22,8 @@
         <element name="bundleOptionXProductYQuantity" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_qty]']" parameterized="true"/>
         <element name="addProductsToOption" type="button" selector="[data-index='modal_set']" timeout="30"/>
         <element name="nthAddProductsToOption" type="button" selector="//tr[{{var}}]//button[@data-index='modal_set']" timeout="30" parameterized="true"/>
+        <element name="bundlePriceType" type="select" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]"/>
+        <element name="bundlePriceValue" type="input" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]"/>
         <!--Select"url Key"InputForm-->
         <element name="urlKey" type="input" selector="//input[@name='product[url_key]']" timeout="30"/>
         <!--AddSelectedProducts-->
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
index 87947fba8095a..9e647a8895f73 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
@@ -23,4 +23,35 @@
         <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
         <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
     </actionGroup>
+
+    <actionGroup name="AdminCreateCartPriceRuleWithConditions" extends="AdminCreateCartPriceRuleActionGroup">
+        <arguments>
+            <argument name="condition1" type="string" defaultValue="Products subselection" />
+            <argument name="condition2" type="string" defaultValue="Category" />
+            <argument name="ruleToChange1" type="string" defaultValue="is" />
+            <argument name="rule1" type="string" defaultValue="equals or greater than" />
+            <argument name="ruleToChange2" type="string" defaultValue="..." />
+            <argument name="rule2" type="string" defaultValue="2" />
+            <argument name="categoryName" type="string" defaultValue="_defaultCategory.name" />
+        </arguments>
+        <remove keyForRemoval="fillDiscountAmount" />
+        <!--Go to Conditions section-->
+        <click selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="openConditionsSection" after="selectActionType" />
+        <click selector="{{AdminCartPriceRulesFormSection.addCondition('1')}}" stepKey="addFirstCondition" after="openConditionsSection" />
+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleCondition('1')}}" userInput="{{condition1}}" stepKey="selectRule" after="addFirstCondition" />
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange1)}}" stepKey="waitForFirstRuleElement" after="selectRule" />
+        <click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange1)}}" stepKey="clickToChangeRule" after="waitForFirstRuleElement" />
+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleParameterSelect('1--1')}}" userInput="{{rule1}}" stepKey="selectRule1" after="clickToChangeRule" />
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="waitForSecondRuleElement" after="selectRule1" />
+        <click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="clickToChangeRule1" after="waitForSecondRuleElement" />
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleParameterInput('1--1')}}" userInput="{{rule2}}" stepKey="fillRule" after="clickToChangeRule1" />
+        <click selector="{{AdminCartPriceRulesFormSection.addCondition('1--1')}}" stepKey="addSecondCondition" after="fillRule" />
+        <selectOption selector="{{AdminCartPriceRulesFormSection.ruleCondition('1--1')}}" userInput="{{condition2}}" stepKey="selectSecondCondition" after="addSecondCondition" />
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="waitForThirdRuleElement" after="selectSecondCondition" />
+        <click selector="{{AdminCartPriceRulesFormSection.ruleParameter(ruleToChange2)}}" stepKey="addThirdCondition" after="waitForThirdRuleElement" />
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.openChooser('1--1--1')}}" stepKey="waitForForthRuleElement" after="addThirdCondition" />
+        <click selector="{{AdminCartPriceRulesFormSection.openChooser('1--1--1')}}" stepKey="openChooser" after="waitForForthRuleElement" />
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="waitForCategoryVisible" after="openChooser" />
+        <checkOption selector="{{AdminCartPriceRulesFormSection.categoryCheckbox(categoryName)}}" stepKey="checkCategoryName" after="waitForCategoryVisible" />
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
index dbca35d6432cc..886d680e9bd50 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
@@ -88,4 +88,11 @@
         <data key="uses_per_coupon">2</data>
         <data key="simple_free_shipping">1</data>
     </entity>
+    <entity name="PriceRuleWithCondition" type="SalesRule">
+        <data key="name" unique="suffix">SalesRule</data>
+        <data key="websites">Main Website</data>
+        <data key="customerGroups">'NOT LOGGED IN', 'General', 'Wholesale', 'Retailer'</data>
+        <data key="apply">Fixed amount discount for whole cart</data>
+        <data key="discountAmount">50</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index 54f7aa97053cb..403372a85ec7d 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -47,5 +47,15 @@
         <element name="couponQty" type="input" selector="#coupons_qty"/>
         <element name="generateCouponsButton" type="button" selector="#coupons_generate_button" timeout="30"/>
         <element name="generatedCouponByIndex" type="text" selector="#couponCodesGrid_table > tbody > tr:nth-child({{var}}) > td.col-code" parameterized="true"/>
+
+        <!--Conditions sub-form-->
+        <element name="conditionsHeader" type="button" selector="div[data-index='conditions']" timeout="30"/>
+        <element name="addCondition" type="button" selector="//*[@id='conditions__{{arg}}__children']//span" parameterized="true"/>
+        <element name="ruleCondition" type="select" selector="rule[conditions][{{arg}}][new_child]" parameterized="true"/>
+        <element name="ruleParameter" type="text" selector="//span[@class='rule-param']/a[contains(text(), '{{arg}}')]" parameterized="true"/>
+        <element name="ruleParameterSelect" type="select" selector="rule[conditions][{{arg}}][operator]" parameterized="true"/>
+        <element name="ruleParameterInput" type="input" selector="rule[conditions][{{arg}}][value]" parameterized="true"/>
+        <element name="openChooser" type="button" selector="//label[@for='conditions__{{arg}}__value']" parameterized="true"/>
+        <element name="categoryCheckbox" type="checkbox" selector="//span[contains(text(), '{{arg}}')]/parent::a/preceding-sibling::input[@type='checkbox']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
new file mode 100644
index 0000000000000..fbcc871a69b97
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
@@ -0,0 +1,120 @@
+<?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="AdminCartRulesAppliedForProductInCartTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="The cart rule cannot effect the cart"/>
+            <title value="Check that cart rules applied for product in cart"/>
+            <description value="Check that cart rules applied for product in cart"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96722"/>
+            <useCaseId value="MAGETWO-96410"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Create category and product-->
+            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct">
+                <field key="price">200</field>
+                <field key="quantity">500</field>
+            </createData>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
+
+            <actionGroup stepKey="deleteProduct1" ref="deleteProductBySku">
+                <argument name="sku" value="{{BundleProduct.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
+                <argument name="ruleName" value="{{PriceRuleWithCondition.name}}"/>
+            </actionGroup>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Start creating a bundle product-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProduct">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillProductNameAndSkuInProductForm" stepKey="fillNameAndSku">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <pressKey selector="{{AdminProductFormSection.productSku}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="enter"/>
+
+        <!--Off dynamic price and set value-->
+        <click  selector="{{AdminProductFormBundleSection.dynamicPrice}}" stepKey="offDynamicPrice"/>
+        <fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="0" stepKey="setProductPrice"/>
+
+        <!-- Add category to product -->
+        <click selector="{{AdminProductFormBundleSection.categoriesDropDown}}" stepKey="dropDownCategories"/>
+        <fillField selector="{{AdminProductFormBundleSection.searchForCategory}}" userInput="$$defaultCategory.name$$" stepKey="searchForCategory"/>
+        <click selector="{{AdminProductFormBundleSection.selectCategory}}" stepKey="selectCategory"/>
+        <click selector="{{AdminProductFormBundleSection.categoriesLabel}}" stepKey="clickOnCategoriesLabelToCloseOptions"/>
+
+        <!-- Add option, a "Radio Buttons" type option, with one product and set fixed price 200-->
+        <actionGroup ref="addBundleOptionWithOneProduct" stepKey="addBundleOptionWithOneProduct">
+            <argument name="x" value="0"/>
+            <argument name="n" value="1"/>
+            <argument name="prodOneSku" value="$$simpleProduct.sku$$"/>
+            <argument name="prodTwoSku" value=""/>
+            <argument name="optionTitle" value="Option One"/>
+            <argument name="inputType" value="radio"/>
+        </actionGroup>
+        <selectOption selector="{{AdminProductFormBundleSection.bundlePriceType}}" userInput="Fixed" stepKey="selectPriceType"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundlePriceValue}}" userInput="200" stepKey="fillPriceValue"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!--Create cart price rule-->
+        <actionGroup ref="AdminCreateCartPriceRuleWithConditions" stepKey="createRule">
+            <argument name="ruleName" value="PriceRuleWithCondition"/>
+            <argument name="condition1" value="Products subselection"/>
+            <argument name="condition2" value="Category"/>
+            <argument name="ruleToChange1" value="is"/>
+            <argument name="rule1" value="equals or greater than"/>
+            <argument name="ruleToChange2" value="..."/>
+            <argument name="rule2" value="2"/>
+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
+        </actionGroup>
+
+        <!--Go to Storefront and add product to cart and checkout from cart-->
+        <amOnPage url="/$$simpleProduct.name$$.html" stepKey="GoToProduct"/>
+        <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="2" stepKey="setQuantity"/>
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="AddProductToCard">
+            <argument name="productName" value="$$simpleProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping"/>
+
+        <!--Check totals-->
+        <grabTextFrom selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="grabSubtotal"/>
+        <grabTextFrom selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="grabShippingTotal"/>
+        <grabTextFrom selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="grabTotal"/>
+        <assertEquals stepKey="assertSubtotal">
+            <expectedResult type="string">$400.00</expectedResult>
+            <actualResult type="variable">$grabSubtotal</actualResult>
+        </assertEquals>
+        <assertEquals stepKey="assertShippingTotal">
+            <expectedResult type="string">$10.00</expectedResult>
+            <actualResult type="variable">$grabShippingTotal</actualResult>
+        </assertEquals>
+        <assertEquals stepKey="assertTotal">
+            <expectedResult type="string">$410.00</expectedResult>
+            <actualResult type="variable">$grabTotal</actualResult>
+        </assertEquals>
+    </test>
+</tests>

From ae6e85f3718f6ec424f3404aff564ea3f253fad8 Mon Sep 17 00:00:00 2001
From: vprohorov <prohorov.vital@gmail.com>
Date: Thu, 6 Dec 2018 17:30:07 +0300
Subject: [PATCH 233/932] MAGETWO-96412: [2.3.x] Not possible to drag specified
 Related/Upsell/Cross-sell products to new positions in Windows 10 machine

- Fixed touch support in grid
---
 .../Ui/view/base/web/js/dynamic-rows/dnd.js   | 82 ++++++++++++-------
 1 file changed, 53 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
index dee9ba7acc172..51a748cbb9414 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
@@ -15,8 +15,7 @@ define([
 ], function (ko, $, _, Element) {
     'use strict';
 
-    var transformProp,
-        isTouchDevice = typeof document.ontouchstart !== 'undefined';
+    var transformProp;
 
     /**
      * Get element context
@@ -110,11 +109,7 @@ define([
          * @param {Object} data - element data
          */
         initListeners: function (elem, data) {
-            if (isTouchDevice) {
-                $(elem).on('touchstart', this.mousedownHandler.bind(this, data, elem));
-            } else {
-                $(elem).on('mousedown', this.mousedownHandler.bind(this, data, elem));
-            }
+            $(elem).on('mousedown touchstart', this.mousedownHandler.bind(this, data, elem));
         },
 
         /**
@@ -125,6 +120,7 @@ define([
          * @param {Object} event - key down event
          */
         mousedownHandler: function (data, elem, event) {
+            this.disableScroll();
             var recordNode = this.getRecordNode(elem),
                 originRecord = $(elem).parents('tr').eq(0),
                 drEl = this.draggableElement,
@@ -137,20 +133,13 @@ define([
             drEl.originRow = originRecord;
             drEl.instance = recordNode = this.processingStyles(recordNode, elem);
             drEl.instanceCtx = this.getRecord(originRecord[0]);
-            drEl.eventMousedownY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY;
+            drEl.eventMousedownY = this.getPageY(event);
             drEl.minYpos =
                 $table.offset().top - originRecord.offset().top + $table.children('thead').outerHeight();
             drEl.maxYpos = drEl.minYpos + $table.children('tbody').outerHeight() - originRecord.outerHeight();
             $tableWrapper.append(recordNode);
-
-            if (isTouchDevice) {
-                this.body.bind('touchmove', this.mousemoveHandler);
-                this.body.bind('touchend', this.mouseupHandler);
-            } else {
-                this.body.bind('mousemove', this.mousemoveHandler);
-                this.body.bind('mouseup', this.mouseupHandler);
-            }
-
+            this.body.bind('mousemove touchmove', this.mousemoveHandler);
+            this.body.bind('mouseup touchend', this.mouseupHandler);
         },
 
         /**
@@ -160,16 +149,13 @@ define([
          */
         mousemoveHandler: function (event) {
             var depEl = this.draggableElement,
-                pageY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY,
+                pageY = this.getPageY(event),
                 positionY = pageY - depEl.eventMousedownY,
                 processingPositionY = positionY + 'px',
                 processingMaxYpos = depEl.maxYpos + 'px',
                 processingMinYpos = depEl.minYpos + 'px',
                 depElement = this.getDepElement(depEl.instance, positionY, depEl.originRow);
 
-            event.stopPropagation();
-            event.preventDefault();
-
             if (depElement) {
                 depEl.depElement ? depEl.depElement.elem.removeClass(depEl.depElement.className) : false;
                 depEl.depElement = depElement;
@@ -192,9 +178,10 @@ define([
          * Mouse up handler
          */
         mouseupHandler: function (event) {
+            this.enableScroll();
             var depElementCtx,
                 drEl = this.draggableElement,
-                pageY = isTouchDevice ? event.originalEvent.touches[0].pageY : event.pageY,
+                pageY = this.getPageY(event),
                 positionY = pageY - drEl.eventMousedownY;
 
             drEl.depElement = this.getDepElement(drEl.instance, positionY, this.draggableElement.originRow);
@@ -212,13 +199,8 @@ define([
 
             drEl.originRow.removeClass(this.draggableElementClass);
 
-            if (isTouchDevice) {
-                this.body.unbind('touchmove', this.mousemoveHandler);
-                this.body.unbind('touchend', this.mouseupHandler);
-            } else {
-                this.body.unbind('mousemove', this.mousemoveHandler);
-                this.body.unbind('mouseup', this.mouseupHandler);
-            }
+            this.body.unbind('mousemove touchmove', this.mousemoveHandler);
+            this.body.unbind('mouseup touchend', this.mouseupHandler);
 
             this.draggableElement = {};
         },
@@ -402,6 +384,48 @@ define([
                 index = _.isFunction(ctx.$index) ? ctx.$index() : ctx.$index;
 
             return this.recordsCache()[index];
+        },
+        /**
+         * Get correct page Y
+         *
+         * @param {Object} event - current event
+         * @returns {integer}
+         */
+        getPageY: function(event) {
+            let pageY;
+            if (event.type.indexOf('touch') >= 0) {
+                if (event.originalEvent.touches[0]) {
+                    pageY = event.originalEvent.touches[0].pageY;
+                } else {
+                    pageY = event.originalEvent.changedTouches[0].pageY;
+                }
+            } else {
+                pageY = event.pageY;
+            }
+            return pageY;
+        },
+
+        /**
+         * Disable page scrolling
+         */
+        disableScroll: function () {
+            document.body.addEventListener('touchmove', this.preventDefault, { passive: false });
+        },
+
+        /**
+         * Enable page scrolling
+         */
+        enableScroll: function () {
+            document.body.removeEventListener('touchmove', this.preventDefault, { passive: false });
+        },
+
+        /**
+         * Prevent default function
+         *
+         * @param {Object} event - event object
+         */
+        preventDefault: function (event) {
+            event.preventDefault();
         }
 
     });

From 742b817e91014575d7786f99d2b407f7c50fcf0c Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 6 Dec 2018 10:44:01 -0600
Subject: [PATCH 234/932] MAGETWO-95928: Remove RequestAwareBlockMethod

---
 .../Magento/Widget/Block/Adminhtml/Widget.php |  2 -
 .../Rule/Design/RequestAwareBlockMethod.php   | 53 -------------------
 .../resources/rulesets/design.xml             | 31 -----------
 .../Magento/Test/Php/_files/phpmd/ruleset.xml |  1 -
 4 files changed, 87 deletions(-)
 delete mode 100644 dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php

diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
index 33e6109b769db..dad318f163b4b 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
@@ -16,8 +16,6 @@ class Widget extends \Magento\Backend\Block\Widget\Form\Container
 {
     /**
      * @inheritdoc
-     *
-     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _construct()
     {
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php
deleted file mode 100644
index 9ce891da718b4..0000000000000
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/RequestAwareBlockMethod.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\CodeMessDetector\Rule\Design;
-
-use PHPMD\AbstractNode;
-use PHPMD\AbstractRule;
-use PHPMD\Node\ClassNode;
-use PHPMD\Node\MethodNode;
-use PDepend\Source\AST\ASTMethod;
-use PHPMD\Rule\MethodAware;
-
-/**
- * Detect direct request usages.
- */
-class RequestAwareBlockMethod extends AbstractRule implements MethodAware
-{
-    /**
-     * @inheritDoc
-     *
-     * @param ASTMethod|MethodNode $method
-     */
-    public function apply(AbstractNode $method)
-    {
-        $definedIn = $method->getParentType();
-        try {
-            $isBlock = ($definedIn instanceof ClassNode)
-                && is_subclass_of(
-                    $definedIn->getFullQualifiedName(),
-                    \Magento\Framework\View\Element\AbstractBlock::class
-                );
-        } catch (\Throwable $exception) {
-            //Failed to load classes.
-            return;
-        }
-
-        if ($isBlock) {
-            $nodes = $method->findChildrenOfType('PropertyPostfix') + $method->findChildrenOfType('MethodPostfix');
-            foreach ($nodes as $node) {
-                $name = mb_strtolower($node->getFirstChildOfType('Identifier')->getImage());
-                if ($name === '_request' || $name === 'getrequest') {
-                    $this->addViolation($method, [$method->getFullQualifiedName()]);
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
index 100e08276e6cf..c9bfe4fe6e308 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/resources/rulesets/design.xml
@@ -54,37 +54,6 @@ class PostOrder implements ActionInterface
         ...
         return $response;
     }
-}
-            ]]>
-        </example>
-    </rule>
-    <rule name="RequestAwareBlockMethod"
-          class="Magento\CodeMessDetector\Rule\Design\RequestAwareBlockMethod"
-          message="{0} uses request object directly. Add user input validation and suppress this warning.">
-        <description>
-            <![CDATA[
-Blocks must not depend on being used with certain controllers.
-If you use request object in a block directly you must validate all user input inside the block.
-            ]]>
-        </description>
-        <priority>2</priority>
-        <properties />
-        <example>
-            <![CDATA[
-class MyOrder extends AbstractBlock
-{
-
-    .......
-
-    public function getOrder()
-    {
-        $orderId = $this->getRequest()->getParam('order_id');
-        //Validate customer having such order.
-        if (!$this->hasOrder($this->getCustomerId(), $orderId)) {
-            ...deny access...
-        }
-        .....
-    }
 }
             ]]>
         </example>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
index 2d9eb7478ce91..fddb1e6fdfc14 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpmd/ruleset.xml
@@ -48,6 +48,5 @@
     <!-- Magento Specific Rules -->
     <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/FinalImplementation" />
     <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/AllPurposeAction" />
-    <rule ref="Magento/CodeMessDetector/resources/rulesets/design.xml/RequestAwareBlockMethod" />
 
 </ruleset>

From ea18265d0f70dd61c3bab38c7eaa53bbdf208670 Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Fri, 7 Dec 2018 14:40:36 +0300
Subject: [PATCH 235/932] MAGETWO-96847: [2.3.x] Special price does not work
 when "default config" scope timezone does not match "website" scope timezone

- Check price for admin scope
---
 app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
index b1bfc6ff4ad6f..77c48fdb1667e 100644
--- a/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/SpecialPrice.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Pricing\Price\AbstractPrice;
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
 
 /**
  * Special price model
@@ -46,6 +47,8 @@ public function __construct(
     }
 
     /**
+     * Retrieve special price.
+     *
      * @return bool|float
      */
     public function getValue()
@@ -96,19 +99,19 @@ public function getSpecialToDate()
     }
 
     /**
-     * @return bool
+     * @inheritdoc
      */
     public function isScopeDateInInterval()
     {
         return $this->localeDate->isScopeDateInInterval(
-            $this->product->getStore(),
+            WebsiteInterface::ADMIN_CODE,
             $this->getSpecialFromDate(),
             $this->getSpecialToDate()
         );
     }
 
     /**
-     * @return bool
+     * @inheritdoc
      */
     public function isPercentageDiscount()
     {

From 7409c8e5e70c11390459c1d87dff6a9c34e62cb1 Mon Sep 17 00:00:00 2001
From: Vital_Pantsialeyeu <vital_pantsialeyeu@epam.com>
Date: Fri, 7 Dec 2018 16:13:57 +0300
Subject: [PATCH 236/932] MAGETWO-96850: [2.3.x] One page Checkout resets
 Customer data if Product Qty was changed

- Changed the logic of getting checkout data
---
 .../view/frontend/web/js/checkout-data.js     | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
index 22b37b2da0b2f..190495dbb6d12 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
@@ -10,7 +10,8 @@
  */
 define([
     'jquery',
-    'Magento_Customer/js/customer-data'
+    'Magento_Customer/js/customer-data',
+    'jquery/jquery-storageapi'
 ], function ($, storage) {
     'use strict';
 
@@ -30,20 +31,27 @@ define([
             var data = storage.get(cacheKey)();
 
             if ($.isEmptyObject(data)) {
-                data = {
-                    'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
-                    'shippingAddressFromData': null, //Shipping address pulled from persistence storage
-                    'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
-                    'selectedShippingRate': null, //Shipping rate pulled from persistence storage
-                    'selectedPaymentMethod': null, //Payment method pulled from persistence storage
-                    'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
-                    'billingAddressFromData': null, //Billing address pulled from persistence storage
-                    'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
-                };
-                saveData(data);
+                data = $.initNamespaceStorage('mage-cache-storage').localStorage.get(cacheKey);
+                if ($.isEmptyObject(data)) {
+                    data = initData();
+                    saveData(data);
+                }
             }
 
             return data;
+        },
+
+        initData = function () {
+            return {
+                'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
+                'shippingAddressFromData': null, //Shipping address pulled from persistence storage
+                'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
+                'selectedShippingRate': null, //Shipping rate pulled from persistence storage
+                'selectedPaymentMethod': null, //Payment method pulled from persistence storage
+                'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
+                'billingAddressFromData': null, //Billing address pulled from persistence storage
+                'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
+            }
         };
 
     return {

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 237/932] 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 e945ba071de2d3dd92e3f454ac9021507967605c Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 7 Dec 2018 17:31:02 +0200
Subject: [PATCH 238/932] Fix static tests.

---
 .../Edit/Action/Attribute/Tab/Inventory.php      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
index 01107412d1006..824d0ae37ea56 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -41,6 +41,7 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
      * @param \Magento\CatalogInventory\Model\Source\Backorders $backorders
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param array $data
+     * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -80,11 +81,13 @@ public function getFieldSuffix()
      * Retrieve current store id
      *
      * @return int
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getStoreId()
     {
-        $storeId = $this->getRequest()->getParam('store');
-        return (int) $storeId;
+        $storeId = (int)$this->getRequest()->getParam('store');
+
+        return $storeId;
     }
 
     /**
@@ -100,6 +103,7 @@ public function getDefaultConfigValue($field)
 
     /**
      * Returns min_sale_qty configuration for the ALL Customer Group
+     *
      * @return int
      */
     public function getDefaultMinSaleQty()
@@ -124,6 +128,8 @@ public function getTabLabel()
     }
 
     /**
+     * Return Tab title.
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
@@ -132,7 +138,7 @@ public function getTabTitle()
     }
 
     /**
-     * @return bool
+     * @inheritdoc
      */
     public function canShowTab()
     {
@@ -140,7 +146,7 @@ public function canShowTab()
     }
 
     /**
-     * @return bool
+     * @inheritdoc
      */
     public function isHidden()
     {
@@ -148,6 +154,8 @@ public function isHidden()
     }
 
     /**
+     * Get availability status.
+     *
      * @param string $fieldName
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)

From d600179622e691be0c24af7dac5b89d24649f3c3 Mon Sep 17 00:00:00 2001
From: Tegan Elizabeth Bold <tegan.bold@gmail.com>
Date: Fri, 7 Dec 2018 13:56:08 -0500
Subject: [PATCH 239/932] Fix issue causing attribute not loading with getList

As specified in issue #17759, CustomerRepository::getList() is
unexpectedly returning NULL, when CustomerRepository::get() is correctly
returning the value. Specifying the attribute as billing_company instead
of company removes the conflict.
---
 .../Magento/Customer/Model/ResourceModel/CustomerRepository.php | 2 +-
 .../Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 77049dac5aa0c..0806a3d9c5d27 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -342,7 +342,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
             ->joinAttribute('billing_telephone', 'customer_address/telephone', 'default_billing', null, 'left')
             ->joinAttribute('billing_region', 'customer_address/region', 'default_billing', null, 'left')
             ->joinAttribute('billing_country_id', 'customer_address/country_id', 'default_billing', null, 'left')
-            ->joinAttribute('company', 'customer_address/company', 'default_billing', null, 'left');
+            ->joinAttribute('billing_company', 'customer_address/company', 'default_billing', null, 'left');
 
         $this->collectionProcessor->process($searchCriteria, $collection);
 
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
index a142f87dcf6c4..3556d283d8a44 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
@@ -740,7 +740,7 @@ public function testGetList()
             ->willReturnSelf();
         $collection->expects($this->at(7))
             ->method('joinAttribute')
-            ->with('company', 'customer_address/company', 'default_billing', null, 'left')
+            ->with('billing_company', 'customer_address/company', 'default_billing', null, 'left')
             ->willReturnSelf();
         $this->collectionProcessorMock->expects($this->once())
             ->method('process')

From f72c0133edd733dfa2526860e2e0414e6e0d626b Mon Sep 17 00:00:00 2001
From: Abrar pathan <abrarkhan@krishtechnolabs.com>
Date: Sat, 8 Dec 2018 15:16:23 +0530
Subject: [PATCH 240/932] Fixed Catalog product action multi select search
 label icon alignment issue

---
 .../backend/web/css/source/actions/_actions-multiselect.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
index 7b99d4f136d21..6a6112fea188a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
@@ -179,7 +179,7 @@
 .admin__action-multiselect-search-label {
     display: block;
     font-size: 1.5rem;
-    height: 1em;
+    height: 1.3em;
     overflow: hidden;
     position: absolute;
     right: 2.2rem;

From 4e18e78941ceba4887ca6f44a905f25e71b41d1b Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Sat, 8 Dec 2018 15:44:36 +0530
Subject: [PATCH 241/932] correct devdocs url from http to https

---
 .github/CONTRIBUTING.md                          |  4 ++--
 CHANGELOG.md                                     |  4 ++--
 app/code/Magento/Analytics/README.md             |  6 +++---
 app/code/Magento/CatalogAnalytics/README.md      |  2 +-
 .../Customer/Api/CustomerRepositoryInterface.php |  2 +-
 .../Customer/Api/GroupRepositoryInterface.php    |  2 +-
 app/code/Magento/CustomerAnalytics/README.md     |  2 +-
 app/code/Magento/Deploy/Model/Filesystem.php     | 16 ++++++++--------
 .../Eav/Api/AttributeSetRepositoryInterface.php  |  2 +-
 .../Magento/Indexer/Model/Message/Invalid.php    |  2 +-
 app/code/Magento/InstantPurchase/README.md       |  6 +++---
 .../Payment/Model/Method/AbstractMethod.php      |  2 +-
 .../Quote/Api/CartRepositoryInterface.php        |  2 +-
 .../GuestPaymentMethodManagementInterface.php    |  2 +-
 .../Api/PaymentMethodManagementInterface.php     |  2 +-
 app/code/Magento/QuoteAnalytics/README.md        |  2 +-
 app/code/Magento/ReleaseNotification/README.md   |  2 +-
 .../Magento/ReleaseNotification/i18n/en_US.csv   |  4 ++--
 .../ui_component/release_notification.xml        |  8 ++++----
 app/code/Magento/ReviewAnalytics/README.md       |  2 +-
 .../Sales/Api/CreditmemoRepositoryInterface.php  |  2 +-
 .../Sales/Api/InvoiceRepositoryInterface.php     |  2 +-
 .../Sales/Api/OrderItemRepositoryInterface.php   |  2 +-
 .../Sales/Api/OrderRepositoryInterface.php       |  2 +-
 .../Sales/Api/ShipmentRepositoryInterface.php    |  2 +-
 .../Sales/Api/TransactionRepositoryInterface.php |  2 +-
 app/code/Magento/SalesAnalytics/README.md        |  2 +-
 .../SalesRule/Api/CouponRepositoryInterface.php  |  2 +-
 .../SalesRule/Api/RuleRepositoryInterface.php    |  2 +-
 app/code/Magento/SampleData/README.md            |  2 +-
 app/code/Magento/Signifyd/README.md              |  8 ++++----
 .../Tax/Api/TaxClassRepositoryInterface.php      |  2 +-
 .../Tax/Api/TaxRateRepositoryInterface.php       |  2 +-
 .../Tax/Api/TaxRuleRepositoryInterface.php       |  2 +-
 app/code/Magento/WishlistAnalytics/README.md     |  2 +-
 .../Magento/Install/Test/Page/DevdocsInstall.xml |  2 +-
 .../Magento/Sniffs/Less/AvoidIdSniff.php         |  2 +-
 .../Sniffs/Less/BracesFormattingSniff.php        |  2 +-
 .../Magento/Sniffs/Less/ClassNamingSniff.php     |  2 +-
 .../Magento/Sniffs/Less/ColonSpacingSniff.php    |  2 +-
 .../Sniffs/Less/ColourDefinitionSniff.php        |  2 +-
 .../Sniffs/Less/CombinatorIndentationSniff.php   |  2 +-
 .../Magento/Sniffs/Less/CommentLevelsSniff.php   |  2 +-
 .../Sniffs/Less/ImportantPropertySniff.php       |  2 +-
 .../Magento/Sniffs/Less/IndentationSniff.php     |  2 +-
 .../Sniffs/Less/PropertiesLineBreakSniff.php     |  2 +-
 .../Sniffs/Less/PropertiesSortingSniff.php       |  2 +-
 .../Magento/Sniffs/Less/QuotesSniff.php          |  2 +-
 .../Sniffs/Less/SelectorDelimiterSniff.php       |  2 +-
 .../Sniffs/Less/SemicolonSpacingSniff.php        |  2 +-
 .../Less/TypeSelectorConcatenationSniff.php      |  2 +-
 .../Magento/Sniffs/Less/TypeSelectorsSniff.php   |  2 +-
 .../Magento/Sniffs/Less/VariablesSniff.php       |  4 ++--
 .../Magento/Sniffs/Less/ZeroUnitsSniff.php       |  4 ++--
 phpserver/README.md                              |  2 +-
 setup/performance-toolkit/README.md              |  2 +-
 .../Setup/Controller/LandingInstaller.php        |  2 +-
 .../Magento/Setup/Controller/LandingUpdater.php  |  2 +-
 setup/src/Magento/Setup/Model/SystemPackage.php  |  2 +-
 setup/view/magento/setup/landing.phtml           |  2 +-
 .../magento/setup/readiness-check/progress.phtml | 16 ++++++++--------
 setup/view/magento/setup/start-updater.phtml     |  2 +-
 62 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index dae954a0970b7..92a51eb84a4ab 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -16,7 +16,7 @@ The Magento 2 development team will review all issues and contributions submitte
 4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
 3. PRs which include new logic or new features must be submitted along with:
 * Unit/integration test coverage
-* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
+* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
 4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
 5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
 
@@ -27,7 +27,7 @@ If you are a new GitHub user, we recommend that you create your own [free github
 1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
+4. Fork the Magento 2 repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b86c7b79a0cbd..322cd10d0ff08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ To get detailed information about changes in Magento 2.3.0, see the [Release Not
 
 2.1.0
 =============
-To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
+To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](https://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
 
 2.0.0
 =============
@@ -1025,7 +1025,7 @@ Tests:
     * Improved backend menu keyboard accessibility
     * Accessibility improvements: WAI-ARIA in a product item on a category page and related products
     * Checkout flow code can work with a separate DB storage
-    * <a href="http://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
+    * <a href="https://devdocs.magento.com/guides/v1.0/release-notes/changes.html#change-devrc-unit">Unit tests moved to module directories</a>
     * Addressed naming inconsistencies in REST routes
     * Added Advanced Developer workflow for frontend developers
 * Setup
diff --git a/app/code/Magento/Analytics/README.md b/app/code/Magento/Analytics/README.md
index 7ec64abcd9b86..f600f1d406e4c 100644
--- a/app/code/Magento/Analytics/README.md
+++ b/app/code/Magento/Analytics/README.md
@@ -1,6 +1,6 @@
 # Magento_Analytics Module
 
-The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
+The Magento_Analytics module integrates your Magento instance with the [Magento Business Intelligence (MBI)](https://magento.com/products/business-intelligence) to use [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html) functionality.
 
 The module implements the following functionality:
 
@@ -16,8 +16,8 @@ The module implements the following functionality:
 
 ## Structure
 
-Beyond the [usual module file structure](http://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
-[Report XML](http://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
+Beyond the [usual module file structure](https://devdocs.magento.com/guides/v2.2/architecture/archi_perspectives/components/modules/mod_intro.html) the module contains a directory `ReportXml`.
+[Report XML](https://devdocs.magento.com/guides/v2.2/advanced-reporting/report-xml.html) is a markup language used to build reports for Advanced Reporting.
 The language declares SQL queries using XML declaration.
 
 ## Subscription Process
diff --git a/app/code/Magento/CatalogAnalytics/README.md b/app/code/Magento/CatalogAnalytics/README.md
index df125446117a3..f93b223c342d7 100644
--- a/app/code/Magento/CatalogAnalytics/README.md
+++ b/app/code/Magento/CatalogAnalytics/README.md
@@ -1,3 +1,3 @@
 # Magento_CatalogAnalytics module
 
-The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
+The Magento_CatalogAnalytics module configures data definitions for a data collection related to the Catalog module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php b/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php
index 2133ae5a323b4..ca9bf4dc7afd6 100644
--- a/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php
+++ b/app/code/Magento/Customer/Api/CustomerRepositoryInterface.php
@@ -51,7 +51,7 @@ public function getById($customerId);
      * Retrieve customers which match a specified criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#CustomerRepositoryInterface to determine
      * which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Customer/Api/GroupRepositoryInterface.php b/app/code/Magento/Customer/Api/GroupRepositoryInterface.php
index 2f5e637a7693f..f6ba387e913b2 100644
--- a/app/code/Magento/Customer/Api/GroupRepositoryInterface.php
+++ b/app/code/Magento/Customer/Api/GroupRepositoryInterface.php
@@ -42,7 +42,7 @@ public function getById($id);
      * be filtered by tax class.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#GroupRepositoryInterface to determine
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#GroupRepositoryInterface to determine
      * which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/CustomerAnalytics/README.md b/app/code/Magento/CustomerAnalytics/README.md
index 8c64ce97629da..9658a8e7d90ed 100644
--- a/app/code/Magento/CustomerAnalytics/README.md
+++ b/app/code/Magento/CustomerAnalytics/README.md
@@ -1,3 +1,3 @@
 # Magento_CustomerAnalytics module
 
-The Magento_CustomerAnalytics module configures data definitions for a data collection related to the Customer module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
+The Magento_CustomerAnalytics module configures data definitions for a data collection related to the Customer module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
index 59880d2d669b4..e7d4d31e6f144 100644
--- a/app/code/Magento/Deploy/Model/Filesystem.php
+++ b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -29,8 +29,8 @@ class Filesystem
      * Access permissions to the files are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to files generated by Magento.
-     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
      */
     const PERMISSIONS_FILE = 0640;
 
@@ -41,8 +41,8 @@ class Filesystem
      * Access permissions to the directories are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to directories generated by Magento.
-     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
      */
     const PERMISSIONS_DIR = 0750;
 
@@ -320,8 +320,8 @@ public function cleanupFilesystem($directoryCodeList)
      * Access permissions to the files and directories are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to files and directories generated by Magento.
-     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
      */
     protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
     {
@@ -345,8 +345,8 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
      * Access permissions to the files and directories are set during deploy Magento 2, directly after
      * uploading code of Magento. Also it is possible to specify the value
      * of inverse mask for setting access permissions to files and directories generated by Magento.
-     * @link http://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
-     * @link http://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/install/post-install-umask.html
+     * @link https://devdocs.magento.com/guides/v2.0/install-gde/prereq/file-system-perms.html
      */
     public function lockStaticResources()
     {
diff --git a/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php b/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
index 8bd65ba85abef..be4b5a3fa0fe5 100644
--- a/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeSetRepositoryInterface.php
@@ -17,7 +17,7 @@ interface AttributeSetRepositoryInterface
      * Retrieve list of Attribute Sets
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#AttributeSetRepositoryInterface to determine
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#AttributeSetRepositoryInterface to determine
      * which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Indexer/Model/Message/Invalid.php b/app/code/Magento/Indexer/Model/Message/Invalid.php
index 5a3f879b0ad80..8daef14297c64 100644
--- a/app/code/Magento/Indexer/Model/Message/Invalid.php
+++ b/app/code/Magento/Indexer/Model/Message/Invalid.php
@@ -71,7 +71,7 @@ public function getText()
         return __(
             'One or more <a href="%1">indexers are invalid</a>. Make sure your <a href="%2" target="_blank">Magento cron job</a> is running.',
             $url,
-            'http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
+            'https://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-cron.html#create-or-remove-the-magento-crontab'
         );
         //@codingStandardsIgnoreEnd
     }
diff --git a/app/code/Magento/InstantPurchase/README.md b/app/code/Magento/InstantPurchase/README.md
index 534696bf353fc..9b618eaca997d 100644
--- a/app/code/Magento/InstantPurchase/README.md
+++ b/app/code/Magento/InstantPurchase/README.md
@@ -10,7 +10,7 @@ Prerequisites to display the Instant Purchase button:
 
 ## Structure
 
-In addition to [a typical file structure for a Magento 2 module](http://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html) `PaymentMethodsIntegration` directory contains interfaces and basic implementation of integration vault payment method to the instant purchase.
+In addition to [a typical file structure for a Magento 2 module](https://devdocs.magento.com/guides/v2.2/extension-dev-guide/build/module-file-structure.html) `PaymentMethodsIntegration` directory contains interfaces and basic implementation of integration vault payment method to the instant purchase.
 
 ## Extensibility
 
@@ -22,7 +22,7 @@ All payments created for instant purchase also have `'instant-purchase' => true`
 
 ### Payment method integration
 
-Instant purchase support may be implemented for any payment method with [vault support](http://devdocs.magento.com/guides/v2.1/payments-integrations/vault/vault-intro.html).
+Instant purchase support may be implemented for any payment method with [vault support](https://devdocs.magento.com/guides/v2.1/payments-integrations/vault/vault-intro.html).
 Basic implementation provided in `Magento\InstantPurchase\PaymentMethodIntegration` should be enough in most cases. It is not enabled by default to avoid issues on production sites and authors of vault payment method should verify correct work for instant purchase manually.
 To enable basic implementation just add single option to configuration of payemnt method in `config.xml`:
 
@@ -52,7 +52,7 @@ Basic implementation is a good start point but it's recommended to provide own i
 
 The `Magento_InstantPurchase` module does not introduce backward incompatible changes.
 
-You can track [backward incompatible changes in patch releases](http://devdocs.magento.com/guides/v2.2/release-notes/changes/ce_changes.html).
+You can track [backward incompatible changes in patch releases](https://devdocs.magento.com/guides/v2.2/release-notes/changes/ce_changes.html).
 
 ***
 
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index 33200014c7ec1..c01a93db538df 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -24,7 +24,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @deprecated 100.0.6
  * @see \Magento\Payment\Model\Method\Adapter
- * @see http://devdocs.magento.com/guides/v2.1/payments-integrations/payment-gateway/payment-gateway-intro.html
+ * @see https://devdocs.magento.com/guides/v2.1/payments-integrations/payment-gateway/payment-gateway-intro.html
  * @since 100.0.2
  */
 abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibleModel implements
diff --git a/app/code/Magento/Quote/Api/CartRepositoryInterface.php b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
index f507c1e83f10f..c8e874e0fcc21 100644
--- a/app/code/Magento/Quote/Api/CartRepositoryInterface.php
+++ b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
@@ -25,7 +25,7 @@ public function get($cartId);
      * Enables administrative users to list carts that match specified search criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included.  See http://devdocs.magento.com/codelinks/attributes.html#CartRepositoryInterface to determine
+     * included.  See https://devdocs.magento.com/codelinks/attributes.html#CartRepositoryInterface to determine
      * which call to use to get detailed information about all attributes for an object.
      *
      *
diff --git a/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php b/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
index a9d1772684ba6..f1ee8bd83fe93 100644
--- a/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Api/GuestPaymentMethodManagementInterface.php
@@ -37,7 +37,7 @@ public function get($cartId);
      * List available payment methods for a specified shopping cart.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included.  See http://devdocs.magento.com/codelinks/attributes.html#GuestPaymentMethodManagementInterface to
+     * included.  See https://devdocs.magento.com/codelinks/attributes.html#GuestPaymentMethodManagementInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param string $cartId The cart ID.
diff --git a/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php b/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php
index 50fac772ed3d9..b00a6617beaeb 100644
--- a/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php
+++ b/app/code/Magento/Quote/Api/PaymentMethodManagementInterface.php
@@ -37,7 +37,7 @@ public function get($cartId);
      * Lists available payment methods for a specified shopping cart.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included.  See http://devdocs.magento.com/codelinks/attributes.html#PaymentMethodManagementInterface to
+     * included.  See https://devdocs.magento.com/codelinks/attributes.html#PaymentMethodManagementInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param int $cartId The cart ID.
diff --git a/app/code/Magento/QuoteAnalytics/README.md b/app/code/Magento/QuoteAnalytics/README.md
index d4adcc9313229..c5a3857c7af3d 100644
--- a/app/code/Magento/QuoteAnalytics/README.md
+++ b/app/code/Magento/QuoteAnalytics/README.md
@@ -1,3 +1,3 @@
 # Magento_QuoteAnalytics
 
-The Magento_QuoteAnalytics module configures data definitions for a data collection related to the Quote module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
+The Magento_QuoteAnalytics module configures data definitions for a data collection related to the Quote module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/ReleaseNotification/README.md b/app/code/Magento/ReleaseNotification/README.md
index df3206a176f09..1f6cac764b565 100644
--- a/app/code/Magento/ReleaseNotification/README.md
+++ b/app/code/Magento/ReleaseNotification/README.md
@@ -50,4 +50,4 @@ A clickable link to internal or external content in any text field will be creat
 
 ### Link Format Example:
 
-The text: `http://devdocs.magento.com/ [Magento DevDocs].` will appear as [Magento DevDocs](http://devdocs.magento.com/).
+The text: `https://devdocs.magento.com/ [Magento DevDocs].` will appear as [Magento DevDocs](https://devdocs.magento.com/).
diff --git a/app/code/Magento/ReleaseNotification/i18n/en_US.csv b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
index 426cdc0e863d2..178482dc7a980 100644
--- a/app/code/Magento/ReleaseNotification/i18n/en_US.csv
+++ b/app/code/Magento/ReleaseNotification/i18n/en_US.csv
@@ -5,11 +5,11 @@
 "<![CDATA[
     <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
     <p>To learn more about new features, see our latest Release Notes in
-    <a href=""http://devdocs.magento.com/magento-release-information.html""
+    <a href=""https://devdocs.magento.com/magento-release-information.html""
     target=""_blank"">DevDocs' Release Information</a>.
     </p>]]>","<![CDATA[
     <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
     <p>To learn more about new features, see our latest Release Notes in
-    <a href=""http://devdocs.magento.com/magento-release-information.html""
+    <a href=""https://devdocs.magento.com/magento-release-information.html""
     target=""_blank"">DevDocs' Release Information</a>.
     </p>]]>"
diff --git a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
index 3134b2a8af21e..9c6d152bed27b 100644
--- a/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
+++ b/app/code/Magento/ReleaseNotification/view/adminhtml/ui_component/release_notification.xml
@@ -67,7 +67,7 @@
                         <item name="text" xsi:type="string" translate="true"><![CDATA[
                         <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
                         <p>To learn more about new features, see our latest Release Notes in
-                        <a href="http://devdocs.magento.com/magento-release-information.html"
+                        <a href="https://devdocs.magento.com/magento-release-information.html"
                         target="_blank">DevDocs' Release Information</a>.
                         </p>]]></item>
                     </item>
@@ -127,7 +127,7 @@
                         <item name="text" xsi:type="string" translate="true"><![CDATA[
                         <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
                         <p>To learn more about new features, see our latest Release Notes in
-                        <a href="http://devdocs.magento.com/magento-release-information.html"
+                        <a href="https://devdocs.magento.com/magento-release-information.html"
                         target="_blank">DevDocs' Release Information</a>.
                         </p>]]></item>
                     </item>
@@ -208,7 +208,7 @@
                         <item name="text" xsi:type="string" translate="true"><![CDATA[
                         <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
                         <p>To learn more about new features, see our latest Release Notes in
-                        <a href="http://devdocs.magento.com/magento-release-information.html"
+                        <a href="https://devdocs.magento.com/magento-release-information.html"
                         target="_blank">DevDocs' Release Information</a>.
                         </p>]]></item>
                     </item>
@@ -289,7 +289,7 @@
                         <item name="text" xsi:type="string" translate="true"><![CDATA[
                         <p>We’ll try to show it again the next time you sign in to Magento Admin.</p>
                         <p>To learn more about new features, see our latest Release Notes in
-                        <a href="http://devdocs.magento.com/magento-release-information.html"
+                        <a href="https://devdocs.magento.com/magento-release-information.html"
                         target="_blank">DevDocs' Release Information</a>.
                         </p>]]></item>
                     </item>
diff --git a/app/code/Magento/ReviewAnalytics/README.md b/app/code/Magento/ReviewAnalytics/README.md
index b078083dfb7dc..a8894f99ed071 100644
--- a/app/code/Magento/ReviewAnalytics/README.md
+++ b/app/code/Magento/ReviewAnalytics/README.md
@@ -1,3 +1,3 @@
 # Magento_ReviewAnalytics module
 
-The Magento_ReviewAnalytics module configures data definitions for a data collection related to the Review module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
+The Magento_ReviewAnalytics module configures data definitions for a data collection related to the Review module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php b/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php
index 354b55eb25955..3c61384d8b84f 100644
--- a/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/CreditmemoRepositoryInterface.php
@@ -20,7 +20,7 @@ interface CreditmemoRepositoryInterface
      * Lists credit memos that match specified search criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#CreditmemoRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#CreditmemoRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
diff --git a/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php b/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php
index 9d4f11ed0f035..161b8405f11e4 100644
--- a/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/InvoiceRepositoryInterface.php
@@ -18,7 +18,7 @@ interface InvoiceRepositoryInterface
      * Lists invoices that match specified search criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#InvoiceRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#InvoiceRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
diff --git a/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php
index e731f6f0e980c..3449d0054b7e4 100644
--- a/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/OrderItemRepositoryInterface.php
@@ -20,7 +20,7 @@ interface OrderItemRepositoryInterface
      * Lists order items that match specified search criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#OrderItemRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#OrderItemRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
diff --git a/app/code/Magento/Sales/Api/OrderRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderRepositoryInterface.php
index a25f463ac8618..0c3b6ab5cb02b 100644
--- a/app/code/Magento/Sales/Api/OrderRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/OrderRepositoryInterface.php
@@ -20,7 +20,7 @@ interface OrderRepositoryInterface
      * Lists orders that match specified search criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#OrderRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#OrderRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
diff --git a/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php b/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php
index bfdf17440ebd3..3b3c8221596a1 100644
--- a/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/ShipmentRepositoryInterface.php
@@ -19,7 +19,7 @@ interface ShipmentRepositoryInterface
      * Lists shipments that match specified search criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#ShipmentRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#ShipmentRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
diff --git a/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php b/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php
index de459662a8321..e55b5d60d1f6c 100644
--- a/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/TransactionRepositoryInterface.php
@@ -18,7 +18,7 @@ interface TransactionRepositoryInterface
      * Lists transactions that match specified search criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#TransactionRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#TransactionRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria The search criteria.
diff --git a/app/code/Magento/SalesAnalytics/README.md b/app/code/Magento/SalesAnalytics/README.md
index 70f456c97d4b3..0b1f804b278fe 100644
--- a/app/code/Magento/SalesAnalytics/README.md
+++ b/app/code/Magento/SalesAnalytics/README.md
@@ -1,3 +1,3 @@
 # Magento_SalesAnalytics module
 
-The Magento_SalesAnalytics module configures data definitions for a data collection related to the Sales module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
+The Magento_SalesAnalytics module configures data definitions for a data collection related to the Sales module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php b/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php
index d4cce37fd15fd..1a631886f1a9b 100644
--- a/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php
+++ b/app/code/Magento/SalesRule/Api/CouponRepositoryInterface.php
@@ -38,7 +38,7 @@ public function getById($couponId);
      * Retrieve a coupon using the specified search criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#CouponRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#CouponRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php b/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php
index d0d275de63a00..963edf5483e43 100644
--- a/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php
+++ b/app/code/Magento/SalesRule/Api/RuleRepositoryInterface.php
@@ -38,7 +38,7 @@ public function getById($ruleId);
      * Retrieve sales rules that match te specified criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#RuleRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#RuleRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/SampleData/README.md b/app/code/Magento/SampleData/README.md
index 5abcbaab1481f..1077038fc074d 100644
--- a/app/code/Magento/SampleData/README.md
+++ b/app/code/Magento/SampleData/README.md
@@ -69,4 +69,4 @@ If you have deleted certain entities provided by sample data and want to restore
 The deleted sample data entities will be restored. Those entities, which were changed, will preserve these changes and will not be restored to the default view.
 
 ## Documentation
-You can find the more detailed description of sample data manipulation procedures at [http://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli-sample-data.html](http://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli-sample-data.html)
+You can find the more detailed description of sample data manipulation procedures at [https://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli-sample-data.html](https://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli-sample-data.html)
diff --git a/app/code/Magento/Signifyd/README.md b/app/code/Magento/Signifyd/README.md
index 9479972cb21b6..753ace3128d22 100644
--- a/app/code/Magento/Signifyd/README.md
+++ b/app/code/Magento/Signifyd/README.md
@@ -47,7 +47,7 @@ The following interfaces (marked with the `@api` annotation) provide methods tha
 
 - might be used by `Magento\Signifyd\Api\CaseRepositoryInterface` to retrieve a list of case entities by specific conditions
 
-For information about a public API in Magento 2, see [Public interfaces & APIs](http://devdocs.magento.com/guides/v2.1/extension-dev-guide/api-concepts.html).
+For information about a public API in Magento 2, see [Public interfaces & APIs](https://devdocs.magento.com/guides/v2.1/extension-dev-guide/api-concepts.html).
 
 ## Additional information
 
@@ -67,12 +67,12 @@ The Debug Mode may be enabled in the module configuration. This logs the communi
 
 The Magento_Signifyd module does not introduce backward incompatible changes.
 
-You can track [backward incompatible changes in patch releases](http://devdocs.magento.com/guides/v2.0/release-notes/changes/ee_changes.html).
+You can track [backward incompatible changes in patch releases](https://devdocs.magento.com/guides/v2.0/release-notes/changes/ee_changes.html).
 
 ### Processing supplementary payment information
 
 To improve the accuracy of Signifyd's transaction estimation, you may perform these operations (links lead to the Magento Developer Documentation Portal):
 
-- [Provide custom AVS/CVV mapping](http://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#provide-avscvv-response-codes)
+- [Provide custom AVS/CVV mapping](https://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#provide-avscvv-response-codes)
 
-- [Retrieve payment method for a placed order](http://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#retrieve-payment-method-for-a-placed-order)
+- [Retrieve payment method for a placed order](https://devdocs.magento.com/guides/v2.2/payments-integrations/signifyd/signifyd.html#retrieve-payment-method-for-a-placed-order)
diff --git a/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php b/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php
index d8b251f3c8c91..f841f9c047b82 100644
--- a/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php
+++ b/app/code/Magento/Tax/Api/TaxClassRepositoryInterface.php
@@ -27,7 +27,7 @@ public function get($taxClassId);
      * Retrieve tax classes which match a specific criteria.
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#TaxClassRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#TaxClassRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php b/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php
index 252bc0fc715fc..c0f5ccd95ba98 100644
--- a/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php
+++ b/app/code/Magento/Tax/Api/TaxRateRepositoryInterface.php
@@ -47,7 +47,7 @@ public function deleteById($rateId);
      * Search TaxRates
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#TaxRateRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#TaxRateRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php b/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php
index 1d69f932573bd..5e045d94de45e 100644
--- a/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php
+++ b/app/code/Magento/Tax/Api/TaxRuleRepositoryInterface.php
@@ -55,7 +55,7 @@ public function deleteById($ruleId);
      * Search TaxRules
      *
      * This call returns an array of objects, but detailed information about each object’s attributes might not be
-     * included. See http://devdocs.magento.com/codelinks/attributes.html#TaxRuleRepositoryInterface to
+     * included. See https://devdocs.magento.com/codelinks/attributes.html#TaxRuleRepositoryInterface to
      * determine which call to use to get detailed information about all attributes for an object.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
diff --git a/app/code/Magento/WishlistAnalytics/README.md b/app/code/Magento/WishlistAnalytics/README.md
index 999fc835626da..1ad889598297c 100644
--- a/app/code/Magento/WishlistAnalytics/README.md
+++ b/app/code/Magento/WishlistAnalytics/README.md
@@ -1,3 +1,3 @@
 # Magento_WishlistAnalytics module
 
-The Magento_WishlistAnalytics module configures data definitions for a data collection related to the Wishlist module entities to be used in [Advanced Reporting](http://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
+The Magento_WishlistAnalytics module configures data definitions for a data collection related to the Wishlist module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.2/advanced-reporting/modules.html).
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Page/DevdocsInstall.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Page/DevdocsInstall.xml
index f63e7282719d2..15e0b8a27d24e 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Page/DevdocsInstall.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Page/DevdocsInstall.xml
@@ -6,7 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
-    <page name="DevdocsInstall" mca="http://devdocs.magento.com/guides/v2.0/install-gde/install/web/install-web.html" module="Magento_Install">
+    <page name="DevdocsInstall" mca="https://devdocs.magento.com/guides/v2.0/install-gde/install/web/install-web.html" module="Magento_Install">
         <block name="devdocsBlock" class="Magento\Install\Test\Block\Devdocs" locator="body" strategy="css selector"/>
     </page>
 </config>
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
index 49339054f8766..4f94e335e0363 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
@@ -13,7 +13,7 @@
  *
  * Ensure that id selector is not used
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#types
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#types
  */
 class AvoidIdSniff implements Sniff
 {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
index 435eea118af63..14f37603cd362 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
@@ -15,7 +15,7 @@
  * Ensure there is a single blank line after the closing brace of a class definition
  *
  * @see Squiz_Sniffs_CSS_ClassDefinitionClosingBraceSpaceSniff
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#braces
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#braces
  */
 class BracesFormattingSniff implements Sniff
 {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
index 798c13ff2699c..e49249361fa43 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
@@ -17,7 +17,7 @@
  * - start with a letter (except helper classes);
  * - words should be separated with dash '-';
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#standard-classes
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#standard-classes
  *
  */
 class ClassNamingSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
index 39753544cf248..867809fbbff71 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
@@ -14,7 +14,7 @@
  *
  * Ensure that single quotes are used
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-colon-indents
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-colon-indents
  *
  */
 class ColonSpacingSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
index 83f2e8f5d94de..08a7feeaf3270 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
@@ -13,7 +13,7 @@
  *
  * Ensure that hexadecimal values are used for variables not for properties
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#hexadecimal-notation
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#hexadecimal-notation
  *
  */
 class ColourDefinitionSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
index d27c853ab7808..9ff1949316b89 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
@@ -13,7 +13,7 @@
  *
  * Ensure that spaces are used before and after combinators
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#combinator-indents
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#combinator-indents
  *
  */
 class CombinatorIndentationSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
index abf15dd3748d5..0085a1cd40f0f 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
@@ -15,7 +15,7 @@
  * First, second and third level comments should have two spaces after "//".
  * Inline comments should have one space after "//".
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#comments
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#comments
  *
  */
 class CommentLevelsSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
index 54bd8b70d5c59..b65ab10b8a629 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
@@ -13,7 +13,7 @@
  *
  * Ensure that single quotes are used
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#important-property
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#important-property
  *
  */
 class ImportantPropertySniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
index 3ff268acf0c13..283c9a43e313d 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
@@ -14,7 +14,7 @@
  * Ensures styles are indented 4 spaces.
  *
  * @see Squiz_Sniffs_CSS_IndentationSniff
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#indentation
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#indentation
  */
 class IndentationSniff implements Sniff
 {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
index 3f33d0b2c69d5..84ae1b5dec303 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
@@ -13,7 +13,7 @@
  *
  * Start each property declaration in a new line
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-line-break
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-line-break
  *
  */
 class PropertiesLineBreakSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
index e59b5da37d0e2..6fdcd8ded29b4 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
@@ -13,7 +13,7 @@
  *
  * Ensure that properties are sorted alphabetically
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#sorting
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#sorting
  *
  */
 class PropertiesSortingSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
index 92ea5b420658f..2b2b4a6edad45 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
@@ -13,7 +13,7 @@
  *
  * Ensure that single quotes are used
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#quotes
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#quotes
  *
  */
 class QuotesSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
index 4660786669815..f48bafd329cad 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
@@ -14,7 +14,7 @@
  * Ensure that a line break exists after each selector delimiter.
  * No spaces should be before or after delimiters.
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selector-delimiters
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selector-delimiters
  *
  */
 class SelectorDelimiterSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
index c1cd6cde33406..8bccb26ae6100 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
@@ -13,7 +13,7 @@
  *
  * Property should have a semicolon at the end of line
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#end-of-the-property-line
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#end-of-the-property-line
  *
  */
 class SemicolonSpacingSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
index 88a275baec2a0..dc2e5ed39b71c 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
@@ -13,7 +13,7 @@
  *
  * Ensure that selector in one line, concatenation is not used
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#formatting-1
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#formatting-1
  *
  */
 class TypeSelectorConcatenationSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
index 3983cf54e05fd..288a9a8b5f346 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
@@ -18,7 +18,7 @@
  * - Type selectors must be lowercase
  * - Write selector in one line, do not use concatenation
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selectors-naming
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selectors-naming
  *
  */
 class TypeSelectorsSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
index 8a559da88e6f2..060deb998aabb 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
@@ -16,8 +16,8 @@
  *   they should be located in the module file, in the beginning of the general comment.
  * - All variable names must be lowercase
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#local-variables
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#naming
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#local-variables
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#naming
  *
  */
 class VariablesSniff implements Sniff
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
index 1b4fb53c45010..dc334d718e697 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
@@ -14,8 +14,8 @@
  * Ensure that units for 0 is not specified
  * Omit leading "0"s in values, use dot instead
  *
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#and-units
- * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#floating-values
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#and-units
+ * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#floating-values
  *
  */
 class ZeroUnitsSniff implements Sniff
diff --git a/phpserver/README.md b/phpserver/README.md
index 6bb814fe5f5f2..414ad77ae6b33 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -14,7 +14,7 @@ Without a router script, that is not possible via the php built-in server.
 
 ### How to install Magento
 
-Magento's web-based Setup Wizard runs from the `setup` subdirectory, which PHP's built-in web server cannot route. Therefore, you must install Magento using the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli.html" target="_blank">command line</a>. An example follows:
+Magento's web-based Setup Wizard runs from the `setup` subdirectory, which PHP's built-in web server cannot route. Therefore, you must install Magento using the <a href="https://devdocs.magento.com/guides/v2.0/install-gde/install/cli/install-cli.html" target="_blank">command line</a>. An example follows:
 
 ```
 php bin/magento setup:install --base-url=http://127.0.0.1:8082 
diff --git a/setup/performance-toolkit/README.md b/setup/performance-toolkit/README.md
index bb0a023ab8af1..7bf7a1fbd4721 100644
--- a/setup/performance-toolkit/README.md
+++ b/setup/performance-toolkit/README.md
@@ -29,7 +29,7 @@ Splitting generation and indexation processes doesn't reduce total processing ti
     php bin/magento setup:performance:generate-fixtures -s setup/performance-toolkit/profiles/ce/small.xml
     php bin/magento indexer:reindex
 
-For more information about the available profiles and generating fixtures generation, read [Generate data for performance testing](http://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-perf-data.html).
+For more information about the available profiles and generating fixtures generation, read [Generate data for performance testing](https://devdocs.magento.com/guides/v2.2/config-guide/cli/config-cli-subcommands-perf-data.html).
 
 For run Admin Pool in multithreading mode, please be sure, that:
   - "Admin Account Sharing" is enabled
diff --git a/setup/src/Magento/Setup/Controller/LandingInstaller.php b/setup/src/Magento/Setup/Controller/LandingInstaller.php
index 45579979b9fcc..51d3fd648af4b 100644
--- a/setup/src/Magento/Setup/Controller/LandingInstaller.php
+++ b/setup/src/Magento/Setup/Controller/LandingInstaller.php
@@ -33,7 +33,7 @@ public function indexAction()
     {
         $welcomeMsg = "Welcome to Magento Admin, your online store headquarters.<br>"
             . "Click 'Agree and Set Up Magento' or read ";
-        $docRef = "http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html";
+        $docRef = "https://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html";
         $agreeButtonText = "Agree and Setup Magento";
         $view = new ViewModel;
         $view->setTerminal(true);
diff --git a/setup/src/Magento/Setup/Controller/LandingUpdater.php b/setup/src/Magento/Setup/Controller/LandingUpdater.php
index e144cc40c37f7..fca323fefe663 100644
--- a/setup/src/Magento/Setup/Controller/LandingUpdater.php
+++ b/setup/src/Magento/Setup/Controller/LandingUpdater.php
@@ -33,7 +33,7 @@ public function indexAction()
     {
         $welcomeMsg = "Welcome to Magento Module Manager.<br>"
             . "Click 'Agree and Update Magento' or read ";
-        $docRef = "http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html";
+        $docRef = "https://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html";
         $agreeButtonText = "Agree and Update Magento";
         $view = new ViewModel;
         $view->setTerminal(true);
diff --git a/setup/src/Magento/Setup/Model/SystemPackage.php b/setup/src/Magento/Setup/Model/SystemPackage.php
index 232ac1dd342f6..ab59fdc849dd7 100755
--- a/setup/src/Magento/Setup/Model/SystemPackage.php
+++ b/setup/src/Magento/Setup/Model/SystemPackage.php
@@ -179,7 +179,7 @@ public function getInstalledSystemPackages()
             throw new \RuntimeException(
                 'We\'re sorry, no components are available because you cloned the Magento 2 GitHub repository. ' .
                 'You must manually update components as discussed in the ' .
-                '<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/cli/dev_options.html">' .
+                '<a href="https://devdocs.magento.com/guides/v2.0/install-gde/install/cli/dev_options.html">' .
                 'Installation Guide</a>.'
             );
         }
diff --git a/setup/view/magento/setup/landing.phtml b/setup/view/magento/setup/landing.phtml
index 581be20df937b..645ae6ae9d635 100644
--- a/setup/view/magento/setup/landing.phtml
+++ b/setup/view/magento/setup/landing.phtml
@@ -15,7 +15,7 @@
     <p class="text-welcome">
         Welcome to Magento Admin, your online store headquarters.
         <br>
-        Click 'Agree and Set Up Magento' or read <a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/web/install-web.html" target="_blank">Getting Started</a> to learn more.
+        Click 'Agree and Set Up Magento' or read <a href="https://devdocs.magento.com/guides/v2.0/install-gde/install/web/install-web.html" target="_blank">Getting Started</a> to learn more.
     </p>
     <p class="text-terms">
         <a href="" ng-click="previousState()">Terms & Agreement</a>
diff --git a/setup/view/magento/setup/readiness-check/progress.phtml b/setup/view/magento/setup/readiness-check/progress.phtml
index eb9dd0ce9d1aa..d8e519aa8ac74 100755
--- a/setup/view/magento/setup/readiness-check/progress.phtml
+++ b/setup/view/magento/setup/readiness-check/progress.phtml
@@ -121,7 +121,7 @@
                     Download and install the updater.
                 </p>
                 <p ng-show="updater.expanded">For additional assistance, see
-                    <a href="http://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/updater.html"
+                    <a href="https://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/updater.html"
                        target="_blank">updater application help</a>.
                 </p>
             </div>
@@ -172,7 +172,7 @@
                 <p ng-show="cronScript.expanded" ng-bind-html="cronScript.updaterErrorMessage">
                 </p>
                 <p ng-show="cronScript.expanded">For additional assistance, see
-                    <a href="http://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/cron.html"
+                    <a href="https://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/cron.html"
                        target="_blank">cron scripts help</a>.
                 </p>
             </div>
@@ -214,7 +214,7 @@
                 <p ng-show="componentDependency.expanded" ng-bind-html="componentDependency.errorMessage">
                 </p>
                 <p ng-show="componentDependency.expanded">For additional assistance, see
-                    <a href="http://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/component-depend.html"
+                    <a href="https://devdocs.magento.com/guides/v2.0/comp-mgr/trouble/cman/component-depend.html"
                        target="_blank">component dependency help
                     </a>.
                 </p>
@@ -336,7 +336,7 @@
                 </div>
 
                 <p ng-show="componentDependency.expanded">For additional assistance, see
-                    <a href="http://devdocs.magento.com/guides/v2.2/install-gde/trouble/php/tshoot_php-set.html"
+                    <a href="https://devdocs.magento.com/guides/v2.2/install-gde/trouble/php/tshoot_php-set.html"
                        target="_blank">PHP settings check help
                     </a>.
                 </p>
@@ -392,7 +392,7 @@
 
                 <div class="readiness-check-side">
                     <p class="side-title">Need Help?</p>
-                    <a href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a>
+                    <a href="https://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP Extension Help</a>
                 </div>
 
                 <span class="readiness-check-icon icon-failed-round"></span>
@@ -413,7 +413,7 @@
                         <p>
                             The best way to resolve this is to install the correct missing extensions. The exact fix depends on our server, your host, and other system variables.
                             <br>
-                            Our <a href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP extension help</a> can get you started.
+                            Our <a href="https://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html" target="_blank">PHP extension help</a> can get you started.
                         </p>
                         <p>
                             For additional assistance, contact your hosting provider.
@@ -477,7 +477,7 @@
 
             <div class="readiness-check-side">
                 <p class="side-title">Need Help?</p>
-                <a href="http://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a>
+                <a href="https://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a>
             </div>
 
             <span class="readiness-check-icon icon-failed-round"></span>
@@ -500,7 +500,7 @@
                         The best way to resolve this is to allow write permissions for files in the following Magento directories and subdirectories. The exact fix depends on your server, your host,
                         and other system variables.
                         <br>
-                        For help, see our <a href="http://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a> or call your hosting provider.
+                        For help, see our <a href="https://devdocs.magento.com/guides/v2.2/install-gde/prereq/file-system-perms.html" target="_blank">File Permission Help</a> or call your hosting provider.
                     </p>
                     <ul class="list" ng-show="permissions.expanded" ng-init="showDetails=false">
                         <li
diff --git a/setup/view/magento/setup/start-updater.phtml b/setup/view/magento/setup/start-updater.phtml
index b08407b30d4b3..9b2a6b5598aa3 100644
--- a/setup/view/magento/setup/start-updater.phtml
+++ b/setup/view/magento/setup/start-updater.phtml
@@ -26,7 +26,7 @@
         </strong>
         <div ng-show="type == 'upgrade'">
             Before you start upgrade, you can optionally
-            <a href="http://devdocs.magento.com/guides/v2.1/comp-mgr/trouble/cman/maint-mode.html">
+            <a href="https://devdocs.magento.com/guides/v2.1/comp-mgr/trouble/cman/maint-mode.html">
             configure a custom maintenance page</a> that informs shoppers the store is offline.
             (Magento provides a default page.)
         </div>

From 0811a711fb78e5df2153055d78504cc890fece30 Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Sat, 8 Dec 2018 15:56:56 +0530
Subject: [PATCH 242/932] Fixed-Checkbox-Alignement: Checkbox alignment issue.

---
 lib/web/css/source/lib/_forms.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/web/css/source/lib/_forms.less b/lib/web/css/source/lib/_forms.less
index 531cf3d34ad76..a22ec5f52db6d 100644
--- a/lib/web/css/source/lib/_forms.less
+++ b/lib/web/css/source/lib/_forms.less
@@ -300,6 +300,8 @@
 
     input[type="checkbox"] {
         .lib-form-element-choice(@_type: input-checkbox);
+        position: relative;
+        top: 2px;
     }
 
     input[type="radio"] {

From 614a7e43b58268afa572a9091fa7e6c51b7dbcc2 Mon Sep 17 00:00:00 2001
From: Wojtek Naruniec <wojtek@naruniec.me>
Date: Sat, 8 Dec 2018 17:00:05 +0100
Subject: [PATCH 243/932] Configure group for core payment methods to improve
 UX of default payment methods source model. It fixes #19664

---
 app/code/Magento/Authorizenet/etc/config.xml  |  1 +
 app/code/Magento/Authorizenet/etc/payment.xml | 15 +++++++++++++++
 app/code/Magento/Braintree/etc/config.xml     |  4 ++++
 app/code/Magento/Braintree/etc/payment.xml    | 15 +++++++++++++++
 app/code/Magento/Paypal/etc/config.xml        |  1 +
 5 files changed, 36 insertions(+)
 create mode 100644 app/code/Magento/Authorizenet/etc/payment.xml
 create mode 100644 app/code/Magento/Braintree/etc/payment.xml

diff --git a/app/code/Magento/Authorizenet/etc/config.xml b/app/code/Magento/Authorizenet/etc/config.xml
index eacf77cda1e77..2e730eafb2e89 100644
--- a/app/code/Magento/Authorizenet/etc/config.xml
+++ b/app/code/Magento/Authorizenet/etc/config.xml
@@ -32,6 +32,7 @@
                 <cgi_url>https://secure.authorize.net/gateway/transact.dll</cgi_url>
                 <cgi_url_td_test_mode>https://apitest.authorize.net/xml/v1/request.api</cgi_url_td_test_mode>
                 <cgi_url_td>https://api2.authorize.net/xml/v1/request.api</cgi_url_td>
+                <group>authorizenet</group>
             </authorizenet_directpost>
         </payment>
     </default>
diff --git a/app/code/Magento/Authorizenet/etc/payment.xml b/app/code/Magento/Authorizenet/etc/payment.xml
new file mode 100644
index 0000000000000..8f92d5fba3aef
--- /dev/null
+++ b/app/code/Magento/Authorizenet/etc/payment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
+    <groups>
+        <group id="authorizenet">
+            <label>Authorize.net</label>
+        </group>
+    </groups>
+</payment>
diff --git a/app/code/Magento/Braintree/etc/config.xml b/app/code/Magento/Braintree/etc/config.xml
index a830c29368755..9de4773af023a 100644
--- a/app/code/Magento/Braintree/etc/config.xml
+++ b/app/code/Magento/Braintree/etc/config.xml
@@ -42,6 +42,7 @@
                 <paymentInfoKeys>cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision</paymentInfoKeys>
                 <avs_ems_adapter>Magento\Braintree\Model\AvsEmsCodeMapper</avs_ems_adapter>
                 <cvv_ems_adapter>Magento\Braintree\Model\CvvEmsCodeMapper</cvv_ems_adapter>
+                <group>braintree</group>
             </braintree>
             <braintree_paypal>
                 <model>BraintreePayPalFacade</model>
@@ -67,6 +68,7 @@
                 <privateInfoKeys>processorResponseCode,processorResponseText,paymentId</privateInfoKeys>
                 <paymentInfoKeys>processorResponseCode,processorResponseText,paymentId,payerEmail</paymentInfoKeys>
                 <supported_locales>en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL,no_NO,pl_PL,es_ES,sv_SE,tr_TR,pt_BR,ja_JP,id_ID,ko_KR,pt_PT,ru_RU,th_TH,zh_CN,zh_TW</supported_locales>
+                <group>braintree</group>
             </braintree_paypal>
             <braintree_cc_vault>
                 <model>BraintreeCreditCardVaultFacade</model>
@@ -76,6 +78,7 @@
                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
                 </instant_purchase>
+                <group>braintree</group>
             </braintree_cc_vault>
             <braintree_paypal_vault>
                 <model>BraintreePayPalVaultFacade</model>
@@ -85,6 +88,7 @@
                     <tokenFormat>Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter</tokenFormat>
                     <additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
                 </instant_purchase>
+                <group>braintree</group>
             </braintree_paypal_vault>
         </payment>
     </default>
diff --git a/app/code/Magento/Braintree/etc/payment.xml b/app/code/Magento/Braintree/etc/payment.xml
new file mode 100644
index 0000000000000..dbabd91151022
--- /dev/null
+++ b/app/code/Magento/Braintree/etc/payment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
+    <groups>
+        <group id="braintree">
+            <label>Braintree</label>
+        </group>
+    </groups>
+</payment>
diff --git a/app/code/Magento/Paypal/etc/config.xml b/app/code/Magento/Paypal/etc/config.xml
index f0df648af9072..5fc457fb4443d 100644
--- a/app/code/Magento/Paypal/etc/config.xml
+++ b/app/code/Magento/Paypal/etc/config.xml
@@ -100,6 +100,7 @@
                 <instant_purchase>
                     <tokenFormat>\Magento\Paypal\Model\InstantPurchase\Payflow\Pro\TokenFormatter</tokenFormat>
                 </instant_purchase>
+                <group>paypal</group>
             </payflowpro_cc_vault>
             <paypal_billing_agreement>
                 <active>1</active>

From 3f0ac0acd40d6a546a7019a56f726f01d5debf0d Mon Sep 17 00:00:00 2001
From: mahesh <mahesh721@webkul.com>
Date: Mon, 10 Dec 2018 16:34:18 +0530
Subject: [PATCH 244/932] foreign key constraint removed

---
 app/code/Magento/Quote/etc/db_schema.xml            | 2 --
 app/code/Magento/Quote/etc/db_schema_whitelist.json | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 59fb48d6fd918..14ab5e1629965 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -396,8 +396,6 @@
         <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID"
                     table="quote_address_item" column="quote_item_id" referenceTable="quote_item"
                     referenceColumn="item_id" onDelete="CASCADE"/>
-        <constraint xsi:type="foreign" referenceId="QUOTE_ADDRESS_ITEM_STORE_ID_STORE_STORE_ID" table="quote_address_item" column="store_id"
-                    referenceTable="store" referenceColumn="store_id" onDelete="SET NULL"/>
         <index referenceId="QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID" indexType="btree">
             <column name="quote_address_id"/>
         </index>
diff --git a/app/code/Magento/Quote/etc/db_schema_whitelist.json b/app/code/Magento/Quote/etc/db_schema_whitelist.json
index c9afa09e0a207..5667a9a5b4600 100644
--- a/app/code/Magento/Quote/etc/db_schema_whitelist.json
+++ b/app/code/Magento/Quote/etc/db_schema_whitelist.json
@@ -241,8 +241,7 @@
             "PRIMARY": true,
             "QUOTE_ADDRESS_ITEM_QUOTE_ADDRESS_ID_QUOTE_ADDRESS_ADDRESS_ID": true,
             "QUOTE_ADDR_ITEM_PARENT_ITEM_ID_QUOTE_ADDR_ITEM_ADDR_ITEM_ID": true,
-            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID": true,
-            "QUOTE_ADDRESS_ITEM_STORE_ID_STORE_STORE_ID": true
+            "QUOTE_ADDRESS_ITEM_QUOTE_ITEM_ID_QUOTE_ITEM_ITEM_ID": true
         }
     },
     "quote_item_option": {

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 245/932] 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 ea75b7cb150cb1bf57f5cd3faec7176ecdc97dd8 Mon Sep 17 00:00:00 2001
From: Dzmitry Tabusheu <dzmitry_tabusheu@epam.com>
Date: Mon, 10 Dec 2018 17:08:20 +0300
Subject: [PATCH 246/932] MAGETWO-96404: [2.3.x] Cannot refresh Captcha image
 in production mode

- Added captcha js files to bundle exclude list
---
 app/design/adminhtml/Magento/backend/etc/view.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
index f10f7789b0888..18c2d8f1b1722 100644
--- a/app/design/adminhtml/Magento/backend/etc/view.xml
+++ b/app/design/adminhtml/Magento/backend/etc/view.xml
@@ -23,6 +23,8 @@
         </images>
     </media>
     <exclude>
+        <item type="file">Lib::mage/captcha.js</item>
+        <item type="file">Lib::mage/captcha.min.js</item>
         <item type="file">Lib::mage/common.js</item>
         <item type="file">Lib::mage/cookies.js</item>
         <item type="file">Lib::mage/dataPost.js</item>

From 2916b082a030746fa6943b00b6128e77d0d5b6f5 Mon Sep 17 00:00:00 2001
From: bshevchenko <1408sheva@gmail.com>
Date: Mon, 10 Dec 2018 18:42:16 +0200
Subject: [PATCH 247/932] MAGETWO-96706: Cart Price Rule with related Banner
 for specific Customer Segment is persisted under long-term cookie

---
 .../Mftf/Section/AdminMainActionsSection.xml  |   1 +
 .../Mftf/ActionGroup/CheckoutActionGroup.xml  |   4 +-
 .../Section/StorefrontMiniCartSection.xml     |   1 +
 .../Mftf/Section/StorefrontCMSPageSection.xml |   3 +-
 .../Cms/Test/Mftf/Section/TinyMCESection.xml  |   1 +
 .../OpenEditCustomerFromAdminActionGroup.xml  |   3 +-
 ...SignUpNewUserFromStorefrontActionGroup.xml |   2 +-
 .../Customer/Test/Mftf/Data/CustomerData.xml  |   2 +-
 ...bscribedNewsletterDisplayedActionGroup.xml |  10 +-
 .../Page/StorefrontNewsletterManagePage.xml   |  13 +++
 .../StorFrontNewsletterManageSection.xml      |  15 +++
 .../AdminCartPriceRuleActionGroup.xml         |  22 ++++
 .../Data/SalesRuleAddressConditionsData.xml   |  21 ++++
 .../Test/Mftf/Data/SalesRuleCouponData.xml    |   1 +
 .../Test/Mftf/Data/SalesRuleData.xml          |  27 +++++
 .../Mftf/Page/AdminCartPriceRuleEditPage.xml  |  13 +++
 .../AdminCartPriceRulesFormSection.xml        |   6 +
 .../AdminCreateWidgetActionGroup.xml          | 109 ++++++++++--------
 .../Widget/Test/Mftf/Data/WidgetsData.xml     |  15 ++-
 .../Test/Mftf/Page/AdminNewWidgetPage.xml     |   4 +-
 .../Mftf/Section/AdminNewWidgetSection.xml    |   5 +-
 21 files changed, 212 insertions(+), 66 deletions(-)
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Section/StorFrontNewsletterManageSection.xml
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
index bc576559e7a13..c6d37291e625f 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -10,6 +10,7 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMainActionsSection">
         <element name="save" type="button" selector="#save" timeout="30"/>
+        <element name="saveAndContinue" type="button" selector="#save_and_continue_edit" timeout="30"/>
         <element name="delete" type="button" selector="#delete" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
index 18bf70a613b50..e392e8e805e4a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -91,8 +91,8 @@
     <!-- Logged in user checkout filling shipping section -->
     <actionGroup name="LoggedInUserCheckoutFillingShippingSectionActionGroup">
         <arguments>
-            <argument name="customerVar"/>
-            <argument name="customerAddressVar"/>
+            <argument name="customerVar" defaultValue="CustomerEntityOne"/>
+            <argument name="customerAddressVar" defaultValue="CustomerAddressSimple"/>
         </arguments>
         <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{customerVar.firstname}}" stepKey="enterFirstName"/>
         <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{customerVar.lastname}}" stepKey="enterLastName"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
index 3f717943fe8f0..a894f2fbb1af9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMiniCartSection.xml
@@ -29,5 +29,6 @@
         <element name="itemDiscount" type="text" selector="//tr[@class='totals']//td[@class='amount']/span"/>
         <element name="subtotal" type="text" selector="//tr[@class='totals sub']//td[@class='amount']/span"/>
         <element name="emptyCart" type="text" selector=".counter.qty.empty"/>
+        <element name="minicartContent" type="block" selector="#minicart-content-wrapper"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
index 7a358c61263d6..b0262c18f1002 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
@@ -10,9 +10,10 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCMSPageSection">
         <element name="mediaDescription" type="text" selector=".column.main>p>img"/>
-        <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
+        <element name="imageSource" type="text" selector="//img[contains(@src,'{{imageName}}')]" parameterized="true"/>
         <element name="mainTitle" type="text" selector="#maincontent .page-title"/>
         <element name="mainContent" type="text" selector="#maincontent"/>
         <element name="footerTop" type="text" selector="footer.page-footer"/>
+        <element name="bannerImage" type="block" selector=".banner-items img"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index c7ea85e441bb9..89431a0c7ce4d 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -57,6 +57,7 @@
         <element name="WysiwygArrow" type="button" selector="#d3lzaXd5Zw-- > .jstree-icon" />
         <element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]" />
         <element name="confirmDelete" type="button" selector=".action-primary.action-accept" />
+        <element name="imageBlockByName" type="block" selector="//div[@data-row='file'][contains(., '{{imageName}}')]" parameterized="true"/>
     </section>
     <section name="VariableSection">
         <element name="InsertWidget" type="button" selector="#insert_variable"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
index 5b3a7a70aa2e6..14014505d6d24 100755
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml
@@ -22,10 +22,9 @@
     </actionGroup>
     <actionGroup name="DeleteCustomerFromAdminActionGroup">
         <arguments>
-            <argument name="customer"/>
+            <argument name="customer" defaultValue="CustomerEntityOne"/>
         </arguments>
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
         <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{customer.email}}" stepKey="fillSearch"/>
         <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickSubmit"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
index 79cc00d4474b1..aaca749e0e926 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -9,7 +9,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SignUpNewUserFromStorefrontActionGroup">
         <arguments>
-            <argument name="Customer"/>
+            <argument name="Customer" defaultValue="CustomerEntityOne"/>
         </arguments>
         <amOnPage stepKey="amOnStorefrontPage"  url="/"/>
         <waitForPageLoad stepKey="waitForStorefrontPage"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index 6f5ade53e6790..96bf654e63811 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -33,7 +33,7 @@
         <!--requiredEntity type="extension_attribute">ExtensionAttributeSimple</requiredEntity-->
     </entity>
     <entity name="Simple_US_Customer" type="customer">
-        <data key="group_id">0</data>
+        <data key="group_id">1</data>
         <data key="default_billing">true</data>
         <data key="default_shipping">true</data>
         <data key="email" unique="prefix">John.Doe@example.com</data>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
index 92d17e9d71e2f..de63fd34c62b4 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
@@ -6,13 +6,10 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
 
     <!--Create an Account. Check Sign Up for Newsletter checkbox -->
     <actionGroup name="StorefrontCreateNewAccountNewsletterChecked" extends="SignUpNewUserFromStorefrontActionGroup">
-        <arguments>
-            <argument name="Customer"/>
-        </arguments>
         <click selector="{{StorefrontCustomerCreateFormSection.signUpForNewsletter}}" stepKey="selectSignUpForNewsletterCheckbox" after="fillLastName"/>
         <see stepKey="seeDescriptionNewsletter" userInput='You are subscribed to "General Subscription".' selector="{{CustomerMyAccountPage.DescriptionNewsletter}}" />
     </actionGroup>
@@ -28,4 +25,9 @@
         <see stepKey="seeThankYouMessage" userInput="Thank you for registering with NewStore."/>
     </actionGroup>
 
+    <!--Check Subscribed Newsletter via StoreFront-->
+    <actionGroup name="checkSubscribedNewsletterActionGroup">
+        <amOnPage url="{{StorefrontNewsletterManagePage.url}}" stepKey="goToNewsletterManage"/>
+        <seeElement selector="{{StorefrontNewsletterManageSection.subscriptionChecked}}" stepKey="checkSubscribedNewsletter"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml b/app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml
new file mode 100644
index 0000000000000..81fd3eb7c391c
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Page/StorefrontNewsletterManagePage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontNewsletterManagePage" url="newsletter/manage/" area="storefront" module="Magento_Newsletter">
+        <section name="StorefrontNewsletterManageSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorFrontNewsletterManageSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorFrontNewsletterManageSection.xml
new file mode 100644
index 0000000000000..4685e2b9a1ec1
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorFrontNewsletterManageSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontNewsletterManageSection">
+        <element name="subscriptionCheckbox" type="checkbox" selector="input#subscription" />
+        <element name="subscriptionChecked" type="checkbox" selector="input#subscription[checked='checked']" />
+    </section>
+</sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
index a794c67e736fc..541f745a6c941 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
@@ -16,4 +16,26 @@
         <!-- This actionGroup was created to be merged from B2B. Retailer Customer Group -->
         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="Retailer" stepKey="selectRetailerCustomerGroup"/>
     </actionGroup>
+
+    <!--Set Subtotal condition for Customer Segment-->
+    <actionGroup name="setCartAttributeConditionForCartPriceRuleActionGroup">
+        <arguments>
+            <argument name="attributeName" type="string"/>
+            <argument name="operatorType" defaultValue="is" type="string"/>
+            <argument name="value" defaultValue="100" type="string"/>
+        </arguments>
+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="scrollToActionTab"/>
+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeaderOpen}}"
+                          visible="false" stepKey="openActionTab"/>
+        <click selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="applyRuleForConditions"/>
+        <waitForPageLoad stepKey="waitForDropDownOpened"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="{{attributeName}}" stepKey="selectAttribute"/>
+        <waitForPageLoad stepKey="waitForOperatorOpened"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('is')}}" stepKey="clickToChooseOption"/>
+        <selectOption userInput="{{operatorType}}" selector="{{AdminCartPriceRulesFormSection.conditionsOperator}}" stepKey="setOperatorType"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption1"/>
+        <fillField userInput="{{value}}" selector="{{AdminCartPriceRulesFormSection.conditionsValue}}" stepKey="fillActionValue"/>
+        <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
new file mode 100644
index 0000000000000..5e9247825b29a
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SalesRuleAddressConditions" type="SalesRuleConditionAttribute">
+        <data key="subtotal">Magento\SalesRule\Model\Rule\Condition\Address|base_subtotal</data>
+        <data key="totalItemsQty">Magento\SalesRule\Model\Rule\Condition\Address|total_qty</data>
+        <data key="totalWeight">Magento\SalesRule\Model\Rule\Condition\Address|weight</data>
+        <data key="shippingMethod">Magento\SalesRule\Model\Rule\Condition\Address|shipping_method</data>
+        <data key="shippingPostCode">Magento\SalesRule\Model\Rule\Condition\Address|postcode</data>
+        <data key="shippingRegion">Magento\SalesRule\Model\Rule\Condition\Address|region</data>
+        <data key="shippingState">Magento\SalesRule\Model\Rule\Condition\Address|region_id</data>
+        <data key="ShippingCountry">Magento\SalesRule\Model\Rule\Condition\Address|country_id</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
index 10b198b53f389..3dd87d94d0148 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleCouponData.xml
@@ -11,5 +11,6 @@
         <var key="rule_id" entityKey="rule_id" entityType="SalesRule"/>
         <data key="code" unique="suffix">Code</data>
         <data key="is_primary">1</data>
+        <data key="times_used">0</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
index 6f9d267fd1fd1..d032b2c1b2e4f 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
@@ -117,4 +117,31 @@
         <data key="uses_per_coupon">2</data>
         <data key="simple_free_shipping">1</data>
     </entity>
+
+    <entity name="SalesRuleSpecificCouponWithPercentDiscount" type="SalesRule">
+        <data key="name" unique="suffix">SimpleSalesRule</data>
+        <data key="description">Sales Rule Description</data>
+        <array key="website_ids">
+            <item>1</item>
+        </array>
+        <array key="customer_group_ids">
+            <item>1</item>
+        </array>
+        <data key="uses_per_customer">10</data>
+        <data key="is_active">true</data>
+        <data key="stop_rules_processing">false</data>
+        <data key="is_advanced">true</data>
+        <data key="sort_order">1</data>
+        <data key="simple_action">by_percent</data>
+        <data key="discount_amount">10</data>
+        <data key="discount_qty">10</data>
+        <data key="discount_step">0</data>
+        <data key="apply_to_shipping">false</data>
+        <data key="times_used">0</data>
+        <data key="is_rss">false</data>
+        <data key="coupon_type">SPECIFIC_COUPON</data>
+        <data key="use_auto_generation">false</data>
+        <data key="uses_per_coupon">10</data>
+        <data key="simple_free_shipping">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml
new file mode 100644
index 0000000000000..faed9d42bcdec
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Page/AdminCartPriceRuleEditPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCartPriceRuleEditPage" area="admin" url="sales_rule/promo_quote/edit/id/{{salesRuleId}}" module="Magento_SalesRule" parameterized="true">
+        <section name="AdminCartPriceRulesFormSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index 9ffb703fdf0f6..e36183b5b45a1 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -27,6 +27,12 @@
         <element name="userPerCustomer" type="input" selector="//input[@name='uses_per_customer']"/>
         <element name="priority" type="input" selector="//*[@name='sort_order']"/>
 
+        <!-- Conditions sub-form -->
+        <element name="conditionsHeader" type="button" selector="div[data-index='conditions']" timeout="30"/>
+        <element name="conditionsHeaderOpen" type="button" selector="div[data-index='conditions'] div[data-state-collapsible='open']" timeout="30"/>
+        <element name="conditionsValue" type="input" selector=".rule-param-edit input"/>
+        <element name="conditionsOperator" type="select" selector=".rule-param-edit select"/>
+
         <!-- Actions sub-form -->
         <element name="actionsTab" type="text" selector="//div[@data-index='actions']//span[contains(.,'Actions')][1]"/>
         <element name="actionsHeader" type="button" selector="div[data-index='actions']" timeout="30"/>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
index 7955f4ec29e55..642ad6a268201 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateWidgetActionGroup.xml
@@ -7,55 +7,62 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCreateProductsListWidgetActionGroup">
-      <arguments>
-          <argument name="widget"/>
-      </arguments>
-      <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnAdminDashboard"/>
-      <click selector="{{AdminMenuSection.content}}" stepKey="clickContent"/>
-      <waitForLoadingMaskToDisappear stepKey="waitForWidgets" />
-      <click selector="{{AdminMenuSection.widgets}}" stepKey="clickWidgets"/>
-      <waitForPageLoad stepKey="waitForWidgetsLoad"/>
-      <click selector="{{AdminGridMainControls.add}}" stepKey="addNewWidget"/>
-      <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="setWidgetType"/>
-      <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.design_theme}}" stepKey="setWidgetDesignTheme"/>
-      <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
-      <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
-      <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_ids[0]}}" stepKey="setWidgetStoreIds"/>
-      <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
-      <selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display_on}}" stepKey="setDisplayOn"/>
-      <waitForAjaxLoad stepKey="waitForLoad"/>
-      <selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="setContainer"/>
-      <waitForAjaxLoad stepKey="waitForPageLoad"/>
-      <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-      <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="clickWidgetOptions"/>
-      <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
-      <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="{{widget.condition}}" stepKey="selectCondition"/>
-      <waitForElement selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitRuleParameter"/>
-      <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickRuleParameter"/>
-      <click selector="{{AdminNewWidgetSection.openChooser}}" stepKey="clickChooser"/>
-      <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-      <click selector="{{AdminNewWidgetSection.selectAll}}" stepKey="clickSelectAll"/>
-      <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
-      <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
-      <waitForPageLoad stepKey="waitForSaveLoad"/>
-      <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
-    </actionGroup>
-    <actionGroup name="AdminDeleteWidgetActionGroup">
-      <arguments>
-          <argument name="widget"/>
-      </arguments>
-      <amOnPage url="{{AdminWidgetsPage.url}}" stepKey="amOnAdmin"/>
-      <waitForPageLoad stepKey="waitWidgetsLoad"/>
-      <fillField selector="{{AdminWidgetsSection.widgetTitleSearch}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
-      <click selector="{{AdminWidgetsSection.searchButton}}" stepKey="clickContinue"/>
-      <click selector="{{AdminWidgetsSection.searchResult}}" stepKey="clickSearchResult"/>
-      <waitForPageLoad stepKey="waitForResultLoad"/>
-      <click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDelete"/>
-      <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
-      <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
-      <waitForPageLoad stepKey="waitForDeleteLoad"/>
-      <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been deleted" stepKey="seeSuccess"/>
-    </actionGroup>
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+   <actionGroup name="AdminCreateWidgetActionGroup">
+       <arguments>
+           <argument name="widget"/>
+       </arguments>
+       <amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="amOnAdminNewWidgetPage"/>
+       <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widget.type}}" stepKey="setWidgetType"/>
+       <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widget.design_theme}}" stepKey="setWidgetDesignTheme"/>
+       <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
+       <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
+       <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" userInput="{{widget.store_ids[0]}}" stepKey="setWidgetStoreIds"/>
+       <click selector="{{AdminNewWidgetSection.addLayoutUpdate}}" stepKey="clickAddLayoutUpdate"/>
+       <selectOption selector="{{AdminNewWidgetSection.selectDisplayOn}}" userInput="{{widget.display_on}}" stepKey="setDisplayOn"/>
+       <waitForAjaxLoad stepKey="waitForLoad"/>
+       <selectOption selector="{{AdminNewWidgetSection.selectContainer}}" userInput="{{widget.container}}" stepKey="setContainer"/>
+       <waitForAjaxLoad stepKey="waitForPageLoad"/>
+       <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+       <click selector="{{AdminNewWidgetSection.widgetOptions}}" stepKey="clickWidgetOptions"/>
+   </actionGroup>
+
+   <!--Create Product List Widget-->
+   <actionGroup name="AdminCreateProductsListWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+       <click selector="{{AdminNewWidgetSection.addNewCondition}}" stepKey="clickAddNewCondition"/>
+       <selectOption selector="{{AdminNewWidgetSection.selectCondition}}" userInput="{{widget.condition}}" stepKey="selectCondition"/>
+       <waitForElement selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="waitRuleParameter"/>
+       <click selector="{{AdminNewWidgetSection.ruleParameter}}" stepKey="clickRuleParameter"/>
+       <click selector="{{AdminNewWidgetSection.openChooser}}" stepKey="clickChooser"/>
+       <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+       <click selector="{{AdminNewWidgetSection.selectAll}}" stepKey="clickSelectAll"/>
+       <click selector="{{AdminNewWidgetSection.applyParameter}}" stepKey="clickApplyRuleParameter"/>
+       <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveWidget"/>
+       <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+   </actionGroup>
+
+   <!--Create Dynamic Block Rotate Widget-->
+   <actionGroup name="AdminCreateDynamicBlocksRotatorWidgetActionGroup" extends="AdminCreateWidgetActionGroup">
+       <selectOption selector="{{AdminNewWidgetSection.displayMode}}" userInput="{{widget.display_mode}}" stepKey="selectDisplayMode"/>
+       <selectOption selector="{{AdminNewWidgetSection.restrictTypes}}" userInput="{{widget.restrict_type}}" stepKey="selectRestrictType"/>
+       <click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/>
+       <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+   </actionGroup>
+    
+   <actionGroup name="AdminDeleteWidgetActionGroup">
+       <arguments>
+           <argument name="widget"/>
+       </arguments>
+       <amOnPage url="{{AdminWidgetsPage.url}}" stepKey="amOnAdmin"/>
+       <waitForPageLoad stepKey="waitWidgetsLoad"/>
+       <fillField selector="{{AdminWidgetsSection.widgetTitleSearch}}" userInput="{{widget.name}}" stepKey="fillTitle"/>
+       <click selector="{{AdminWidgetsSection.searchButton}}" stepKey="clickContinue"/>
+       <click selector="{{AdminWidgetsSection.searchResult}}" stepKey="clickSearchResult"/>
+       <waitForPageLoad stepKey="waitForResultLoad"/>
+       <click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDelete"/>
+       <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+       <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+       <waitForPageLoad stepKey="waitForDeleteLoad"/>
+       <see selector="{{AdminMessagesSection.successMessage}}" userInput="The widget instance has been deleted" stepKey="seeSuccess"/>
+   </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
index 26864c60b6494..27222298408de 100644
--- a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.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="ProductsListWidget" type="widget">
         <data key="type">Catalog Products List</data>
         <data key="design_theme">Magento Luma</data>
@@ -19,4 +19,17 @@
         <data key="display_on">All Pages</data>
         <data key="container">Main Content Area</data>
     </entity>
+    <entity name="DynamicBlocksRotatorWidget" type="widget">
+        <data key="type">Dynamic Blocks Rotator</data>
+        <data key="design_theme">Magento Luma</data>
+        <data key="name" unique="suffix">TestBannerWidget</data>
+        <array key="store_ids">
+            <item>All Store Views</item>
+        </array>
+        <data key="condition">SKU</data>
+        <data key="display_on">All Pages</data>
+        <data key="container">Main Content Area</data>
+        <data key="display_mode">Cart Price Rule Related</data>
+        <data key="restrict_type">Header</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
index 8eb0a5f65318e..d495a36f68d0a 100644
--- a/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Page/AdminNewWidgetPage.xml
@@ -7,8 +7,8 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="AdminNewWidgetPage" url="admin/admin/widget_instance/new/" area="admin" module="Magento_Widget">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminNewWidgetPage" url="admin/widget_instance/new/" area="admin" module="Magento_Widget">
         <section name="AdminNewWidgetSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index 38b4df335ea83..aea74b573ce11 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminNewWidgetSection">
         <element name="widgetType" type="select" selector="#code"/>
         <element name="widgetDesignTheme" type="select" selector="#theme_id"/>
@@ -25,5 +25,8 @@
         <element name="applyParameter" type="button" selector=".rule-param-apply"/>
         <element name="openChooser" type="button" selector=".rule-chooser-trigger"/>
         <element name="selectAll" type="checkbox" selector=".admin__control-checkbox"/>
+        <element name="displayMode" type="select" selector="select[id*='display_mode']"/>
+        <element name="restrictTypes" type="select" selector="select[id*='types']"/>
+        <element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>
     </section>
 </sections>

From b0ab652438714c56555b22a40f71d26735a0016b Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Mon, 10 Dec 2018 20:14:14 +0200
Subject: [PATCH 248/932] GraphQL-57: Manage Address Book

-- Refactoring
---
 .../CustomerAddressCreateDataValidator.php    |  56 ++++++
 .../CustomerAddressDataProvider.php}          |  10 +-
 .../CustomerAddressUpdateDataValidator.php    |  56 ++++++
 .../Address/GetAllowedAddressAttributes.php   |  49 +++++
 .../Address/GetCustomerAddressForUser.php     |  61 +++++++
 .../Model/Customer/CustomerDataProvider.php   |   2 +-
 ...Information.php => UpdateCustomerData.php} |   4 +-
 .../Model/Resolver/CreateCustomerAddress.php  |  87 +++------
 .../Model/Resolver/DeleteCustomerAddress.php  |  33 ++--
 .../Model/Resolver/UpdateCustomer.php         |  14 +-
 .../Model/Resolver/UpdateCustomerAddress.php  | 106 ++++-------
 .../CustomerGraphQl/etc/schema.graphqls       |  20 +--
 .../Model/Cart/GetCartForUser.php             |   6 +-
 .../Customer/CreateCustomerAddressTest.php    | 135 +++++++-------
 .../Customer/DeleteCustomerAddressTest.php    | 162 ++++++++---------
 ...AddressesTest.php => GetAddressesTest.php} |  46 +----
 .../GraphQl/Customer/GetCustomerTest.php      | 129 ++++++++++++++
 .../Customer/UpdateCustomerAddressTest.php    | 167 +++++++-----------
 ...rmationTest.php => UpdateCustomerTest.php} |  90 +---------
 19 files changed, 657 insertions(+), 576 deletions(-)
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
 rename app/code/Magento/CustomerGraphQl/Model/Customer/{AddressDataProvider.php => Address/CustomerAddressDataProvider.php} (94%)
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
 rename app/code/Magento/CustomerGraphQl/Model/Customer/{UpdateAccountInformation.php => UpdateCustomerData.php} (97%)
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/{AddressesTest.php => GetAddressesTest.php} (66%)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/{AccountInformationTest.php => UpdateCustomerTest.php} (73%)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
new file mode 100644
index 0000000000000..65672bcd3503b
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressCreateDataValidator.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Customer address create data validator
+ */
+class CustomerAddressCreateDataValidator
+{
+    /**
+     * @var GetAllowedAddressAttributes
+     */
+    private $getAllowedAddressAttributes;
+
+    /**
+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
+     */
+    public function __construct(GetAllowedAddressAttributes $getAllowedAddressAttributes)
+    {
+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
+    }
+
+    /**
+     * Validate customer address create data
+     *
+     * @param array $addressData
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validate(array $addressData): void
+    {
+        $attributes = $this->getAllowedAddressAttributes->execute();
+        $errorInput = [];
+
+        foreach ($attributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (!isset($addressData[$attributeName]) || empty($addressData[$attributeName]))
+            ) {
+                $errorInput[] = $attributeName;
+            }
+        }
+
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/AddressDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php
similarity index 94%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/AddressDataProvider.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php
index 3f727a5e9e4a6..9640953032ac6 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/AddressDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressDataProvider.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CustomerGraphQl\Model\Customer;
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
 
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
@@ -19,7 +19,7 @@
 /**
  * Customer Address field data provider, used for GraphQL request processing.
  */
-class AddressDataProvider
+class CustomerAddressDataProvider
 {
     /**
      * @var ServiceOutputProcessor
@@ -72,10 +72,10 @@ private function curateAddressDefaultValues(array $address, AddressInterface $ad
         $this->customerResourceModel->load($customerModel, $addressObject->getCustomerId());
         $address[CustomerInterface::DEFAULT_BILLING] =
             ($customerModel->getDefaultBillingAddress()
-                && $addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId()) ? true : false;
+                && $addressObject->getId() == $customerModel->getDefaultBillingAddress()->getId());
         $address[CustomerInterface::DEFAULT_SHIPPING] =
             ($customerModel->getDefaultShippingAddress()
-                && $addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId()) ? true : false;
+                && $addressObject->getId() == $customerModel->getDefaultShippingAddress()->getId());
         return $address;
     }
 
@@ -85,7 +85,7 @@ private function curateAddressDefaultValues(array $address, AddressInterface $ad
      * @param AddressInterface $addressObject
      * @return array
      */
-    public function processCustomerAddress(AddressInterface $addressObject) : array
+    public function getAddressData(AddressInterface $addressObject): array
     {
         $address = $this->serviceOutputProcessor->process(
             $addressObject,
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
new file mode 100644
index 0000000000000..13716b491fddf
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/CustomerAddressUpdateDataValidator.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Customer address update data validator. Patch update is allowed
+ */
+class CustomerAddressUpdateDataValidator
+{
+    /**
+     * @var GetAllowedAddressAttributes
+     */
+    private $getAllowedAddressAttributes;
+
+    /**
+     * @param GetAllowedAddressAttributes $getAllowedAddressAttributes
+     */
+    public function __construct(GetAllowedAddressAttributes $getAllowedAddressAttributes)
+    {
+        $this->getAllowedAddressAttributes = $getAllowedAddressAttributes;
+    }
+
+    /**
+     * Validate customer address update data
+     *
+     * @param array $addressData
+     * @return void
+     * @throws GraphQlInputException
+     */
+    public function validate(array $addressData): void
+    {
+        $attributes = $this->getAllowedAddressAttributes->execute();
+        $errorInput = [];
+
+        foreach ($attributes as $attributeName => $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (isset($addressData[$attributeName]) && empty($addressData[$attributeName]))
+            ) {
+                $errorInput[] = $attributeName;
+            }
+        }
+
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php
new file mode 100644
index 0000000000000..87be760732384
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetAllowedAddressAttributes.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Customer\Api\AddressMetadataManagementInterface;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+
+/**
+ * Get allowed address attributes
+ */
+class GetAllowedAddressAttributes
+{
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @param Config $eavConfig
+     */
+    public function __construct(Config $eavConfig)
+    {
+        $this->eavConfig = $eavConfig;
+    }
+
+    /**
+     * Get allowed address attributes
+     *
+     * @return AbstractAttribute[]
+     */
+    public function execute(): array
+    {
+        $attributes = $this->eavConfig->getEntityAttributes(
+            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
+        );
+        foreach ($attributes as $attributeCode => $attribute) {
+            if (false === $attribute->getIsVisibleOnFront()) {
+                unset($attributes[$attributeCode]);
+            }
+        }
+        return $attributes;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
new file mode 100644
index 0000000000000..f7323402a6c62
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/Address/GetCustomerAddressForUser.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\Address;
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+
+/**
+ * Get customer address for user
+ */
+class GetCustomerAddressForUser
+{
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @param AddressRepositoryInterface $addressRepository
+     */
+    public function __construct(AddressRepositoryInterface $addressRepository)
+    {
+        $this->addressRepository = $addressRepository;
+    }
+
+    /**
+     * Get customer address for user
+     *
+     * @param int $addressId
+     * @param int $userId
+     * @return AddressInterface
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(int $addressId, int $userId): AddressInterface
+    {
+        try {
+            /** @var AddressInterface $address */
+            $address = $this->addressRepository->getById($addressId);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(
+                __('Address id %1 does not exist.', [$addressId])
+            );
+        }
+
+        if ($address->getCustomerId() != $userId) {
+            throw new GraphQlAuthorizationException(
+                __('Current customer does not have permission to address id %1', [$addressId])
+            );
+        }
+        return $address;
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php
index 4350a04b1d875..c8382593eab23 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CustomerDataProvider.php
@@ -102,7 +102,7 @@ private function processCustomer(CustomerInterface $customer): array
             CustomerRepositoryInterface::class,
             'get'
         );
-        $customerData['addresses'] = $this->curateAddressData($customer['addresses']);
+        $customerData['addresses'] = $this->curateAddressData($customerData['addresses']);
         if (isset($customerData['extension_attributes'])) {
             $customerData = array_merge($customerData, $customerData['extension_attributes']);
         }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateAccountInformation.php b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php
similarity index 97%
rename from app/code/Magento/CustomerGraphQl/Model/Customer/UpdateAccountInformation.php
rename to app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php
index 36365f1910f27..18510b872e64a 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateAccountInformation.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/UpdateCustomerData.php
@@ -15,9 +15,9 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Update account information
+ * Update customer data
  */
-class UpdateAccountInformation
+class UpdateCustomerData
 {
     /**
      * @var CustomerRepositoryInterface
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
index 3abe037fcee3e..fbdf6d141eeb0 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
@@ -8,20 +8,18 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\AddressInterface;
-use Magento\CustomerGraphQl\Model\Customer\AddressDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressCreateDataValidator;
+use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressDataProvider;
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
-use Magento\Eav\Model\Config;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 
 /**
- * Customers address create, used for GraphQL request processing.
+ * Customers address create, used for GraphQL request processing
  */
 class CreateCustomerAddress implements ResolverInterface
 {
@@ -41,42 +39,42 @@ class CreateCustomerAddress implements ResolverInterface
     private $addressInterfaceFactory;
 
     /**
-     * @var AddressDataProvider
+     * @var CustomerAddressDataProvider
      */
-    private $addressDataProvider;
+    private $customerAddressDataProvider;
 
     /**
-     * @var Config
+     * @var DataObjectHelper
      */
-    private $eavConfig;
+    private $dataObjectHelper;
 
     /**
-     * @var DataObjectHelper
+     * @var CustomerAddressCreateDataValidator
      */
-    private $dataObjectHelper;
+    private $customerAddressCreateDataValidator;
 
     /**
      * @param CheckCustomerAccount $checkCustomerAccount
      * @param AddressRepositoryInterface $addressRepository
      * @param AddressInterfaceFactory $addressInterfaceFactory
-     * @param AddressDataProvider $addressDataProvider
-     * @param Config $eavConfig
+     * @param CustomerAddressDataProvider $customerAddressDataProvider
      * @param DataObjectHelper $dataObjectHelper
+     * @param CustomerAddressCreateDataValidator $customerAddressCreateDataValidator
      */
     public function __construct(
         CheckCustomerAccount $checkCustomerAccount,
         AddressRepositoryInterface $addressRepository,
         AddressInterfaceFactory $addressInterfaceFactory,
-        AddressDataProvider $addressDataProvider,
-        Config $eavConfig,
-        DataObjectHelper $dataObjectHelper
+        CustomerAddressDataProvider $customerAddressDataProvider,
+        DataObjectHelper $dataObjectHelper,
+        CustomerAddressCreateDataValidator $customerAddressCreateDataValidator
     ) {
         $this->checkCustomerAccount = $checkCustomerAccount;
         $this->addressRepository = $addressRepository;
         $this->addressInterfaceFactory = $addressInterfaceFactory;
-        $this->addressDataProvider = $addressDataProvider;
-        $this->eavConfig = $eavConfig;
+        $this->customerAddressDataProvider = $customerAddressDataProvider;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->customerAddressCreateDataValidator = $customerAddressCreateDataValidator;
     }
 
     /**
@@ -93,56 +91,25 @@ public function resolve(
         $currentUserType = $context->getUserType();
 
         $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+        $this->customerAddressCreateDataValidator->validate($args['input']);
 
-        return $this->addressDataProvider->processCustomerAddress(
-            $this->processCustomerAddressCreate($currentUserId, $args['input'])
-        );
-    }
-
-    /**
-     * Get new address attribute input errors
-     *
-     * @param array $addressInput
-     * @return bool|string
-     */
-    private function getInputError(array $addressInput)
-    {
-        $attributes = $this->eavConfig->getEntityAttributes(
-            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
-        );
-        foreach ($attributes as $attributeName => $attributeInfo) {
-            if ($attributeInfo->getIsRequired()
-                && (!isset($addressInput[$attributeName]) || empty($addressInput[$attributeName]))) {
-                return $attributeName;
-            }
-        }
-        return false;
+        $address = $this->createCustomerAddress((int)$currentUserId, $args['input']);
+        return $this->customerAddressDataProvider->getAddressData($address);
     }
 
     /**
-     * Process customer address create
+     * Create customer address
      *
      * @param int $customerId
-     * @param array $addressInput
+     * @param array $addressData
      * @return AddressInterface
-     * @throws GraphQlInputException
      */
-    private function processCustomerAddressCreate($customerId, array $addressInput) : AddressInterface
+    private function createCustomerAddress(int $customerId, array $addressData) : AddressInterface
     {
-        $errorInput = $this->getInputError($addressInput);
-        if ($errorInput) {
-            throw new GraphQlInputException(
-                __('Required parameter %1 is missing', [$errorInput])
-            );
-        }
-        /** @var AddressInterface $newAddress */
-        $newAddress = $this->addressInterfaceFactory->create();
-        $this->dataObjectHelper->populateWithArray(
-            $newAddress,
-            $addressInput,
-            AddressInterface::class
-        );
-        $newAddress->setCustomerId($customerId);
-        return $this->addressRepository->save($newAddress);
+        /** @var AddressInterface $address */
+        $address = $this->addressInterfaceFactory->create();
+        $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
+        $address->setCustomerId($customerId);
+        return $this->addressRepository->save($address);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
index 8d9b9a5ae1897..084857c84d5a4 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
@@ -8,14 +8,13 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\Data\AddressInterface;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddressForUser;
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Customers address delete, used for GraphQL request processing.
@@ -32,16 +31,24 @@ class DeleteCustomerAddress implements ResolverInterface
      */
     private $addressRepository;
 
+    /**
+     * @var GetCustomerAddressForUser
+     */
+    private $getCustomerAddressForUser;
+
     /**
      * @param CheckCustomerAccount $checkCustomerAccount
      * @param AddressRepositoryInterface $addressRepository
+     * @param GetCustomerAddressForUser $getCustomerAddressForUser
      */
     public function __construct(
         CheckCustomerAccount $checkCustomerAccount,
-        AddressRepositoryInterface $addressRepository
+        AddressRepositoryInterface $addressRepository,
+        GetCustomerAddressForUser $getCustomerAddressForUser
     ) {
         $this->checkCustomerAccount = $checkCustomerAccount;
         $this->addressRepository = $addressRepository;
+        $this->getCustomerAddressForUser = $getCustomerAddressForUser;
     }
 
     /**
@@ -59,11 +66,11 @@ public function resolve(
 
         $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
 
-        return $this->processCustomerAddressDelete($currentUserId, $args['id']);
+        return $this->deleteCustomerAddress((int)$currentUserId, (int)$args['id']);
     }
 
     /**
-     * Process customer address delete
+     * Delete customer address
      *
      * @param int $customerId
      * @param int $addressId
@@ -71,21 +78,9 @@ public function resolve(
      * @throws GraphQlAuthorizationException
      * @throws GraphQlNoSuchEntityException
      */
-    private function processCustomerAddressDelete($customerId, $addressId)
+    private function deleteCustomerAddress($customerId, $addressId)
     {
-        try {
-            /** @var AddressInterface $address */
-            $address = $this->addressRepository->getById($addressId);
-        } catch (NoSuchEntityException $exception) {
-            throw new GraphQlNoSuchEntityException(
-                __('Address id %1 does not exist.', [$addressId])
-            );
-        }
-        if ($customerId != $address->getCustomerId()) {
-            throw new GraphQlAuthorizationException(
-                __('Current customer does not have permission to delete address id %1', [$addressId])
-            );
-        }
+        $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
         if ($address->isDefaultBilling()) {
             throw new GraphQlAuthorizationException(
                 __('Customer Address %1 is set as default billing address and can not be deleted', [$addressId])
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
index 5dc857f3f178c..50760d2e2e31c 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
@@ -9,7 +9,7 @@
 
 use Magento\CustomerGraphQl\Model\Customer\ChangeSubscriptionStatus;
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
-use Magento\CustomerGraphQl\Model\Customer\UpdateAccountInformation;
+use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerData;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
@@ -27,9 +27,9 @@ class UpdateCustomer implements ResolverInterface
     private $checkCustomerAccount;
 
     /**
-     * @var UpdateAccountInformation
+     * @var UpdateCustomerData
      */
-    private $updateAccountInformation;
+    private $updateCustomerData;
 
     /**
      * @var ChangeSubscriptionStatus
@@ -43,18 +43,18 @@ class UpdateCustomer implements ResolverInterface
 
     /**
      * @param CheckCustomerAccount $checkCustomerAccount
-     * @param UpdateAccountInformation $updateAccountInformation
+     * @param UpdateCustomerData $updateCustomerData
      * @param ChangeSubscriptionStatus $changeSubscriptionStatus
      * @param CustomerDataProvider $customerDataProvider
      */
     public function __construct(
         CheckCustomerAccount $checkCustomerAccount,
-        UpdateAccountInformation $updateAccountInformation,
+        UpdateCustomerData $updateCustomerData,
         ChangeSubscriptionStatus $changeSubscriptionStatus,
         CustomerDataProvider $customerDataProvider
     ) {
         $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->updateAccountInformation = $updateAccountInformation;
+        $this->updateCustomerData = $updateCustomerData;
         $this->changeSubscriptionStatus = $changeSubscriptionStatus;
         $this->customerDataProvider = $customerDataProvider;
     }
@@ -79,7 +79,7 @@ public function resolve(
         $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
 
         $currentUserId = (int)$currentUserId;
-        $this->updateAccountInformation->execute($currentUserId, $args['input']);
+        $this->updateCustomerData->execute($currentUserId, $args['input']);
 
         if (isset($args['input']['is_subscribed'])) {
             $this->changeSubscriptionStatus->execute($currentUserId, (bool)$args['input']['is_subscribed']);
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
index d126016587ebe..7bae40e4cc5de 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -8,22 +8,18 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AddressInterface;
-use Magento\CustomerGraphQl\Model\Customer\AddressDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressDataProvider;
+use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressUpdateDataValidator;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddressForUser;
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
-use Magento\Eav\Model\Config;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
- * Customers address update, used for GraphQL request processing.
+ * Customers address update, used for GraphQL request processing
  */
 class UpdateCustomerAddress implements ResolverInterface
 {
@@ -38,39 +34,47 @@ class UpdateCustomerAddress implements ResolverInterface
     private $addressRepository;
 
     /**
-     * @var AddressDataProvider
+     * @var CustomerAddressDataProvider
      */
-    private $addressDataProvider;
+    private $customerAddressDataProvider;
 
     /**
-     * @var Config
+     * @var DataObjectHelper
      */
-    private $eavConfig;
+    private $dataObjectHelper;
 
     /**
-     * @var DataObjectHelper
+     * @var CustomerAddressUpdateDataValidator
      */
-    private $dataObjectHelper;
+    private $customerAddressUpdateDataValidator;
+
+    /**
+     * @var GetCustomerAddressForUser
+     */
+    private $getCustomerAddressForUser;
 
     /**
      * @param CheckCustomerAccount $checkCustomerAccount
      * @param AddressRepositoryInterface $addressRepository
-     * @param AddressDataProvider $addressDataProvider
-     * @param Config $eavConfig
+     * @param CustomerAddressDataProvider $customerAddressDataProvider
      * @param DataObjectHelper $dataObjectHelper
+     * @param CustomerAddressUpdateDataValidator $customerAddressUpdateDataValidator
+     * @param GetCustomerAddressForUser $getCustomerAddressForUser
      */
     public function __construct(
         CheckCustomerAccount $checkCustomerAccount,
         AddressRepositoryInterface $addressRepository,
-        AddressDataProvider $addressDataProvider,
+        CustomerAddressDataProvider $customerAddressDataProvider,
         DataObjectHelper $dataObjectHelper,
-        Config $eavConfig
+        CustomerAddressUpdateDataValidator $customerAddressUpdateDataValidator,
+        GetCustomerAddressForUser $getCustomerAddressForUser
     ) {
         $this->checkCustomerAccount = $checkCustomerAccount;
         $this->addressRepository = $addressRepository;
-        $this->addressDataProvider = $addressDataProvider;
-        $this->eavConfig = $eavConfig;
+        $this->customerAddressDataProvider = $customerAddressDataProvider;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->customerAddressUpdateDataValidator = $customerAddressUpdateDataValidator;
+        $this->getCustomerAddressForUser = $getCustomerAddressForUser;
     }
 
     /**
@@ -87,70 +91,24 @@ public function resolve(
         $currentUserType = $context->getUserType();
 
         $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+        $this->customerAddressUpdateDataValidator->validate($args['input']);
 
-        return $this->addressDataProvider->processCustomerAddress(
-            $this->processCustomerAddressUpdate($currentUserId, $args['id'], $args['input'])
-        );
+        $address = $this->updateCustomerAddress((int)$currentUserId, (int)$args['id'], $args['input']);
+        return $this->customerAddressDataProvider->getAddressData($address);
     }
 
     /**
-     * Get update address attribute input errors
-     *
-     * @param array $addressInput
-     * @return bool|string
-     */
-    private function getInputError(array $addressInput)
-    {
-        $attributes = $this->eavConfig->getEntityAttributes(
-            AddressMetadataManagementInterface::ENTITY_TYPE_ADDRESS
-        );
-        foreach ($attributes as $attributeName => $attributeInfo) {
-            if ($attributeInfo->getIsRequired()
-                && (isset($addressInput[$attributeName]) && empty($addressInput[$attributeName]))) {
-                return $attributeName;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Process customer address update
+     * Update customer address
      *
      * @param int $customerId
      * @param int $addressId
-     * @param array $addressInput
+     * @param array $addressData
      * @return AddressInterface
-     * @throws GraphQlAuthorizationException
-     * @throws GraphQlNoSuchEntityException
-     * @throws GraphQlInputException
      */
-    private function processCustomerAddressUpdate($customerId, $addressId, array $addressInput)
+    private function updateCustomerAddress(int $customerId, int $addressId, array $addressData)
     {
-        try {
-            /** @var AddressInterface $address */
-            $address = $this->addressRepository->getById($addressId);
-        } catch (NoSuchEntityException $exception) {
-            throw new GraphQlNoSuchEntityException(
-                __('Address id %1 does not exist.', [$addressId])
-            );
-        }
-        if ($address->getCustomerId() != $customerId) {
-            throw new GraphQlAuthorizationException(
-                __('Current customer does not have permission to update address id %1', [$addressId])
-            );
-        }
-        $errorInput = $this->getInputError($addressInput);
-        if ($errorInput) {
-            throw new GraphQlInputException(
-                __('Required parameter %1 is missing', [$errorInput])
-            );
-        }
-
-        $this->dataObjectHelper->populateWithArray(
-            $address,
-            $addressInput,
-            AddressInterface::class
-        );
+        $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
+        $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
         return $this->addressRepository->save($address);
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index ea9c8606566a0..c92753b96225c 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -16,25 +16,23 @@ type Mutation {
 }
 
 input CustomerAddressInput {
-    region: CustomerAddressRegionInput @doc(description: "An object containing the region name, region code, and region ID")
-    region_id: Int @doc(description: "A number that uniquely identifies the state, province, or other area")
-    country_id: CountryCodeEnum @doc(description: "The customer's country")
-    street: [String] @doc(description: "An array of strings that define the street number and name")
+    firstname: String @doc(description: "The first name of the person associated with the shipping/billing address")
+    lastname: String @doc(description: "The family name of the person associated with the shipping/billing address")
     company: String @doc(description: "The customer's company")
     telephone: String @doc(description: "The telephone number")
-    fax: String @doc(description: "The fax number")
-    postcode: String @doc(description: "The customer's ZIP or postal code")
+    street: [String] @doc(description: "An array of strings that define the street number and name")
     city: String @doc(description: "The city or town")
-    firstname: String @doc(description: "The first name of the person associated with the shipping/billing address")
-    lastname: String @doc(description: "The family name of the person associated with the shipping/billing address")
+    region: CustomerAddressRegionInput @doc(description: "An object containing the region name, region code, and region ID")
+    postcode: String @doc(description: "The customer's ZIP or postal code")
+    country_id: CountryCodeEnum @doc(description: "The customer's country")
+    default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
+    default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
+    fax: String @doc(description: "The fax number")
     middlename: String @doc(description: "The middle name of the person associated with the shipping/billing address")
     prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
     suffix: String @doc(description: "A value such as Sr., Jr., or III")
     vat_id: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
-    default_shipping: Boolean @doc(description: "Indicates whether the address is the default shipping address")
-    default_billing: Boolean @doc(description: "Indicates whether the address is the default billing address")
     custom_attributes: [CustomerAddressAttributeInput] @doc(description: "Address custom attributes")
-    extension_attributes: [CustomerAddressAttributeInput] @doc(description: "Address extension attributes")
 }
 
 input CustomerAddressRegionInput @doc(description: "CustomerAddressRegionInput defines the customer's state or province") {
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
index 9c50d4b85578b..c3207bf478bbe 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -8,7 +8,7 @@
 namespace Magento\QuoteGraphQl\Model\Cart;
 
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
@@ -47,7 +47,7 @@ public function __construct(
      * @param string $cartHash
      * @param int|null $userId
      * @return Quote
-     * @throws GraphQlAuthenticationException
+     * @throws GraphQlAuthorizationException
      * @throws GraphQlNoSuchEntityException
      */
     public function execute(string $cartHash, ?int $userId): Quote
@@ -77,7 +77,7 @@ public function execute(string $cartHash, ?int $userId): Quote
         }
 
         if ($customerId !== $userId) {
-            throw new GraphQlAuthenticationException(
+            throw new GraphQlAuthorizationException(
                 __(
                     'The current user cannot perform operations on cart "%masked_cart_id"',
                     ['masked_cart_id' => $cartHash]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
index da0935e2d659e..dcc792482191d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -7,29 +7,45 @@
 
 namespace Magento\GraphQl\Customer;
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\TestFramework\ObjectManager;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 
 class CreateCustomerAddressTest extends GraphQlAbstract
 {
     /**
-     * Verify customers with valid credentials create new address
-     *
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
+    }
+
+    /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testAddCustomerAddressWithValidCredentials()
+    public function testCreateCustomerAddress()
     {
+        $customerId = 1;
         $newAddress = [
             'region' => [
-                'region' => 'Alaska',
+                'region' => 'Arizona',
                 'region_id' => 4,
-                'region_code' => 'AK'
+                'region_code' => 'AZ'
             ],
-            'region_id' => 4,
             'country_id' => 'US',
             'street' => ['Line 1 Street', 'Line 2'],
             'company' => 'Company name',
@@ -46,8 +62,7 @@ public function testAddCustomerAddressWithValidCredentials()
             'default_shipping' => true,
             'default_billing' => false
         ];
-        $defaultShippingText = $newAddress['default_shipping'] ? "true": "false";
-        $defaultBillingText = $newAddress['default_billing'] ? "true": "false";
+
         $mutation
             = <<<MUTATION
 mutation {
@@ -57,7 +72,6 @@ public function testAddCustomerAddressWithValidCredentials()
         region_id: {$newAddress['region']['region_id']}
         region_code: "{$newAddress['region']['region_code']}"
     }
-    region_id: {$newAddress['region_id']}
     country_id: {$newAddress['country_id']}
     street: ["{$newAddress['street'][0]}","{$newAddress['street'][1]}"]
     company: "{$newAddress['company']}"
@@ -71,8 +85,8 @@ public function testAddCustomerAddressWithValidCredentials()
     prefix: "{$newAddress['prefix']}"
     suffix: "{$newAddress['suffix']}"
     vat_id: "{$newAddress['vat_id']}"
-    default_shipping: {$defaultShippingText}
-    default_billing: {$defaultBillingText}
+    default_shipping: true
+    default_billing: false
   }) {
     id
     customer_id
@@ -81,7 +95,6 @@ public function testAddCustomerAddressWithValidCredentials()
       region_id
       region_code
     }
-    region_id
     country_id
     street
     company
@@ -100,36 +113,27 @@ public function testAddCustomerAddressWithValidCredentials()
   }
 }
 MUTATION;
+
         $userName = 'customer@example.com';
         $password = 'password';
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
+
+        $response = $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
         $this->assertArrayHasKey('createCustomerAddress', $response);
         $this->assertArrayHasKey('customer_id', $response['createCustomerAddress']);
-        $this->assertEquals($customer->getId(), $response['createCustomerAddress']['customer_id']);
+        $this->assertEquals($customerId, $response['createCustomerAddress']['customer_id']);
         $this->assertArrayHasKey('id', $response['createCustomerAddress']);
-        /** @var AddressRepositoryInterface $addressRepository */
-        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-        $addressId = $response['createCustomerAddress']['id'];
-        $address = $addressRepository->getById($addressId);
+
+        $address = $this->addressRepository->getById($response['createCustomerAddress']['id']);
         $this->assertEquals($address->getId(), $response['createCustomerAddress']['id']);
         $this->assertCustomerAddressesFields($address, $response['createCustomerAddress']);
         $this->assertCustomerAddressesFields($address, $newAddress);
     }
 
     /**
-     * Verify customers without credentials create new address
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
      */
-    public function testAddCustomerAddressWithoutCredentials()
+    public function testCreateCustomerAddressIfUserIsNotAuthorized()
     {
         $mutation
             = <<<MUTATION
@@ -142,22 +146,18 @@ public function testAddCustomerAddressWithoutCredentials()
     telephone: "123456789"
     street: ["Line 1", "Line 2"]
     city: "Test City"
-    region_id: 1
+    region: {
+        region_id: 1
+    }
     country_id: US
     postcode: "9999"
     default_shipping: true
     default_billing: false
   }) {
     id
-    customer_id
-    firstname
-    lastname
   }
 }
 MUTATION;
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Current customer does not have access to the resource "customer_address"');
         $this->graphQlQuery($mutation);
     }
 
@@ -166,15 +166,18 @@ public function testAddCustomerAddressWithoutCredentials()
      * with missing required Firstname attribute
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameters are missing: firstname
      */
-    public function testAddCustomerAddressWithMissingAttributeWithValidCredentials()
+    public function testCreateCustomerAddressWithMissingAttribute()
     {
         $mutation
             = <<<MUTATION
 mutation {
   createCustomerAddress(input: {
-    region_id: 4
+    region: {
+        region_id: 1
+    }
     country_id: US
     street: ["Line 1 Street","Line 2"]
     company: "Company name"
@@ -186,54 +189,25 @@ public function testAddCustomerAddressWithMissingAttributeWithValidCredentials()
     lastname: "Phillis"
   }) {
     id
-    customer_id
-    region {
-      region
-      region_id
-      region_code
-    }
-    region_id
-    country_id
-    street
-    company
-    telephone
-    fax
-    postcode
-    city
-    firstname
-    lastname
-    middlename
-    prefix
-    suffix
-    vat_id
-    default_shipping
-    default_billing
   }
 }
 MUTATION;
+
         $userName = 'customer@example.com';
         $password = 'password';
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Required parameter firstname is missing');
-        $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
      * Verify the fields for Customer address
      *
-     * @param \Magento\Customer\Api\Data\AddressInterface $address
+     * @param AddressInterface $address
      * @param array $actualResponse
      */
-    private function assertCustomerAddressesFields($address, $actualResponse)
+    private function assertCustomerAddressesFields(AddressInterface $address, array $actualResponse): void
     {
         /** @var  $addresses */
         $assertionMap = [
-            ['response_field' => 'region_id', 'expected_value' => $address->getRegionId()],
             ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
             ['response_field' => 'street', 'expected_value' => $address->getStreet()],
             ['response_field' => 'company', 'expected_value' => $address->getCompany()],
@@ -259,4 +233,15 @@ private function assertCustomerAddressesFields($address, $actualResponse)
         ];
         $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
     }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
index 31afe850253f1..ba0232020298f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
@@ -9,160 +9,132 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use PHPUnit\Framework\TestResult;
 
 class DeleteCustomerAddressTest extends GraphQlAbstract
 {
     /**
-     * Verify customers with valid credentials with a customer bearer token
-     *
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+        $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
+    }
+
+    /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testDeleteCustomerAddressWithValidCredentials()
+    public function testDeleteCustomerAddress()
     {
         $userName = 'customer@example.com';
         $password = 'password';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = end($addresses);
-        $addressId = $address->getId();
+        $addressId = 2;
+
         $mutation
             = <<<MUTATION
 mutation {
   deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
+        $response = $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
         $this->assertArrayHasKey('deleteCustomerAddress', $response);
         $this->assertEquals(true, $response['deleteCustomerAddress']);
     }
 
     /**
-     * Verify customers without credentials delete address
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
      */
-    public function testDeleteCustomerAddressWithoutCredentials()
+    public function testDeleteCustomerAddressIfUserIsNotAuthorized()
     {
-        $userName = 'customer@example.com';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = current($addresses);
-        $addressId = $address->getId();
+        $addressId = 1;
         $mutation
             = <<<MUTATION
 mutation {
   deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Current customer does not have access to the resource "customer_address"');
         $this->graphQlQuery($mutation);
     }
 
     /**
-     * Verify customers with valid credentials delete default shipping address
-     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Customer Address 2 is set as default shipping address and can not be deleted
      */
-    public function testDeleteDefaultShippingCustomerAddressWithValidCredentials()
+    public function testDeleteDefaultShippingCustomerAddress()
     {
         $userName = 'customer@example.com';
         $password = 'password';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = end($addresses);
+        $addressId = 2;
+
+        $address = $this->addressRepository->getById($addressId);
         $address->setIsDefaultShipping(true);
-        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-        $addressRepository->save($address);
-        $addressId = $address->getId();
+        $this->addressRepository->save($address);
+
         $mutation
             = <<<MUTATION
 mutation {
   deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Customer Address ' . $addressId . ' is set as default shipping address and can not be deleted');
-        $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
-     * Verify customers with valid credentials delete default billing address
-     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Customer Address 2 is set as default billing address and can not be deleted
      */
-    public function testDeleteDefaultBillingCustomerAddressWithValidCredentials()
+    public function testDeleteDefaultBillingCustomerAddress()
     {
         $userName = 'customer@example.com';
         $password = 'password';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = end($addresses);
+        $addressId = 2;
+
+        $address = $this->addressRepository->getById($addressId);
         $address->setIsDefaultBilling(true);
-        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-        $addressRepository->save($address);
-        $addressId = $address->getId();
+        $this->addressRepository->save($address);
+
         $mutation
             = <<<MUTATION
 mutation {
   deleteCustomerAddress(id: {$addressId})
 }
 MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Customer Address ' . $addressId . ' is set as default billing address and can not be deleted');
-        $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
-     * Verify customers with valid credentials delete non exist address
-     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Address id 9999 does not exist.
      */
-    public function testDeleteNonExistCustomerAddressWithValidCredentials()
+    public function testDeleteNonExistCustomerAddress()
     {
         $userName = 'customer@example.com';
         $password = 'password';
@@ -172,13 +144,17 @@ public function testDeleteNonExistCustomerAddressWithValidCredentials()
   deleteCustomerAddress(id: 9999)
 }
 MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Address id 9999 does not exist.');
-        $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/AddressesTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
similarity index 66%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/AddressesTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
index 9b7e3f28327da..53eb80335ff21 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/AddressesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetAddressesTest.php
@@ -14,7 +14,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 
-class AddressesTest extends GraphQlAbstract
+class GetAddressesTest extends GraphQlAbstract
 {
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
@@ -25,20 +25,9 @@ public function testGetCustomerWithAddresses()
         $query
             = <<<QUERY
 {
-  customer 
-  {
-    created_at
-    group_id
-    prefix
-    firstname
-    middlename
-    lastname
-    suffix
-    email
-    default_billing
-    default_shipping
+  customer {
     id
-      addresses{
+    addresses {
       id
       customer_id
       region_id
@@ -71,37 +60,10 @@ public function testGetCustomerWithAddresses()
             is_array([$response['customer']['addresses']]),
             " Addresses field must be of an array type."
         );
-        $this->assertCustomerFields($customer, $response['customer']);
+        self::assertEquals($customer->getId(), $response['customer']['id']);
         $this->assertCustomerAddressesFields($customer, $response);
     }
 
-    /**
-     * Verify the all the whitelisted fields for a Customer Object
-     *
-     * @param CustomerInterface $customer
-     * @param $actualResponse
-     */
-    public function assertCustomerFields($customer, $actualResponse)
-    {
-        // ['customer_object_field_name', 'expected_value']
-        $assertionMap = [
-            ['response_field' => 'id', 'expected_value' => $customer->getId()],
-            ['response_field' => 'created_at', 'expected_value' => $customer->getCreatedAt()],
-            ['response_field' => 'group_id', 'expected_value' => $customer->getGroupId()],
-            ['response_field' => 'prefix', 'expected_value' => $customer->getPrefix()],
-            ['response_field' => 'firstname', 'expected_value' => $customer->getFirstname()],
-            ['response_field' => 'middlename', 'expected_value' => $customer->getMiddlename()],
-            ['response_field' => 'lastname', 'expected_value' => $customer->getLastname()],
-            ['response_field' => 'suffix', 'expected_value' => $customer->getSuffix()],
-            ['response_field' => 'email', 'expected_value' => $customer->getEmail()],
-            ['response_field' => 'default_shipping', 'expected_value' => (bool)$customer->getDefaultShipping()],
-            ['response_field' => 'default_billing', 'expected_value' => (bool)$customer->getDefaultBilling()],
-            ['response_field' => 'id', 'expected_value' => $customer->getId()]
-        ];
-
-        $this->assertResponseFields($actualResponse, $assertionMap);
-    }
-
     /**
      * Verify the fields for CustomerAddress object
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
new file mode 100644
index 0000000000000..928a263e8531b
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GetCustomerTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Model\CustomerAuthUpdate;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class GetCustomerTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRegistry
+     */
+    private $customerRegistry;
+
+    /**
+     * @var CustomerAuthUpdate
+     */
+    private $customerAuthUpdate;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+        $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testGetCustomer()
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $query = <<<QUERY
+query {
+    customer {
+        firstname
+        lastname
+        email
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+
+        $this->assertEquals('John', $response['customer']['firstname']);
+        $this->assertEquals('Smith', $response['customer']['lastname']);
+        $this->assertEquals($currentEmail, $response['customer']['email']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
+     */
+    public function testGetCustomerIfUserIsNotAuthorized()
+    {
+        $query = <<<QUERY
+query {
+    customer {
+        firstname
+        lastname
+        email
+    }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The account is locked.
+     */
+    public function testGetCustomerIfAccountIsLocked()
+    {
+        $this->lockCustomer(1);
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $query = <<<QUERY
+query {
+    customer {
+        firstname
+        lastname
+        email
+    }
+}
+QUERY;
+        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+
+    /**
+     * @param int $customerId
+     * @return void
+     */
+    private function lockCustomer(int $customerId): void
+    {
+        $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
+        $customerSecure->setLockExpires('2030-12-31 00:00:00');
+        $this->customerAuthUpdate->saveAuth($customerId);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
index 4bbe2680f2183..519fe2b1405a0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -9,31 +9,55 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\TestFramework\ObjectManager;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
-use PHPUnit\Framework\TestResult;
 
 class UpdateCustomerAddressTest extends GraphQlAbstract
 {
     /**
-     * Verify customers with valid credentials update address
-     *
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+        $this->addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
+    }
+
+    /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testUpdateCustomerAddressWithValidCredentials()
+    public function testUpdateCustomerAddress()
     {
         $userName = 'customer@example.com';
         $password = 'password';
+        $customerId = 1;
+        $addressId = 1;
+
         $updateAddress = [
             'region' => [
                 'region' => 'Alaska',
-                'region_id' => 4,
+                'region_id' => 2,
                 'region_code' => 'AK'
             ],
-            'region_id' => 4,
             'country_id' => 'US',
             'street' => ['Line 1 Street', 'Line 2'],
             'company' => 'Company Name',
@@ -52,14 +76,7 @@ public function testUpdateCustomerAddressWithValidCredentials()
         ];
         $defaultShippingText = $updateAddress['default_shipping'] ? "true": "false";
         $defaultBillingText = $updateAddress['default_billing'] ? "true": "false";
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = current($addresses);
-        $addressId = $address->getId();
+
         $mutation
             = <<<MUTATION
 mutation {
@@ -69,7 +86,6 @@ public function testUpdateCustomerAddressWithValidCredentials()
         region_id: {$updateAddress['region']['region_id']}
         region_code: "{$updateAddress['region']['region_code']}"
     }
-    region_id: {$updateAddress['region_id']}
     country_id: {$updateAddress['country_id']}
     street: ["{$updateAddress['street'][0]}","{$updateAddress['street'][1]}"]
     company: "{$updateAddress['company']}"
@@ -93,7 +109,6 @@ public function testUpdateCustomerAddressWithValidCredentials()
       region_id
       region_code
     }
-    region_id
     country_id
     street
     company
@@ -112,60 +127,37 @@ public function testUpdateCustomerAddressWithValidCredentials()
   }
 }
 MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        $response = $this->graphQlQuery($mutation, [], '', $headerMap);
+
+        $response = $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
         $this->assertArrayHasKey('updateCustomerAddress', $response);
         $this->assertArrayHasKey('customer_id', $response['updateCustomerAddress']);
-        $this->assertEquals($customer->getId(), $response['updateCustomerAddress']['customer_id']);
+        $this->assertEquals($customerId, $response['updateCustomerAddress']['customer_id']);
         $this->assertArrayHasKey('id', $response['updateCustomerAddress']);
-        /** @var AddressRepositoryInterface $addressRepository */
-        $addressRepository = ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
-        $address = $addressRepository->getById($addressId);
+
+        $address = $this->addressRepository->getById($addressId);
         $this->assertEquals($address->getId(), $response['updateCustomerAddress']['id']);
         $this->assertCustomerAddressesFields($address, $response['updateCustomerAddress']);
         $this->assertCustomerAddressesFields($address, $updateAddress);
     }
 
     /**
-     * Verify customers without credentials update address
-     *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized.
      */
-    public function testUpdateCustomerAddressWithoutCredentials()
+    public function testUpdateCustomerAddressIfUserIsNotAuthorized()
     {
-        $userName = 'customer@example.com';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = current($addresses);
-        $addressId = $address->getId();
+        $addressId = 1;
         $mutation
             = <<<MUTATION
 mutation {
   updateCustomerAddress(id:{$addressId}, input: {
-  	city: "New City"
+    city: "New City"
     postcode: "5555"
   }) {
     id
-    customer_id
-    postcode
   }
 }
 MUTATION;
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Current customer does not have access to the resource "customer_address"');
         $this->graphQlQuery($mutation);
     }
 
@@ -175,20 +167,15 @@ public function testUpdateCustomerAddressWithoutCredentials()
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_address.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @expectedException \Exception
+     * @expectedExceptionMessage Required parameters are missing: firstname
      */
-    public function testUpdateCustomerAddressWithMissingAttributeWithValidCredentials()
+    public function testUpdateCustomerAddressWithMissingAttribute()
     {
         $userName = 'customer@example.com';
         $password = 'password';
-        /** @var CustomerRepositoryInterface $customerRepository */
-        $customerRepository = ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get($userName);
-        /** @var \Magento\Customer\Api\Data\AddressInterface[] $addresses */
-        $addresses = $customer->getAddresses();
-        /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-        $address = current($addresses);
-        $addressId = $address->getId();
+        $addressId = 1;
+
         $mutation
             = <<<MUTATION
 mutation {
@@ -197,52 +184,22 @@ public function testUpdateCustomerAddressWithMissingAttributeWithValidCredential
     lastname: "Phillis"
   }) {
     id
-    customer_id
-    region {
-      region
-      region_id
-      region_code
-    }
-    region_id
-    country_id
-    street
-    company
-    telephone
-    fax
-    postcode
-    city
-    firstname
-    lastname
-    middlename
-    prefix
-    suffix
-    vat_id
-    default_shipping
-    default_billing
   }
 }
 MUTATION;
-        /** @var CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
-        $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('GraphQL response contains errors:' . ' ' .
-            'Required parameter firstname is missing');
-        $this->graphQlQuery($mutation, [], '', $headerMap);
+        $this->graphQlQuery($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
     /**
      * Verify the fields for Customer address
      *
-     * @param \Magento\Customer\Api\Data\AddressInterface $address
+     * @param AddressInterface $address
      * @param array $actualResponse
      */
-    private function assertCustomerAddressesFields($address, $actualResponse)
+    private function assertCustomerAddressesFields(AddressInterface $address, $actualResponse): void
     {
         /** @var  $addresses */
         $assertionMap = [
-            ['response_field' => 'region_id', 'expected_value' => $address->getRegionId()],
             ['response_field' => 'country_id', 'expected_value' => $address->getCountryId()],
             ['response_field' => 'street', 'expected_value' => $address->getStreet()],
             ['response_field' => 'company', 'expected_value' => $address->getCompany()],
@@ -261,11 +218,23 @@ private function assertCustomerAddressesFields($address, $actualResponse)
         ];
         $this->assertResponseFields($actualResponse, $assertionMap);
         $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
-        $assertionRegionMap = [
-            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
-            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
-            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
-        ];
-        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
+        // https://github.com/magento/graphql-ce/issues/270
+//        $assertionRegionMap = [
+//            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
+//            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
+//            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
+//        ];
+//        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/AccountInformationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
similarity index 73%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/AccountInformationTest.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
index 942e321a78718..c11c1385f7412 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/AccountInformationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
@@ -7,26 +7,19 @@
 
 namespace Magento\GraphQl\Customer;
 
-use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\CustomerAuthUpdate;
 use Magento\Customer\Model\CustomerRegistry;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
-class AccountInformationTest extends GraphQlAbstract
+class UpdateCustomerTest extends GraphQlAbstract
 {
     /**
      * @var CustomerTokenServiceInterface
      */
     private $customerTokenService;
 
-    /**
-     * @var AccountManagementInterface
-     */
-    private $accountManagement;
-
     /**
      * @var CustomerRegistry
      */
@@ -37,92 +30,19 @@ class AccountInformationTest extends GraphQlAbstract
      */
     private $customerAuthUpdate;
 
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
-
     protected function setUp()
     {
         parent::setUp();
 
         $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-        $this->accountManagement = Bootstrap::getObjectManager()->get(AccountManagementInterface::class);
         $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
         $this->customerAuthUpdate = Bootstrap::getObjectManager()->get(CustomerAuthUpdate::class);
-        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     */
-    public function testGetAccountInformation()
-    {
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-
-        $query = <<<QUERY
-query {
-    customer {
-        firstname
-        lastname
-        email
-    }
-}
-QUERY;
-        $response = $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
-
-        $this->assertEquals('John', $response['customer']['firstname']);
-        $this->assertEquals('Smith', $response['customer']['lastname']);
-        $this->assertEquals($currentEmail, $response['customer']['email']);
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage The current customer isn't authorized.
-     */
-    public function testGetAccountInformationIfUserIsNotAuthorized()
-    {
-        $query = <<<QUERY
-query {
-    customer {
-        firstname
-        lastname
-        email
-    }
-}
-QUERY;
-        $this->graphQlQuery($query);
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @expectedException \Exception
-     * @expectedExceptionMessage The account is locked.
-     */
-    public function testGetAccountInformationIfCustomerIsLocked()
-    {
-        $this->lockCustomer(1);
-
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-
-        $query = <<<QUERY
-query {
-    customer {
-        firstname
-        lastname
-        email
-    }
-}
-QUERY;
-        $this->graphQlQuery($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
     }
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      */
-    public function testUpdateAccountInformation()
+    public function testUpdateCustomer()
     {
         $currentEmail = 'customer@example.com';
         $currentPassword = 'password';
@@ -161,7 +81,7 @@ public function testUpdateAccountInformation()
      * @expectedException \Exception
      * @expectedExceptionMessage "input" value should be specified
      */
-    public function testUpdateAccountInformationIfInputDataIsEmpty()
+    public function testUpdateCustomerIfInputDataIsEmpty()
     {
         $currentEmail = 'customer@example.com';
         $currentPassword = 'password';
@@ -186,7 +106,7 @@ public function testUpdateAccountInformationIfInputDataIsEmpty()
      * @expectedException \Exception
      * @expectedExceptionMessage The current customer isn't authorized.
      */
-    public function testUpdateAccountInformationIfUserIsNotAuthorized()
+    public function testUpdateCustomerIfUserIsNotAuthorized()
     {
         $newFirstname = 'Richard';
 
@@ -211,7 +131,7 @@ public function testUpdateAccountInformationIfUserIsNotAuthorized()
      * @expectedException \Exception
      * @expectedExceptionMessage The account is locked.
      */
-    public function testUpdateAccountInformationIfCustomerIsLocked()
+    public function testUpdateCustomerIfAccountIsLocked()
     {
         $this->lockCustomer(1);
 

From 2894aaa1cafa9ba2729e8094ae50109dcfed71d7 Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Mon, 10 Dec 2018 21:06:48 +0200
Subject: [PATCH 249/932] GraphQL-57: Manage Address Book

-- Refactoring
---
 .../customer_two_addresses_rollback.php       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php
new file mode 100644
index 0000000000000..414d31ac9d0ac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_two_addresses_rollback.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var AddressRepositoryInterface $addressRepository */
+$addressRepository = Bootstrap::getObjectManager()->get(AddressRepositoryInterface::class);
+
+foreach ([1, 2] as $addressId) {
+    try {
+        $addressRepository->deleteById($addressId);
+    } catch (NoSuchEntityException $e) {
+        /**
+         * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+         */
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 89584157cac040738fab386e51e54ebd81286954 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <Veronika_Kurochkina@epam.com>
Date: Tue, 11 Dec 2018 11:07:17 +0300
Subject: [PATCH 250/932] MAGETWO-95820: Order placed by new customer before
 they registered is displayed in the admin under the name Guest

- Update automated test
---
 .../Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
index 79936776ab0ac..693c05684f292 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -25,12 +25,10 @@
             <createData entity="_defaultProduct" stepKey="product">
                 <requiredEntity createDataKey="category"/>
             </createData>
-            <createData entity="EnableAllowGuestCheckout" stepKey="enableGuestCheckout"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
 
         <after>
-            <createData entity="DisableAllowGuestCheckout" stepKey="disableGuestCheckout"/>
             <deleteData createDataKey="product" stepKey="deleteProduct" />
             <deleteData createDataKey="category" stepKey="deleteCategory" />
             <actionGroup ref="logout" stepKey="logoutFromAdmin"/>

From 45bdc4a8be79524e30633291a0cc411f5596b752 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Tue, 11 Dec 2018 12:23:14 +0300
Subject: [PATCH 251/932] MAGETWO-58841: API call with pageSize and currentPage
 > items should return error

- Add exception for api calls with non-existed current page.
---
 .../Model/Resolver/Products.php               | 28 +++++-
 .../ResourceModel/AddressRepositoryTest.php   | 57 ++++++++++-
 .../Magento/Framework/Data/Collection.php     |  9 ++
 .../Data/Test/Unit/CollectionTest.php         | 95 ++++++++++++++++++-
 4 files changed, 182 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
index ff53299b00e33..e910a5c8be4cd 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
@@ -7,7 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
-use Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Filter;
 use Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search;
@@ -17,6 +17,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\SearchFilter;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
 
 /**
  * Products field resolver, used for GraphQL request processing.
@@ -81,10 +82,10 @@ public function resolve(
         } elseif (isset($args['search'])) {
             $layerType = Resolver::CATALOG_LAYER_SEARCH;
             $this->searchFilter->add($args['search'], $searchCriteria);
-            $searchResult = $this->searchQuery->getResult($searchCriteria, $info);
+            $searchResult = $this->getSearchResult($this->searchQuery, $searchCriteria, $info);
         } else {
             $layerType = Resolver::CATALOG_LAYER_CATEGORY;
-            $searchResult = $this->filterQuery->getResult($searchCriteria, $info);
+            $searchResult = $this->getSearchResult($this->filterQuery, $searchCriteria, $info);
         }
         //possible division by 0
         if ($searchCriteria->getPageSize()) {
@@ -116,4 +117,25 @@ public function resolve(
 
         return $data;
     }
+
+    /**
+     * Get search result.
+     *
+     * @param Filter|Search $query
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param ResolveInfo $info
+     *
+     * @return \Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult
+     * @throws GraphQlInputException
+     */
+    private function getSearchResult($query, SearchCriteriaInterface $searchCriteria, ResolveInfo $info)
+    {
+        try {
+            $searchResult = $query->getResult($searchCriteria, $info);
+        } catch (InputException $e) {
+            throw new GraphQlInputException(__($e->getMessage()));
+        }
+
+        return $searchResult;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
index 4177698389850..381c580f55e60 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ResourceModel/AddressRepositoryTest.php
@@ -17,6 +17,8 @@
 use Magento\Store\Api\WebsiteRepositoryInterface;
 
 /**
+ * Class with integration tests for AddressRepository.
+ *
  * @SuppressWarnings(PHPMD.TooManyMethods)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -38,6 +40,9 @@ class AddressRepositoryTest extends \PHPUnit\Framework\TestCase
     /** @var  \Magento\Framework\Api\DataObjectHelper */
     private $dataObjectHelper;
 
+    /**
+     * Set up.
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -86,6 +91,9 @@ protected function setUp()
         $this->expectedAddresses = [$address, $address2];
     }
 
+    /**
+     * Tear down.
+     */
     protected function tearDown()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -95,6 +103,8 @@ protected function tearDown()
     }
 
     /**
+     * Test for save address changes.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
@@ -116,6 +126,8 @@ public function testSaveAddressChanges()
     }
 
     /**
+     * Test for method save address with new id.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
@@ -130,6 +142,8 @@ public function testSaveAddressesIdSetButNotAlreadyExisting()
     }
 
     /**
+     * Test for method get address by id.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
@@ -143,6 +157,8 @@ public function testGetAddressById()
     }
 
     /**
+     * Test for method get address by id with incorrect id.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
      * @expectedExceptionMessage No such entity with addressId = 12345
@@ -153,6 +169,8 @@ public function testGetAddressByIdBadAddressId()
     }
 
     /**
+     * Test for method save new address.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoAppIsolation enabled
@@ -179,6 +197,8 @@ public function testSaveNewAddress()
     }
 
     /**
+     * Test for method saaveNewAddress with new attributes.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoAppIsolation enabled
@@ -204,6 +224,8 @@ public function testSaveNewAddressWithAttributes()
     }
 
     /**
+     * Test for saving address with invalid address.
+     *
      * @magentoDataFixture  Magento/Customer/_files/customer.php
      * @magentoDataFixture  Magento/Customer/_files/customer_address.php
      * @magentoAppIsolation enabled
@@ -227,6 +249,11 @@ public function testSaveNewInvalidAddress()
         }
     }
 
+    /**
+     * Test for saving address without existing customer.
+     *
+     * @return void
+     */
     public function testSaveAddressesCustomerIdNotExist()
     {
         $proposedAddress = $this->_createSecondAddress()->setCustomerId(4200);
@@ -238,6 +265,11 @@ public function testSaveAddressesCustomerIdNotExist()
         }
     }
 
+    /**
+     * Test for saving addresses with invalid customer id.
+     *
+     * @return void
+     */
     public function testSaveAddressesCustomerIdInvalid()
     {
         $proposedAddress = $this->_createSecondAddress()->setCustomerId('this_is_not_a_valid_id');
@@ -250,6 +282,8 @@ public function testSaveAddressesCustomerIdInvalid()
     }
 
     /**
+     * Test for delete method.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      */
@@ -273,6 +307,8 @@ public function testDeleteAddress()
     }
 
     /**
+     * Test for deleteAddressById.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
      */
@@ -296,6 +332,8 @@ public function testDeleteAddressById()
     }
 
     /**
+     * Test delete address from customer with incorrect address id.
+     *
      * @magentoDataFixture Magento/Customer/_files/customer.php
      */
     public function testDeleteAddressFromCustomerBadAddressId()
@@ -309,10 +347,13 @@ public function testDeleteAddressFromCustomerBadAddressId()
     }
 
     /**
+     * Test for searching addressed.
+     *
      * @param \Magento\Framework\Api\Filter[] $filters
      * @param \Magento\Framework\Api\Filter[] $filterGroup
      * @param \Magento\Framework\Api\SortOrder[] $filterOrders
      * @param array $expectedResult array of expected results indexed by ID
+     * @param int $currentPage current page for search criteria
      *
      * @dataProvider searchAddressDataProvider
      *
@@ -320,7 +361,7 @@ public function testDeleteAddressFromCustomerBadAddressId()
      * @magentoDataFixture  Magento/Customer/_files/customer_two_addresses.php
      * @magentoAppIsolation enabled
      */
-    public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expectedResult)
+    public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expectedResult, $currentPage)
     {
         /** @var \Magento\Framework\Api\SearchCriteriaBuilder $searchBuilder */
         $searchBuilder = $this->objectManager->create(\Magento\Framework\Api\SearchCriteriaBuilder::class);
@@ -337,7 +378,7 @@ public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expe
         }
 
         $searchBuilder->setPageSize(1);
-        $searchBuilder->setCurrentPage(2);
+        $searchBuilder->setCurrentPage($currentPage);
 
         $searchCriteria = $searchBuilder->create();
         $searchResults = $this->repository->getList($searchCriteria);
@@ -355,6 +396,11 @@ public function testSearchAddresses($filters, $filterGroup, $filterOrders, $expe
         $this->assertEquals($expectedResult[$expectedResultIndex]['firstname'], $items[0]->getFirstname());
     }
 
+    /**
+     * Data provider for searchAddresses.
+     *
+     * @return array
+     */
     public function searchAddressDataProvider()
     {
         /**
@@ -375,6 +421,7 @@ public function searchAddressDataProvider()
                 [
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                 ],
+                1
             ],
             'Address with city CityM' => [
                 [$filterBuilder->setField('city')->setValue('CityM')->create()],
@@ -383,6 +430,7 @@ public function searchAddressDataProvider()
                 [
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                 ],
+                1
             ],
             'Addresses with firstname John sorted by firstname desc, city asc' => [
                 [$filterBuilder->setField('firstname')->setValue('John')->create()],
@@ -395,6 +443,7 @@ public function searchAddressDataProvider()
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                     ['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
                 ],
+                2
             ],
             'Addresses with postcode of either 75477 or 47676 sorted by city desc' => [
                 [],
@@ -409,6 +458,7 @@ public function searchAddressDataProvider()
                     ['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                 ],
+                2
             ],
             'Addresses with postcode greater than 0 sorted by firstname asc, postcode desc' => [
                 [$filterBuilder->setField('postcode')->setValue('0')->setConditionType('gt')->create()],
@@ -421,11 +471,14 @@ public function searchAddressDataProvider()
                     ['id' => 2, 'city' => 'CityX', 'postcode' => 47676, 'firstname' => 'John'],
                     ['id' => 1, 'city' => 'CityM', 'postcode' => 75477, 'firstname' => 'John'],
                 ],
+                2
             ],
         ];
     }
 
     /**
+     * Test for save addresses with restricted countries.
+     *
      * @magentoDataFixture Magento/Customer/Fixtures/customer_sec_website.php
      */
     public function testSaveAddressWithRestrictedCountries()
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index 9c789e81913c4..dbafc9734e091 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Data\Collection\EntityFactoryInterface;
 use Magento\Framework\Option\ArrayInterface;
+use Magento\Framework\Exception\InputException;
 
 /**
  * Data collection
@@ -234,12 +235,20 @@ protected function _setIsLoaded($flag = true)
      * Get current collection page
      *
      * @param  int $displacement
+     * @throws \Magento\Framework\Exception\InputException
      * @return int
      */
     public function getCurPage($displacement = 0)
     {
         if ($this->_curPage + $displacement < 1) {
             return 1;
+        } elseif ($this->_curPage > $this->getLastPageNumber() && $displacement === 0) {
+            throw new InputException(
+                __(
+                    'currentPage value %1 specified is greater than the %2 page(s) available.',
+                    [$this->_curPage, $this->getLastPageNumber()]
+                )
+            );
         } elseif ($this->_curPage + $displacement > $this->getLastPageNumber()) {
             return $this->getLastPageNumber();
         } else {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
index 5608959c110ff..80c256d8553ef 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Data\Test\Unit;
 
+/**
+ * Class for Collection test.
+ */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -12,6 +15,9 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * Set up.
+     */
     protected function setUp()
     {
         $this->_model = new \Magento\Framework\Data\Collection(
@@ -19,6 +25,11 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test for method removeAllItems.
+     *
+     * @return void
+     */
     public function testRemoveAllItems()
     {
         $this->_model->addItem(new \Magento\Framework\DataObject());
@@ -30,6 +41,7 @@ public function testRemoveAllItems()
 
     /**
      * Test loadWithFilter()
+     *
      * @return void
      */
     public function testLoadWithFilter()
@@ -42,6 +54,8 @@ public function testLoadWithFilter()
     }
 
     /**
+     * Test for method etItemObjectClass
+     *
      * @dataProvider setItemObjectClassDataProvider
      */
     public function testSetItemObjectClass($class)
@@ -51,6 +65,8 @@ public function testSetItemObjectClass($class)
     }
 
     /**
+     * Data provider.
+     *
      * @return array
      */
     public function setItemObjectClassDataProvider()
@@ -59,6 +75,8 @@ public function setItemObjectClassDataProvider()
     }
 
     /**
+     * Test for method setItemObjectClass with exception.
+     *
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Incorrect_ClassName does not extend \Magento\Framework\DataObject
      */
@@ -67,12 +85,22 @@ public function testSetItemObjectClassException()
         $this->_model->setItemObjectClass('Incorrect_ClassName');
     }
 
+    /**
+     * Test for method addFilter.
+     *
+     * @return void
+     */
     public function testAddFilter()
     {
         $this->_model->addFilter('field1', 'value');
         $this->assertEquals('field1', $this->_model->getFilter('field1')->getData('field'));
     }
 
+    /**
+     * Test for method getFilters.
+     *
+     * @return void
+     */
     public function testGetFilters()
     {
         $this->_model->addFilter('field1', 'value');
@@ -81,12 +109,22 @@ public function testGetFilters()
         $this->assertEquals('field2', $this->_model->getFilter(['field1', 'field2'])[1]->getData('field'));
     }
 
+    /**
+     * Test for method get non existion filters.
+     *
+     * @return void
+     */
     public function testGetNonExistingFilters()
     {
         $this->assertEmpty($this->_model->getFilter([]));
         $this->assertEmpty($this->_model->getFilter('non_existing_filter'));
     }
 
+    /**
+     * Test for lag.
+     *
+     * @return void
+     */
     public function testFlag()
     {
         $this->_model->setFlag('flag_name', 'flag_value');
@@ -95,12 +133,35 @@ public function testFlag()
         $this->assertNull($this->_model->getFlag('non_existing_flag'));
     }
 
+    /**
+     * Test for method getCurPage.
+     *
+     * @return void
+     */
     public function testGetCurPage()
     {
-        $this->_model->setCurPage(10);
+        $this->_model->setCurPage(1);
         $this->assertEquals(1, $this->_model->getCurPage());
     }
 
+    /**
+     * Test for getCurPage with exception.
+     *
+     * @expectedException \Magento\Framework\Exception\StateException
+     * @return void
+     */
+    public function testGetCurPageWithException()
+    {
+        $this->_model->setCurPage(10);
+        $this->expectException(\Magento\Framework\Exception\InputException::class);
+        $this->_model->getCurPage();
+    }
+
+    /**
+     * Test for method possibleFlowWithItem.
+     *
+     * @return void
+     */
     public function testPossibleFlowWithItem()
     {
         $firstItemMock = $this->createPartialMock(
@@ -168,6 +229,11 @@ public function testPossibleFlowWithItem()
         $this->assertEquals([], $this->_model->getItems());
     }
 
+    /**
+     * Test for method eachCallsMethodOnEachItemWithNoArgs.
+     *
+     * @return void
+     */
     public function testEachCallsMethodOnEachItemWithNoArgs()
     {
         for ($i = 0; $i < 3; $i++) {
@@ -177,7 +243,12 @@ public function testEachCallsMethodOnEachItemWithNoArgs()
         }
         $this->_model->each('testCallback');
     }
-    
+
+    /**
+     * Test for method eachCallsMethodOnEachItemWithArgs.
+     *
+     * @return void
+     */
     public function testEachCallsMethodOnEachItemWithArgs()
     {
         for ($i = 0; $i < 3; $i++) {
@@ -188,6 +259,11 @@ public function testEachCallsMethodOnEachItemWithArgs()
         $this->_model->each('testCallback', ['a', 'b', 'c']);
     }
 
+    /**
+     * Test for method callsClosureWithEachItemAndNoArgs.
+     *
+     * @return void
+     */
     public function testCallsClosureWithEachItemAndNoArgs()
     {
         for ($i = 0; $i < 3; $i++) {
@@ -200,6 +276,11 @@ public function testCallsClosureWithEachItemAndNoArgs()
         });
     }
 
+    /**
+     * Test for method callsClosureWithEachItemAndArgs.
+     *
+     * @return void
+     */
     public function testCallsClosureWithEachItemAndArgs()
     {
         for ($i = 0; $i < 3; $i++) {
@@ -212,6 +293,11 @@ public function testCallsClosureWithEachItemAndArgs()
         }, ['a', 'b', 'c']);
     }
 
+    /**
+     * Test for method callsCallableArrayWithEachItemNoArgs.
+     *
+     * @return void
+     */
     public function testCallsCallableArrayWithEachItemNoArgs()
     {
         $mockCallbackObject = $this->getMockBuilder('DummyEachCallbackInstance')
@@ -230,6 +316,11 @@ public function testCallsCallableArrayWithEachItemNoArgs()
         $this->_model->each([$mockCallbackObject, 'testObjCallback']);
     }
 
+    /**
+     * Test for method callsCallableArrayWithEachItemAndArgs.
+     *
+     * @return void
+     */
     public function testCallsCallableArrayWithEachItemAndArgs()
     {
         $mockCallbackObject = $this->getMockBuilder('DummyEachCallbackInstance')

From f50d5ceae5f98e09d1f7a161fda54bd171b95f77 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Tue, 11 Dec 2018 15:50:12 +0400
Subject: [PATCH 252/932] MAGETWO-96406: [2.3.x] Swatch Attribute is not
 displayed in the Widget CMS

- Added automation test
---
 .../AdminProductAttributeActionGroup.xml      | 16 ++++
 .../CreateNewPageWithWidgetActionGroup.xml    | 40 +++++++++
 .../Cms/Test/Mftf/Data/NewCMSPageData.xml     | 14 +++
 .../Section/CmsNewPagePageActionsSection.xml  |  1 +
 .../Section/AdminNewAttributePanelSection.xml |  7 ++
 .../AddSwatchToProductActionGroup.xml         | 18 ++++
 .../StorefrontProductInfoMainSection.xml      |  1 +
 ...SwatchAttributesDisplayInWidgetCMSTest.xml | 85 +++++++++++++++++++
 8 files changed, 182 insertions(+)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml
 create mode 100644 app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index 80cadbb6571f2..8f8a86ac5adf1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -47,4 +47,20 @@
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
                     stepKey="waitForSuccessMessage"/>
     </actionGroup>
+    <actionGroup name="deleteProductAttributeByLabel">
+        <arguments>
+            <argument name="ProductAttribute"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}"
+                   userInput="{{ProductAttribute.default_label}}" stepKey="setAttributeCode"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="ClickOnDeleteButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
+                    stepKey="waitForSuccessMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
new file mode 100644
index 0000000000000..a4b88c544de88
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CreateNewPageWithWidget">
+        <arguments>
+            <argument name="pageTitle" type="string" defaultValue="{{defaultCmsPage.title}}"/>
+            <argument name="category" type="string"/>
+            <argument name="condition" type="string"/>
+            <argument name="widgetType" type="string"/>
+        </arguments>
+        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnCMSNewPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{pageTitle}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+        <click selector="{{CmsNewPagePageActionsSection.insertWidget}}" stepKey="clickToInsertWidget"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <waitForElementVisible stepKey="waitForInsertWidgetTitle" selector="{{WidgetSection.InsertWidgetTitle}}"/>
+        <selectOption selector="{{WidgetSection.WidgetType}}" userInput="{{widgetType}}" stepKey="selectCatalogProductsList"/>
+        <waitForElementVisible selector="{{WidgetSection.AddParam}}" stepKey="waitForAddParam"/>
+        <scrollTo selector="{{WidgetSection.AddParam}}" stepKey="scrollToAddParamElement"/>
+        <click selector="{{WidgetSection.AddParam}}" stepKey="addParam"/>
+        <selectOption selector="{{WidgetSection.ConditionsDropdown}}" userInput="{{condition}}" stepKey="selectCategory"/>
+        <waitForElementVisible selector="{{WidgetSection.RuleParam}}" stepKey="waitForRuleParam"/>
+        <click selector="{{WidgetSection.RuleParam}}" stepKey="clickToAddRuleParam"/>
+        <click selector="{{WidgetSection.Chooser}}" stepKey="clickToSelectFromList"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <click selector="{{WidgetSection.PreCreateCategory(category)}}" stepKey="selectPreCategory" />
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickToSaveInsertedWidget"/>
+        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="saveCMSPage"/>
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="waitForSuccessMessageLoggedOut" time="5"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml
new file mode 100644
index 0000000000000..61dfb051d101e
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Data/NewCMSPageData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="defaultCmsPage" type="block">
+        <data key="title" unique="suffix">CMSpage</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
index 42f8f4d00ee9f..a340d0af1e7a1 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewPagePageActionsSection.xml
@@ -22,5 +22,6 @@
         <element name="content" type="input" selector="//textarea[@name='content']"/>
         <element name="spinner" type="input" selector='//div[@data-component="cms_page_form.cms_page_form"]' />
         <element name="saveAndClose" type="button" selector="#save_and_close" timeout="10"/>
+        <element name="insertWidget" type="button" selector="//span[contains(text(),'Insert Widget...')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
index 44077888f8bc0..9310091ee13f2 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
@@ -9,6 +9,13 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminNewAttributePanel">
+        <element name="useInSearch" type="select" selector="#is_searchable"/>
+        <element name="visibleInAdvancedSearch" type="select" selector="#is_visible_in_advanced_search"/>
+        <element name="comparableOnStorefront" type="select" selector="#is_comparable"/>
+        <element name="useInLayeredNavigation" type="select" selector="#is_filterable"/>
+        <element name="visibleOnCatalogPagesOnStorefront" type="select" selector="#is_visible_on_front"/>
+        <element name="useInProductListing" type="select" selector="#used_in_product_listing"/>
+        <element name="usedForStoringInProductListing" type="select" selector="#used_for_sort_by"/>
         <element name="container" type="text" selector="#create_new_attribute"/>
         <element name="saveAttribute" type="button" selector="#save"/>
         <element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
index 60a8035dedeca..a4fbc028e54a6 100644
--- a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
@@ -62,4 +62,22 @@
         <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
     </actionGroup>
 
+    <actionGroup name="AddVisualSwatchToProductWithStorefrontConfigActionGroup" extends="AddVisualSwatchToProductActionGroup">
+        <arguments>
+            <argument name="attribute" defaultValue="visualSwatchAttribute"/>
+            <argument name="option1" defaultValue="visualSwatchOption1"/>
+            <argument name="option2" defaultValue="visualSwatchOption2"/>
+        </arguments>
+
+        <!-- Go to Storefront Properties tab -->
+        <scrollToTopOfPage stepKey="scrollToTop" after="fillDefaultStoreLabel2"/>
+        <click selector="#front_fieldset-wrapper" stepKey="goToStorefrontPropertiesTab" after="scrollToTop"/>
+        <waitForElementVisible selector="//span[text()='Storefront Properties']" stepKey="waitTabLoad" after="goToStorefrontPropertiesTab"/>
+        <selectOption selector="{{AdminNewAttributePanel.useInSearch}}" stepKey="switchOnUsInSearch" userInput="Yes" after="waitTabLoad"/>
+        <selectOption selector="{{AdminNewAttributePanel.visibleInAdvancedSearch}}" stepKey="switchOnVisibleInAdvancedSearch" userInput="Yes" after="switchOnUsInSearch"/>
+        <selectOption selector="{{AdminNewAttributePanel.comparableOnStorefront}}" stepKey="switchOnComparableOnStorefront" userInput="Yes" after="switchOnVisibleInAdvancedSearch"/>
+        <selectOption selector="{{AdminNewAttributePanel.useInLayeredNavigation}}" stepKey="selectUseInLayer" userInput="Filterable (with results)" after="switchOnComparableOnStorefront"/>
+        <selectOption selector="{{AdminNewAttributePanel.visibleOnCatalogPagesOnStorefront}}" stepKey="switchOnVisibleOnCatalogPagesOnStorefront" userInput="Yes" after="selectUseInLayer"/>
+        <selectOption selector="{{AdminNewAttributePanel.useInProductListing}}" stepKey="switchOnUsedInProductListing" userInput="Yes" after="switchOnVisibleOnCatalogPagesOnStorefront"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 415ae88fceb52..e40a04080285a 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -14,5 +14,6 @@
         <element name="selectedSwatchValue" type="text" selector="//div[contains(@class, 'swatch-attribute') and contains(., '{{attr}}')]//span[contains(@class, 'swatch-attribute-selected-option')]" parameterized="true"/>
         <element name="swatchAttributeOptions" type="text" selector="div.swatch-attribute-options"/>
         <element name="nthSwatchOptionText" type="button" selector="div.swatch-option.text:nth-of-type({{n}})" parameterized="true"/>
+        <element name="productSwatch" type="button" selector="//div[@class='swatch-option'][@aria-label='{{var1}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
new file mode 100644
index 0000000000000..bcd4cac70118b
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
@@ -0,0 +1,85 @@
+<?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="StorefrontSwatchAttributesDisplayInWidgetCMSTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <title value="Swatch Attribute is not displayed in the Widget CMS"/>
+            <description value="Swatch Attribute is not displayed in the Widget CMS"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96469"/>
+            <useCaseId value="MAGETWO-96406"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="NewRootCategory" stepKey="createRootCategory"/>
+        </before>
+
+        <after>
+            <!--delete created configurable product-->
+            <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
+                <argument name="product" value="BaseConfigurableProduct"/>
+            </actionGroup>
+            <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteAttribute">
+                <argument name="ProductAttribute" value="visualSwatchAttribute"/>
+            </actionGroup>
+            <!--delete root category-->
+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPageAfterCLIReindexCommand"/>
+            <waitForPageLoad time="30" stepKey="waitForPageCategoryLoadAfterCLIReindexCommand"/>
+            <click selector="{{AdminCategorySidebarTreeSection.categoryInTree('$$createRootCategory.name$$')}}" stepKey="clickOnDefaultRootCategory"/>
+            <waitForPageLoad stepKey="waitForPageDefaultCategoryEditLoad" />
+            <seeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="assertDeleteButtonIsPresent1"/>
+            <click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="DeleteDefaultRootCategory"/>
+            <waitForElementVisible selector="{{AdminCategoryModalSection.ok}}" stepKey="waitForModalDeleteDefaultRootCategory" />
+            <click selector="{{AdminCategoryModalSection.ok}}" stepKey="acceptModal1"/>
+            <waitForElementVisible selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="waitForPageReloadAfterDeleteDefaultCategory"/>
+            <!--logout-->
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <!--Login-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginToAdmin"/>
+         <!--Create a configurable swatch product via the UI -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <actionGroup ref="fillMainProductForm" stepKey="fillProductForm">
+            <argument name="product" value="BaseConfigurableProduct"/>
+        </actionGroup>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createRootCategory.name$$]" stepKey="searchAndSelectCategory"/>
+        <!--Add swatch attribute to configurable product-->
+        <actionGroup ref="AddVisualSwatchToProductWithStorefrontConfigActionGroup" stepKey="addSwatchToProduct"/>
+
+        <!--Create CMS page-->
+        <actionGroup ref="CreateNewPageWithWidget" stepKey="createCMSPageWithWidget">
+            <argument name="category" value="$$createRootCategory.name$$"/>
+            <argument name="condition" value="Category"/>
+            <argument name="widgetType" value="Catalog Products List"/>
+        </actionGroup>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickToExpandSEOSection"/>
+        <scrollTo selector="{{CmsNewPagePageSeoSection.urlKey}}" stepKey="scrollToUrlKey"/>
+        <grabValueFrom selector="{{CmsNewPagePageSeoSection.urlKey}}"  stepKey="grabTextFromUrlKey"/>
+        <actionGroup ref="logout" stepKey="logout"/>
+
+        <!--Open Storefront page for the new created page-->
+        <amOnPage url="{{StorefrontHomePage.url}}$grabTextFromUrlKey" stepKey="gotToCreatedCmsPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productSwatch(visualSwatchOption1.default_label)}}" stepKey="assertAddedWidgetS"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productSwatch(visualSwatchOption2.default_label)}}" stepKey="assertAddedWidgetM"/>
+
+        <!--Login to delete CMS page-->
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        <actionGroup ref="DeletePageByUrlKeyActionGroup" stepKey="deletePage">
+            <argument name="UrlKey" value="$grabTextFromUrlKey"/>
+        </actionGroup>
+    </test>
+</tests>

From 6ad2344e4929d9e46db8dd2bc8fbc28d5887c6d3 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 11 Dec 2018 14:59:07 +0200
Subject: [PATCH 253/932] Fix static test.

---
 .../Magento/Reports/Model/ResourceModel/Order/Collection.php   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 06b71ee0490bb..fd9adbe734101 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Reports\Model\ResourceModel\Order;
 
 use Magento\Framework\DB\Select;
@@ -81,7 +80,7 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Sales\Model\ResourceModel\Report\OrderFactory $reportOrderFactory
-     * @param null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)

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 254/932] 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 b41627b2571efd75efae525627b9790277285dac Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Tue, 11 Dec 2018 16:37:37 +0200
Subject: [PATCH 255/932] GraphQL-57: Manage Address Book

---
 .../Model/Resolver/CreateCustomerAddress.php  | 11 +++++-
 .../Customer/CreateCustomerAddressTest.php    |  4 +--
 .../_files/customer_without_addresses.php     | 31 +++++++++++++++++
 .../customer_without_addresses_rollback.php   | 34 +++++++++++++++++++
 4 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
index fbdf6d141eeb0..823444e5a2d7d 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
@@ -14,6 +14,8 @@
 use Magento\CustomerGraphQl\Model\Customer\Address\CustomerAddressDataProvider;
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -103,6 +105,7 @@ public function resolve(
      * @param int $customerId
      * @param array $addressData
      * @return AddressInterface
+     * @throws GraphQlInputException
      */
     private function createCustomerAddress(int $customerId, array $addressData) : AddressInterface
     {
@@ -110,6 +113,12 @@ private function createCustomerAddress(int $customerId, array $addressData) : Ad
         $address = $this->addressInterfaceFactory->create();
         $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
         $address->setCustomerId($customerId);
-        return $this->addressRepository->save($address);
+
+        try {
+            $address = $this->addressRepository->save($address);
+        } catch (InputException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
+        return $address;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
index dcc792482191d..602d969924fbd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php
@@ -34,7 +34,7 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testCreateCustomerAddress()
@@ -165,7 +165,7 @@ public function testCreateCustomerAddressIfUserIsNotAuthorized()
      * Verify customers with valid credentials create new address
      * with missing required Firstname attribute
      *
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer_without_addresses.php
      * @expectedException \Exception
      * @expectedExceptionMessage Required parameters are missing: firstname
      */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php
new file mode 100644
index 0000000000000..0948e46173615
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+/** @var Customer $customer */
+$customer = Bootstrap::getObjectManager()->get(Customer::class);
+
+$customer->setWebsiteId(1)
+    ->setId(1)
+    ->setEmail('customer@example.com')
+    ->setPassword('password')
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setIsActive(1)
+    ->setPrefix('Mr.')
+    ->setFirstname('John')
+    ->setMiddlename('A')
+    ->setLastname('Smith')
+    ->setSuffix('Esq.')
+    ->setGender(0)
+    ->save();
+$customerRegistry->remove($customer->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php
new file mode 100644
index 0000000000000..d5f9308ee77b7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_without_addresses_rollback.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $customerRepository->deleteById(1);
+} catch (NoSuchEntityException $e) {
+    /**
+     * Tests which are wrapped with MySQL transaction clear all data by transaction rollback.
+     */
+}
+$customerRegistry->remove(1);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 27ad6c4e25d38bdf80be07406d2755da94e4a681 Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Tue, 11 Dec 2018 13:13:43 -0600
Subject: [PATCH 256/932] MC-5717: Sub-category doesnt display after moving
 categories

---
 .../Catalog/Controller/Adminhtml/Category/RefreshPath.php  | 1 +
 .../Unit/Controller/Adminhtml/Category/RefreshPathTest.php | 4 ++--
 .../Catalog/view/adminhtml/ui_component/category_form.xml  | 7 +++++++
 .../Catalog/view/adminhtml/web/catalog/category/form.js    | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
index 046ebbb119e5b..e58a0c5b0996e 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
@@ -44,6 +44,7 @@ public function execute()
                 'id' => $categoryId,
                 'path' => $category->getPath(),
                 'parentId' => $category->getParentId(),
+                'level' => $category->getLevel()
             ]);
         }
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
index 45de62e218cfc..adf00333721ba 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/RefreshPathTest.php
@@ -66,8 +66,8 @@ private function setObjectProperty($object, string $propertyName, $value) : void
      */
     public function testExecute() : void
     {
-        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2];
-        $result = '{"id":3,"path":"1/2/3","parentId":"2"}';
+        $value = ['id' => 3, 'path' => '1/2/3', 'parentId' => 2, 'level' => 2];
+        $result = '{"id":3,"path":"1/2/3","parentId":"2","level":"2"}';
 
         $requestMock = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
index 1a54db0d59f0f..90d6e0b48400e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
@@ -77,6 +77,13 @@
                 <dataType>text</dataType>
             </settings>
         </field>
+        <field name="level" formElement="hidden">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="source" xsi:type="string">category</item>
+                </item>
+            </argument>
+        </field>
         <field name="store_id" formElement="hidden">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
index 0a04358e41123..76aaddf55ac99 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/category/form.js
@@ -15,6 +15,7 @@ define([
                 categoryIdSelector: 'input[name="id"]',
                 categoryPathSelector: 'input[name="path"]',
                 categoryParentSelector: 'input[name="parent"]',
+                categoryLevelSelector: 'input[name="level"]',
                 refreshUrl: config.refreshUrl
             },
 
@@ -47,6 +48,7 @@ define([
                     $(this.options.categoryIdSelector).val(data.id).change();
                     $(this.options.categoryPathSelector).val(data.path).change();
                     $(this.options.categoryParentSelector).val(data.parentId).change();
+                    $(this.options.categoryLevelSelector).val(data.level).change();
                 }
             }
         };

From a058e6f9bf89b109e9974583e9b7fef2e2b21ac6 Mon Sep 17 00:00:00 2001
From: Lewis Voncken <lewis@experius.nl>
Date: Tue, 11 Dec 2018 21:52:24 +0100
Subject: [PATCH 257/932] [TASK] Updated the implements for the Magento_Cms
 Adminhtml Controllers

---
 app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php      | 2 +-
 app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php     | 2 +-
 .../Magento/Cms/Controller/Adminhtml/Block/MassDelete.php     | 3 ++-
 app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php | 2 +-
 app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php      | 2 +-
 app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php     | 4 +++-
 app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php       | 2 +-
 app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php      | 2 +-
 app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php | 3 ++-
 .../Magento/Cms/Controller/Adminhtml/Page/MassDisable.php     | 2 +-
 app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php | 4 +++-
 app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php  | 4 +++-
 app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php       | 2 +-
 .../Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php  | 2 +-
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php  | 3 ++-
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php        | 3 ++-
 16 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
index b5b035e0c67aa..99cd283061ec9 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
 class Edit extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
index f92d38c0d856d..576c8244005ba 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
 class Index extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
index 92bc7ad71f590..ccdddc7c2b594 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
@@ -14,7 +15,7 @@
 /**
  * Class MassDelete
  */
-class MassDelete extends \Magento\Backend\App\Action
+class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
index 28db422fb51bc..52473b5b9e529 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
 class NewAction extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
index 7526f59ce368b..57e7867cc3fcf 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Cms\Api\BlockRepositoryInterface;
 use Magento\Cms\Model\Block;
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
index 16c99e9857c33..e921d867d21f0 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-class Delete extends \Magento\Backend\App\Action
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+class Delete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
index e7bdfe9ed0e7d..4f70746b9dee7 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Backend\App\Action;
 
 class Edit extends \Magento\Backend\App\Action implements HttpGetActionInterface
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
index 42fa4d62673c1..cd2cc1bd7f87f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
index a1d32aa97a382..222849f97602d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
@@ -13,7 +14,7 @@
 /**
  * Class MassDelete
  */
-class MassDelete extends \Magento\Backend\App\Action
+class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
index b07894e6a9de6..0a8c667d4d7b3 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
index 3f26769e4c9e9..96109f96412fb 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
@@ -5,15 +5,17 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
 
+
 /**
  * Class MassEnable
  */
-class MassEnable extends \Magento\Backend\App\Action
+class MassEnable extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
index 407657b05c1c8..113a3ebcc1c19 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
@@ -6,7 +6,9 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-class NewAction extends \Magento\Backend\App\Action
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index 5a7b900bf2d8b..b159c5110e350 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Cms\Model\Page;
 use Magento\Framework\App\Request\DataPersistorInterface;
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
index b268bee4c60a7..b915e592af485 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
@@ -7,7 +7,7 @@
 namespace Magento\Cms\Controller\Adminhtml\Page\Widget;
 
 use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 
 class Chooser extends Action implements HttpPostActionInterface, HttpGetActionInterface
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
index a1de11c3c462e..5344472a79a9d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -6,12 +6,13 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Delete image folder.
  */
-class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
+class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
index 5c9aa2243bc6d..31b01ce115c21 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
@@ -6,12 +6,13 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Upload image.
  */
-class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
+class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory

From 746a87485db77ce7b8cf44006f6fbaed082d0ba3 Mon Sep 17 00:00:00 2001
From: Vital_Pantsialeyeu <vital_pantsialeyeu@epam.com>
Date: Tue, 11 Dec 2018 23:32:52 +0300
Subject: [PATCH 258/932] MAGETWO-96850: [2.3.x] One page Checkout resets
 Customer data if Product Qty was changed

- Changed the logic of getting checkout data
---
 .../view/frontend/web/js/checkout-data.js     | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
index 190495dbb6d12..489a5622960e5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
@@ -24,6 +24,22 @@ define([
             storage.set(cacheKey, data);
         },
 
+        /**
+         * @return {*}
+         */
+        initData = function () {
+            return {
+                'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
+                'shippingAddressFromData': null, //Shipping address pulled from persistence storage
+                'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
+                'selectedShippingRate': null, //Shipping rate pulled from persistence storage
+                'selectedPaymentMethod': null, //Payment method pulled from persistence storage
+                'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
+                'billingAddressFromData': null, //Billing address pulled from persistence storage
+                'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
+            }
+        },
+
         /**
          * @return {*}
          */
@@ -32,6 +48,7 @@ define([
 
             if ($.isEmptyObject(data)) {
                 data = $.initNamespaceStorage('mage-cache-storage').localStorage.get(cacheKey);
+
                 if ($.isEmptyObject(data)) {
                     data = initData();
                     saveData(data);
@@ -39,19 +56,6 @@ define([
             }
 
             return data;
-        },
-
-        initData = function () {
-            return {
-                'selectedShippingAddress': null, //Selected shipping address pulled from persistence storage
-                'shippingAddressFromData': null, //Shipping address pulled from persistence storage
-                'newCustomerShippingAddress': null, //Shipping address pulled from persistence storage for customer
-                'selectedShippingRate': null, //Shipping rate pulled from persistence storage
-                'selectedPaymentMethod': null, //Payment method pulled from persistence storage
-                'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
-                'billingAddressFromData': null, //Billing address pulled from persistence storage
-                'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
-            }
         };
 
     return {

From ff5436fc5f7873e61d2f12ba7b2dfbcf92c0c637 Mon Sep 17 00:00:00 2001
From: Vital_Pantsialeyeu <vital_pantsialeyeu@epam.com>
Date: Wed, 12 Dec 2018 12:32:49 +0300
Subject: [PATCH 259/932] MAGETWO-96850: [2.3.x] One page Checkout resets
 Customer data if Product Qty was changed

- Changed the logic of getting checkout data
---
 app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
index 489a5622960e5..1858ce946fb07 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
@@ -37,7 +37,7 @@ define([
                 'selectedBillingAddress': null, //Selected billing address pulled from persistence storage
                 'billingAddressFromData': null, //Billing address pulled from persistence storage
                 'newCustomerBillingAddress': null //Billing address pulled from persistence storage for new customer
-            }
+            };
         },
 
         /**

From c2fe92cca7722b2e3eebe3cbbb7db3bb3ce88b71 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <Veronika_Kurochkina@epam.com>
Date: Wed, 12 Dec 2018 13:44:53 +0300
Subject: [PATCH 260/932] MAGETWO-95812: Required RMA Attributes are not
 validated while Customer submits a return

- Update automated test
---
 .../Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
index 3c63fc0a63e8b..86226265dd146 100644
--- a/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Metadata/sales_enable_rma_config-meta.xml
@@ -8,7 +8,7 @@
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="SalesRMAConfig" dataType="sales_rma_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST">
         <object key="groups" dataType="sales_rma_config">
-            <object key="magento_rma" dataType="sales_rma_config">
+            <object key="rma" dataType="sales_rma_config">
                 <object key="fields" dataType="sales_rma_config">
                     <object key="enabled" dataType="enabled">
                         <field key="value">string</field>

From b44371f7167d42a03ff3797f58929aa53da7b00b Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 12 Dec 2018 16:08:27 +0300
Subject: [PATCH 261/932] MAGETWO-94556: Undefined variables during product
 save

- Fixed js static and unit tests;
---
 .../view/adminhtml/web/js/variations/variations.js        | 1 +
 .../view/adminhtml/web/js/variations/variations.test.js   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

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 c6eee5486d117..4cb580ce9740c 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
@@ -403,6 +403,7 @@ define([
          */
         validateForm: function (formElement) {
             formElement.validate();
+
             return !formElement.additionalInvalid && !formElement.source.get('params.invalid');
         },
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
index ed2e29f4baf16..01998a69d3519 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
@@ -46,8 +46,8 @@ define([
 
             variation.serializeData();
 
-            expect(variation.source.data['configurable-matrix']).toBeUndefined();
-            expect(variation.source.data['associated_product_ids']).toBeUndefined();
+            expect(variation.source.data['configurable-matrix']).toEqual(matrix);
+            expect(variation.source.data['associated_product_ids']).toEqual(ids);
             expect(variation.source.data['configurable-matrix-serialized']).toEqual(resultMatrix);
             expect(variation.source.data['associated_product_ids_serialized']).toEqual(resultIds);
         });
@@ -112,8 +112,8 @@ define([
             variation.source.data['associated_product_ids_serialized'] = JSON.stringify(['some old data']);
             variation.serializeData();
 
-            expect(variation.source.data['configurable-matrix']).toBeUndefined();
-            expect(variation.source.data['associated_product_ids']).toBeUndefined();
+            expect(variation.source.data['configurable-matrix']).toEqual(matrix);
+            expect(variation.source.data['associated_product_ids']).toEqual(ids);
             expect(variation.source.data['configurable-matrix-serialized']).toEqual(resultMatrix);
             expect(variation.source.data['associated_product_ids_serialized']).toEqual(resultIds);
         });

From 859bb7055e0c79b3f7ea2d82fec266a981adb016 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Wed, 12 Dec 2018 17:39:56 +0400
Subject: [PATCH 262/932] MAGETWO-96406: [2.3.x] Swatch Attribute is not
 displayed in the Widget CMS

- Added fixes based on comments
---
 .../Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml  | 1 +
 app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml    | 1 +
 .../Test/Mftf/Section/AdminNewAttributePanelSection.xml      | 2 ++
 .../Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml  | 5 ++---
 .../StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml     | 4 ++--
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
index a4b88c544de88..7c8694a247dee 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
@@ -30,6 +30,7 @@
         <click selector="{{WidgetSection.RuleParam}}" stepKey="clickToAddRuleParam"/>
         <click selector="{{WidgetSection.Chooser}}" stepKey="clickToSelectFromList"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <click selector="{{WidgetSection.RuleParamListExpander('1')}}" stepKey="expandRootCategory"/>
         <click selector="{{WidgetSection.PreCreateCategory(category)}}" stepKey="selectPreCategory" />
         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickToSaveInsertedWidget"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index c7ea85e441bb9..101e694d75f55 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -101,6 +101,7 @@
         <element name="RuleParamSelect" type="select" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//select" parameterized="true"/>
         <element name="RuleParamInput" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//input" parameterized="true"/>
         <element name="RuleParamLabel" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//a" parameterized="true"/>
+        <element name="RuleParamListExpander" selector="//div[@class='rule-chooser']//ul[contains(@class,'x-tree-root')]//li[{{arg3}}]//img[contains(@class,'x-tree-elbow-end-plus')]" parameterized="true"/>
         <element name="Chooser" type="button" selector="//img[@title='Open Chooser']"/>
         <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
         <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
index 9310091ee13f2..48d526b72bc2c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
@@ -16,6 +16,8 @@
         <element name="visibleOnCatalogPagesOnStorefront" type="select" selector="#is_visible_on_front"/>
         <element name="useInProductListing" type="select" selector="#used_in_product_listing"/>
         <element name="usedForStoringInProductListing" type="select" selector="#used_for_sort_by"/>
+        <element name="storefrontPropertiesTab" selector="#front_fieldset-wrapper"/>
+        <element name="storefrontPropertiesTitle" selector="//span[text()='Storefront Properties']"/>
         <element name="container" type="text" selector="#create_new_attribute"/>
         <element name="saveAttribute" type="button" selector="#save"/>
         <element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
index a4fbc028e54a6..2c91bba75fec9 100644
--- a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddSwatchToProductActionGroup.xml
@@ -70,9 +70,8 @@
         </arguments>
 
         <!-- Go to Storefront Properties tab -->
-        <scrollToTopOfPage stepKey="scrollToTop" after="fillDefaultStoreLabel2"/>
-        <click selector="#front_fieldset-wrapper" stepKey="goToStorefrontPropertiesTab" after="scrollToTop"/>
-        <waitForElementVisible selector="//span[text()='Storefront Properties']" stepKey="waitTabLoad" after="goToStorefrontPropertiesTab"/>
+        <click selector="{{AdminNewAttributePanel.storefrontPropertiesTab}}" stepKey="goToStorefrontPropertiesTab" after="fillDefaultStoreLabel2"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.storefrontPropertiesTitle}}" stepKey="waitTabLoad" after="goToStorefrontPropertiesTab"/>
         <selectOption selector="{{AdminNewAttributePanel.useInSearch}}" stepKey="switchOnUsInSearch" userInput="Yes" after="waitTabLoad"/>
         <selectOption selector="{{AdminNewAttributePanel.visibleInAdvancedSearch}}" stepKey="switchOnVisibleInAdvancedSearch" userInput="Yes" after="switchOnUsInSearch"/>
         <selectOption selector="{{AdminNewAttributePanel.comparableOnStorefront}}" stepKey="switchOnComparableOnStorefront" userInput="Yes" after="switchOnVisibleInAdvancedSearch"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
index bcd4cac70118b..b45339edecd86 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
@@ -32,8 +32,8 @@
                 <argument name="ProductAttribute" value="visualSwatchAttribute"/>
             </actionGroup>
             <!--delete root category-->
-            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPageAfterCLIReindexCommand"/>
-            <waitForPageLoad time="30" stepKey="waitForPageCategoryLoadAfterCLIReindexCommand"/>
+            <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage"/>
+            <waitForPageLoad time="30" stepKey="waitForPageCategoryLoad"/>
             <click selector="{{AdminCategorySidebarTreeSection.categoryInTree('$$createRootCategory.name$$')}}" stepKey="clickOnDefaultRootCategory"/>
             <waitForPageLoad stepKey="waitForPageDefaultCategoryEditLoad" />
             <seeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="assertDeleteButtonIsPresent1"/>

From 1d8d568bacbbe9942d03e52ec8de0d27e689469d Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 12 Dec 2018 16:51:35 +0200
Subject: [PATCH 263/932] ENGCOM-3464: Static tests fixed.

---
 app/code/Magento/Quote/Model/Quote/Address/Total.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 8179b2b19707f..00060c15c10d8 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -7,6 +7,7 @@
 
 /**
  * Class Total
+ *
  * @method string getCode()
  *
  * @api
@@ -172,6 +173,7 @@ public function getAllBaseTotalAmounts()
 
     /**
      * Set the full info, which is used to capture tax related information.
+     *
      * If a string is used, it is assumed to be serialized.
      *
      * @param array|string $info

From 6754554ef57fa60d54e07dc5611d105ee286c5a9 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 12 Dec 2018 18:25:08 +0200
Subject: [PATCH 264/932] Fix static and functional tests.

---
 .../Test/Unit/Model/Rule/Condition/ProductTest.php          | 1 -
 ...tingByPriceForConfigurableWithCatalogRuleAppliedTest.xml | 6 +++---
 .../Plugin/SalesRule/Model/Rule/Condition/ProductTest.php   | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php b/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php
index 00550383ce26f..219cae6829299 100644
--- a/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php
+++ b/app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/ProductTest.php
@@ -9,7 +9,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.LongVariable)
  */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
index c93b216fc89d5..cd185ea534d0a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
@@ -150,9 +150,9 @@
             <argument name="sortBy" value="price"/>
             <argument name="sort" value="desc"/>
         </actionGroup>
-        <see selector="{{StorefrontCategoryMainSection.lineProductName('1')}}" userInput="$$createSimpleProduct2.name$$" stepKey="seeSimpleProductTwo2"/>
-        <see selector="{{StorefrontCategoryMainSection.lineProductName('2')}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct2"/>
-        <see selector="{{StorefrontCategoryMainSection.lineProductName('3')}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProduct2"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('1')}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProduct2"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('2')}}" userInput="$$createSimpleProduct2.name$$" stepKey="seeSimpleProductTwo2"/>
+        <see selector="{{StorefrontCategoryMainSection.lineProductName('3')}}" userInput="$$createSimpleProduct.name$$" stepKey="seeSimpleProduct2"/>
 
         <!-- Delete the rule -->
         <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
index c9d06709defa1..80979148c4959 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition;
+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\SalesRule\Model\Rule\Condition;
 
 use Magento\Backend\Helper\Data;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -27,6 +27,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.LongVariable)
  */
 class ProductTest extends \PHPUnit\Framework\TestCase
 {

From a1de67af2bf80171e56826fa6b51f6422de1160c Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Thu, 13 Dec 2018 00:37:51 +0530
Subject: [PATCH 265/932] updated with latest code

---
 app/code/Magento/Bundle/Model/Product/Type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 9f3dca166f0d2..641f4490874da 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -827,7 +827,7 @@ private function multiToFlatArray(array $array)
             if (is_array($value)) {
                 $flatArray = array_merge($flatArray, $this->multiToFlatArray($value));
             } else {
-                $flatArray[$key] = $value;
+                $flatArray[] = $value;
             }
         }
 

From 4bcd4787239bc155e91473c1ee0ba8bc22fbb35e Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Thu, 13 Dec 2018 11:16:18 +0400
Subject: [PATCH 266/932] MAGETWO-94556: Undefined variables during product
 save

- Fix test
---
 .../Test/Mftf/Test/AdminConfigurableProductCreateTest.xml       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
index f400a4d4708a8..bba352b16cc8a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
@@ -113,9 +113,11 @@
         <grabValueFrom selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}"  stepKey="grabTextFromContent"/>
         <fillField stepKey="fillMoreThan64Symbols" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="01234567890123456789012345678901234567890123456789012345678901234"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct1"/>
+        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickOnConfirmInPopup1"/>
         <see stepKey="seeErrorMessage" userInput="Please enter less or equal than 64 symbols."/>
         <fillField stepKey="fillCorrectSKU" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="$grabTextFromContent"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
+        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickOnConfirmInPopup2"/>
         <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
         <waitForPageLoad stepKey="waitForProductAttributes"/>

From 6c29a9d10ff095a252c680603bc15cbf12e05822 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Thu, 13 Dec 2018 13:10:17 +0300
Subject: [PATCH 267/932] MAGETWO-95816: Invoice PDF contain different address
 when use arabic symbols

- Added processing to SKU field
---
 .../Magento/Sales/Model/Order/Address/Renderer.php   | 12 ++++++++++++
 .../Model/Order/Pdf/Items/Invoice/DefaultInvoice.php | 11 +++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Address/Renderer.php b/app/code/Magento/Sales/Model/Order/Address/Renderer.php
index 5cbf938214f13..ba0f2f852e727 100644
--- a/app/code/Magento/Sales/Model/Order/Address/Renderer.php
+++ b/app/code/Magento/Sales/Model/Order/Address/Renderer.php
@@ -102,4 +102,16 @@ public function reverseArabicText($string)
         }
         return implode(' ', $splitText);
     }
+
+    /**
+     * Check and revert arabic text
+     *
+     * @param string $string
+     * @return string
+     */
+    public function processArabicText($string)
+    {
+        return ($this->isArabic($string))
+            ? $this->reverseArabicText($string) : $string;
+    }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
index 2b3ee0eb5b971..2b57bea85a1bb 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/Invoice/DefaultInvoice.php
@@ -78,13 +78,16 @@ public function draw()
         $lines = [];
 
         // draw Product name
-        $productName = ($this->renderer->isArabic($item->getName()))
-            ? $this->renderer->reverseArabicText($item->getName()) : $item->getName();
-        $lines[0] = [['text' => $this->string->split($productName, 35, true, true), 'feed' => 35]];
+        $lines[0] = [
+            [
+                'text' => $this->string->split($this->renderer->processArabicText($item->getName()), 35, true, true),
+                'feed' => 35
+            ]
+        ];
 
         // draw SKU
         $lines[0][] = [
-            'text' => $this->string->split($this->getSku($item), 17),
+            'text' => $this->string->split($this->renderer->processArabicText($item->getSku($item)), 17),
             'feed' => 290,
             'align' => 'right',
         ];

From 1749d09856d08ee571b13f07ed4efe972f8c4cdb Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <Veronika_Kurochkina@epam.com>
Date: Thu, 13 Dec 2018 13:49:24 +0300
Subject: [PATCH 268/932] MAGETWO-96124: [2.3.x] Custom Customer Attributes get
 cleared in case of invalid Customer Account creation on Storefront

- Update automated test script
---
 .../Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml    | 2 +-
 .../Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
index 101ff1451ccbf..0d273da353005 100644
--- a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerCreatePage.xml
@@ -10,6 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="StorefrontCustomerCreatePage" url="/customer/account/create/" area="storefront" module="Magento_Customer">
         <section name="StorefrontCustomerCreateFormSection"/>
-        <section name="StoreFrontCustomerCustomAttributesSection"/>
+        <section name="StoreFrontCustomerAdvancedAttributesSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
index a8c7cefb773d1..ee14ee5c165c5 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerCreateFormSection.xml
@@ -17,7 +17,7 @@
         <element name="confirmPasswordField" type="input" selector="#password-confirmation"/>
         <element name="createAccountButton" type="button" selector="button.action.submit.primary" timeout="30"/>
     </section>
-    <section name="StoreFrontCustomerCustomAttributesSection">
+    <section name="StoreFrontCustomerAdvancedAttributesSection">
         <element name="textFieldAttribute" type="input" selector="//input[@id='{{var}}']" parameterized="true" />
         <element name="textAreaAttribute" type="input" selector="//textarea[@id='{{var}}']" parameterized="true" />
         <element name="multiLineFirstAttribute" type="input" selector="//input[@id='{{var}}_0']" parameterized="true" />

From 7ac90f4378ed6c328f39ce5e3d0a8954b4ac6277 Mon Sep 17 00:00:00 2001
From: Mariana Lashch <mlashch@magento.com>
Date: Thu, 13 Dec 2018 13:32:12 +0200
Subject: [PATCH 269/932] MAGETWO-96379: Cart Price Rule grid count and
 pagination is wrong - create mftf test

---
 .../AdminGetWebsiteIdActionGroup.xml          | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AdminGetWebsiteIdActionGroup.xml

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminGetWebsiteIdActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminGetWebsiteIdActionGroup.xml
new file mode 100644
index 0000000000000..d7f5a6bcdb853
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminGetWebsiteIdActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<!-- Admin creates new custom website -->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!--Get Website id-->
+    <actionGroup name="AdminGetWebsiteIdActionGroup">
+        <arguments>
+            <argument name="website"/>
+         </arguments>
+         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
+         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
+         <fillField selector="{{AdminStoresGridSection.websiteFilterTextField}}" userInput="{{website.name}}" stepKey="fillSearchWebsiteField"/>
+         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters" />
+         <see selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" userInput="{{website.name}}" stepKey="verifyThatCorrectWebsiteFound"/>
+         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
+         <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabFromCurrentUrl"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file

From d3d06f17e679f96a094061fd807edbe407515d51 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 13 Dec 2018 15:34:53 +0400
Subject: [PATCH 270/932] MAGETWO-96411: [2.3.x] Default addresses not selected
 when checking out from cart

- Add automated test
---
 .../AdminCustomerShopingCartActionGroup.xml   |  27 ++++
 .../AdminCustomerMainActionsSection.xml       |   1 +
 .../AdminCustomerShoppingCartSection.xml      |  23 ++++
 .../AdminOrderFormShippingAddressSection.xml  |   1 +
 ...DifferentBillingAndShippingAddressTest.xml | 124 ++++++++++++++++++
 5 files changed, 176 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShopingCartActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminDifferentBillingAndShippingAddressTest.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShopingCartActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShopingCartActionGroup.xml
new file mode 100644
index 0000000000000..f5d5682e374f2
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerShopingCartActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminAddProductToShoppingCartActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.productItem}}" stepKey="waitForElementVisible"/>
+        <click selector="{{AdminCustomerShoppingCartProductItemSection.productItem}}" stepKey="expandProductItem"/>
+        <waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.productNameFilter}}" stepKey="waitForProductFilterFieldVisible"/>
+        <fillField selector="{{AdminCustomerShoppingCartProductItemSection.productNameFilter}}" stepKey="setProductName"  userInput="{{productName}}"/>
+        <click selector="{{AdminCustomerShoppingCartProductItemSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForAjaxLoad stepKey="waitForAjax"/>
+        <waitForElementVisible selector="{{AdminCustomerShoppingCartProductItemSection.firstProductCheckbox}}" stepKey="waitForElementCheckboxVisible"/>
+        <click selector="{{AdminCustomerShoppingCartProductItemSection.firstProductCheckbox}}" stepKey="selectFirstCheckbox"/>
+        <click selector="{{AdminCustomerShoppingCartProductItemSection.addSelectionsToMyCartButton}}" stepKey="clickAddSelectionsToMyCartButton" after="selectFirstCheckbox"/>
+        <waitForAjaxLoad stepKey="waitForAjax2"/>
+        <seeElement stepKey="seeAddedProduct" selector="{{AdminCustomerShoppingCartProductItemSection.addedProductName('productName')}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
index 3ff880c64e6d6..0a56763b66704 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminCustomerMainActionsSection">
         <element name="saveButton" type="button" selector="#save" timeout="30"/>
         <element name="resetPassword" type="button" selector="#resetPassword" timeout="30"/>
+        <element name="manageShoppingCart" type="button" selector="#manage_quote" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml
new file mode 100644
index 0000000000000..c4a4d650c1e59
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerShoppingCartSection">
+        <element name="createOrderButton" type="button" selector="button[title='Create Order']"/>
+    </section>
+
+    <section name="AdminCustomerShoppingCartProductItemSection">
+        <element name="productItem" type="button" selector="#dt-products"/>
+        <element name="productNameFilter" type="input" selector="#source_products_filter_name"/>
+        <element name="searchButton" type="button" selector="//*[@id='anchor-content']//button[@title='Search']"/>
+        <element name="firstProductCheckbox" type="checkbox" selector="//*[@id='source_products_table']/tbody/tr[1]//*[@name='source_products']"/>
+        <element name="addSelectionsToMyCartButton" type="button" selector="//*[@id='products_search']/div[1]//*[text()='Add selections to my cart']"/>
+        <element name="addedProductName" type="text" selector="//*[@id='order-items_grid']//*[text()='{{var}}']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
index b79d933268769..0f1461b121e15 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormShippingAddressSection.xml
@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormShippingAddressSection">
         <element name="SameAsBilling" type="checkbox" selector="#order-shipping_same_as_billing"/>
+        <element name="SelectFromExistingCustomerAddress" type="select" selector="#order-shipping_address_customer_address_id"/>
         <element name="NamePrefix" type="input" selector="#order-shipping_address_prefix"/>
         <element name="FirstName" type="input" selector="#order-shipping_address_firstname"/>
         <element name="MiddleName" type="input" selector="#order-shipping_address_middlename"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminDifferentBillingAndShippingAddressTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminDifferentBillingAndShippingAddressTest.xml
new file mode 100644
index 0000000000000..37ab0302e6fd2
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminDifferentBillingAndShippingAddressTest.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * 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="AdminDifferentBillingAndShippingAddressTest">
+        <annotations>
+            <features value="Sales"/>
+            <title value="Check that Billing and Shipping addresses pre-selected for customer with existing order in the cart"/>
+            <description value="Check Billing Address and Shipping Address"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96725"/>
+            <useCaseId value="MAGETWO-96411"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <!--Clear customer page filter-->
+            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+            <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openCustomerEditPage">
+            <argument name="customer" value="$$createCustomer$$" />
+        </actionGroup>
+        <click stepKey="goToAddresses" selector="{{NewCustomerPageSection.addresses}}"/>
+        <waitForAjaxLoad stepKey="waitForAddresses" time="5"/>
+        <!--Uncheck Default Shipping Address checkbox-->
+        <click stepKey="thickShippingAddress" selector="{{NewCustomerPageSection.defaultShippingAddress}}"/>
+        <waitForElementVisible selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="waitForElement"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="clickSave"/>
+        <conditionalClick selector="{{AdminCustomerMainActionsSection.saveButton}}"
+                          dependentSelector="{{AdminCustomerMainActionsSection.saveButton}}" visible="true" stepKey="clickSave2"/>
+        <waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
+
+        <!--Create new order with existing customer-->
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!--Add product to order-->
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+
+        <!--Uncheck Same As Billing Address Checkbox-->
+        <click selector="{{AdminOrderFormShippingAddressSection.SameAsBilling}}" stepKey="uncheckSameAsBillingAddressCheckbox"/>
+        <waitForAjaxLoad stepKey="waitForAjax" after="uncheckSameAsBillingAddressCheckbox"/>
+        <selectOption selector="{{AdminOrderFormShippingAddressSection.SelectFromExistingCustomerAddress}}"
+                      stepKey="selectAddNewCustomer" userInput="Add New Address" after="waitForAjax"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad" after="selectAddNewCustomer"/>
+
+        <!--Fill customer Shipping address information-->
+        <fillField selector="{{AdminOrderFormShippingAddressSection.FirstName}}" userInput="{{UK_Not_Default_Address.firstname}}" stepKey="fillFirstName"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.LastName}}" userInput="{{UK_Not_Default_Address.lastname}}" stepKey="fillLastName" after="fillFirstName"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.StreetLine1}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="fillStreetLine1" after="fillLastName"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.City}}" userInput="{{UK_Not_Default_Address.city}}" stepKey="fillCity" after="fillStreetLine1"/>
+        <selectOption selector="{{AdminOrderFormShippingAddressSection.Country}}" userInput="United Kingdom" stepKey="fillCountry" after="fillCity"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.Province}}" userInput="London" stepKey="fillProvince" after="fillCountry"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.PostalCode}}" userInput="{{UK_Not_Default_Address.postcode}}" stepKey="fillPostalCode" after="fillProvince"/>
+        <fillField selector="{{AdminOrderFormShippingAddressSection.Phone}}" userInput="{{UK_Not_Default_Address.telephone}}" stepKey="fillPhoneNumber" after="fillPostalCode"/>
+
+        <click stepKey="checkSaveBillingAddressCheckbox" selector="{{AdminOrderFormBillingAddressSection.SaveAddress}}" after="fillPhoneNumber"/>
+        <click stepKey="checkSaveShippingAddressCheckbox" selector="{{AdminOrderFormShippingAddressSection.SaveAddress}}" after="checkSaveBillingAddressCheckbox"/>
+
+        <!-- Select shipping -->
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="checkSaveShippingAddressCheckbox"/>
+
+        <!--Submit Order and verify that Order created successfully-->
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForPageLoad stepKey="waitForOrderToProcess"/>
+        <seeElement selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+
+        <!--Open customer for edit-->
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openCustomerEdit">
+            <argument name="customer" value="$$createCustomer$$" />
+        </actionGroup>
+
+        <!--Click on *Manage Shopping Cart*-->
+        <click selector="{{AdminCustomerMainActionsSection.manageShoppingCart}}" stepKey="clickManageShoppingCartButton"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+
+        <!--Add Product To Shopping Cart-->
+        <actionGroup ref="AdminAddProductToShoppingCartActionGroup" stepKey="addProductToShoppingCart">
+            <argument name="productName" value="$$createProduct.name$$" />
+        </actionGroup>
+
+        <!--Click on *Create Order*-->
+        <waitForElementVisible selector="{{AdminCustomerShoppingCartSection.createOrderButton}}" stepKey="waitToShoppingCartPageOpened"/>
+        <click selector="{{AdminCustomerShoppingCartSection.createOrderButton}}" stepKey="clickCreateOrderButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!--Check Billing Address and Shipping Address should be pre-selected/fill out-->
+        <waitForElementVisible stepKey="waitElementsBecomeVisible" selector="{{AdminOrderFormShippingAddressSection.FirstName}}"/>
+        <scrollTo selector="{{AdminOrderFormShippingAddressSection.FirstName}}" stepKey="scrollToMiddleOfPage"/>
+        <grabValueFrom selector="{{AdminOrderFormShippingAddressSection.FirstName}}" stepKey="grabTextShippingFirstNameValue"/>
+        <grabValueFrom selector="{{AdminOrderFormShippingAddressSection.LastName}}" stepKey="grabTextShippingLastNameValue"/>
+        <grabValueFrom selector="{{AdminOrderFormShippingAddressSection.StreetLine1}}" stepKey="grabShippingStreetLineValue"/>
+        <grabValueFrom selector="{{AdminOrderFormShippingAddressSection.City}}" stepKey="grabShippingCityValue"/>
+        <grabValueFrom selector="{{AdminOrderFormBillingAddressSection.Country}}" stepKey="grabBillingCountryValue"/>
+
+        <assertNotEmpty actual="$grabTextShippingFirstNameValue" stepKey="assertTextShippingFirstNameIsNotEmpty" after="grabTextShippingFirstNameValue"/>
+        <assertNotEmpty actual="$grabTextShippingLastNameValue" stepKey="assertTextShippingLastNameIsNotEmpty" after="grabTextShippingLastNameValue"/>
+        <assertNotEmpty actual="$grabShippingStreetLineValue" stepKey="assertShippingStreetLineIsNotEmpty" after="grabShippingStreetLineValue"/>
+        <assertNotEmpty actual="$grabShippingCityValue" stepKey="assertShippingCityIsNotEmpty" after="grabShippingCityValue"/>
+        <assertNotEmpty actual="$grabBillingCountryValue" stepKey="assertBillingCountryIsNotEmpty" after="grabBillingCountryValue"/>
+    </test>
+</tests>

From ac49d4bc734bc9307e164cbdd48432f1e1db6786 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Thu, 13 Dec 2018 13:52:34 +0200
Subject: [PATCH 271/932] MAGETWO-96594: Image Position issue with Associated
 Products

---
 .../Swatches/Controller/Ajax/Media.php        |  1 +
 app/code/Magento/Swatches/Helper/Data.php     | 40 +++++++++++++++----
 .../view/frontend/web/js/swatch-renderer.js   | 14 ++++++-
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Swatches/Controller/Ajax/Media.php b/app/code/Magento/Swatches/Controller/Ajax/Media.php
index 7692245e9b27a..2d20b9a9a4b7e 100644
--- a/app/code/Magento/Swatches/Controller/Ajax/Media.php
+++ b/app/code/Magento/Swatches/Controller/Ajax/Media.php
@@ -52,6 +52,7 @@ public function __construct(
      * Get product media for specified configurable product variation
      *
      * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute()
     {
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index d82109ac12603..69217ea377796 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Swatches\Helper;
 
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductInterface as Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product as ModelProduct;
 use Magento\Catalog\Model\Product\Image\UrlBuilder;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
@@ -324,35 +324,61 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
      * @param ModelProduct $product
      *
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function getProductMediaGallery(ModelProduct $product)
+    public function getProductMediaGallery(ModelProduct $product): array
     {
         $baseImage = null;
         $gallery = [];
 
         $mediaGallery = $product->getMediaGalleryEntries();
+        /** @var ProductAttributeMediaGalleryEntryInterface $mediaEntry */
         foreach ($mediaGallery as $mediaEntry) {
             if ($mediaEntry->isDisabled()) {
                 continue;
             }
-
-            if (in_array('image', $mediaEntry->getTypes(), true) || !$baseImage) {
-                $baseImage = $mediaEntry->getFile();
+            if (!$baseImage || $this->isMainImage($mediaEntry)) {
+                $baseImage = $mediaEntry;
             }
 
-            $gallery[$mediaEntry->getId()] = $this->getAllSizeImages($mediaEntry->getFile());
+            $gallery[$mediaEntry->getId()] = $this->collectImageData($mediaEntry);
         }
 
         if (!$baseImage) {
             return [];
         }
 
-        $resultGallery = $this->getAllSizeImages($baseImage);
+        $resultGallery = $this->collectImageData($baseImage);
         $resultGallery['gallery'] = $gallery;
 
         return $resultGallery;
     }
 
+    /**
+     * Checks if image is main image in gallery
+     *
+     * @param ProductAttributeMediaGalleryEntryInterface $mediaEntry
+     * @return bool
+     */
+    private function isMainImage(ProductAttributeMediaGalleryEntryInterface $mediaEntry): bool
+    {
+        return in_array('image', $mediaEntry->getTypes(), true);
+    }
+
+    /**
+     * Returns image data for swatches
+     *
+     * @param ProductAttributeMediaGalleryEntryInterface $mediaEntry
+     * @return array
+     */
+    private function collectImageData(ProductAttributeMediaGalleryEntryInterface $mediaEntry): array
+    {
+        $image = $this->getAllSizeImages($mediaEntry->getFile());
+        $image[ProductAttributeMediaGalleryEntryInterface::POSITION] =  $mediaEntry->getPosition();
+        $image['isMain'] =$this->isMainImage($mediaEntry);
+        return $image;
+    }
+
     /**
      * Get all size images
      *
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index 0a8675067ea5d..da596ce98640e 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -684,11 +684,21 @@ define([
                 if (!images) {
                     images = this.options.mediaGalleryInitial;
                 }
-
-                this.updateBaseImage(images, $main, !this.inProductList);
+                this.updateBaseImage(this._sortImages(images), $main, !this.inProductList);
             }
         },
 
+        /**
+         * Sorting images array
+         *
+         * @private
+         */
+        _sortImages: function (images) {
+            return _.sortBy(images, function (image) {
+                return (image.isMain === true) ? -1 : image.position;
+            });
+        },
+
         /**
          * Event for swatch options
          *

From 2ab53e88eefeae02dbef8c4a2776719074b666c2 Mon Sep 17 00:00:00 2001
From: Mariana Lashch <mlashch@magento.com>
Date: Thu, 13 Dec 2018 13:53:53 +0200
Subject: [PATCH 272/932] MAGETWO-96379: Cart Price Rule grid count and
 pagination is wrong - add selectors

---
 .../Test/Mftf/Section/AdminCartPriceRulesSection.xml          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
index a32c50d9d8617..814731688c814 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
@@ -15,5 +15,7 @@
         <element name="nameColumns" type="text" selector="td[data-column='name']"/>
         <element name="rowContainingText" type="text" selector="//*[@id='promo_quote_grid_table']/tbody/tr[td//text()[contains(., '{{var1}}')]]" parameterized="true" timeout="30"/>
         <element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
-    </section>
+        <element name="rulesRow" type="text" selector="//tr[@data-role='row']"/>
+        <element name="buttonNextInactive" type="button" selector="//button[@class='action-next disabled']"/>
+        </section>
 </sections>

From b6c9983ed9f076bc32632033141957c39253701e Mon Sep 17 00:00:00 2001
From: gulshanchitranshcedcoss <gulshanchitransh@cedcoss.com>
Date: Thu, 13 Dec 2018 18:25:23 +0530
Subject: [PATCH 273/932] Fixed Typo error  avaialble -> available

Fixed Typo error  avaialble -> available
---
 app/code/Magento/Usps/Model/Carrier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 1e8faf3cc9614..8e1462375e7a4 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -448,7 +448,7 @@ protected function _getXmlQuotes()
                 $package->addChild('FirstClassMailType', 'PARCEL');
             }
             $package->addChild('ZipOrigination', $r->getOrigPostal());
-            //only 5 chars avaialble
+            //only 5 chars available
             $package->addChild('ZipDestination', substr($r->getDestPostal(), 0, 5));
             $package->addChild('Pounds', $r->getWeightPounds());
             $package->addChild('Ounces', $r->getWeightOunces());

From 392802c7033bc3abd4e506c17e69d90907ea0451 Mon Sep 17 00:00:00 2001
From: Mariana Lashch <mlashch@magento.com>
Date: Thu, 13 Dec 2018 14:57:41 +0200
Subject: [PATCH 274/932] MAGETWO-96379: Cart Price Rule grid count and
 pagination is wrong - add changes

---
 .../SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
index 814731688c814..55b4681580bb3 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
@@ -17,5 +17,5 @@
         <element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
         <element name="rulesRow" type="text" selector="//tr[@data-role='row']"/>
         <element name="buttonNextInactive" type="button" selector="//button[@class='action-next disabled']"/>
-        </section>
+    </section>
 </sections>

From 9117f2b32b7f320dd045c8eef9c48aa10e290ef7 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Thu, 13 Dec 2018 15:26:56 +0200
Subject: [PATCH 275/932] MAGETWO-96594: Image Position issue with Associated
 Products

---
 .../Magento/Swatches/view/frontend/web/js/swatch-renderer.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index da596ce98640e..ca39516c13a00 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -695,7 +695,7 @@ define([
          */
         _sortImages: function (images) {
             return _.sortBy(images, function (image) {
-                return (image.isMain === true) ? -1 : image.position;
+                return image.isMain === true ? -1 : image.position;
             });
         },
 

From 8131d75032e66004c123b02e23786f2729748b22 Mon Sep 17 00:00:00 2001
From: Sona Sargsyan <sona_sargsyan@epam.com>
Date: Thu, 13 Dec 2018 17:28:15 +0400
Subject: [PATCH 276/932] MAGETWO-66872: Customer Address Attribute not being
 marked as required when the "Values Required" setting is overriden on Website
 scope

- Added fix for b2b
---
 .../ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
index 9d918990c8172..8eaf5a1f1d284 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
@@ -28,8 +28,8 @@
         <fillField  stepKey="fillVAT" userInput="{{customerAddress.vat_id}}" selector="{{AdminEditCustomerAddressesSection.vat}}"/>
         <click selector="{{CustomerAccountSection.save}}" stepKey="saveAddress"/>
         <waitForPageLoad stepKey="waitForStorefrontPage"/>
-        <click selector="{{CustomerAccountSection.save}}" stepKey="saveCustomer"/>
+        <conditionalClick selector="{{CustomerAccountSection.save}}" dependentSelector="{{CustomerAccountSection.save}}" visible="true" stepKey="clickSaveAgain"/>
         <waitForPageLoad stepKey="waitForCustomerSaved"/>
         <see stepKey="seeSaveMessage" userInput="You saved the customer."/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>

From d54210343664619baeb79f0da6f7a4ea363d963d Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Fri, 14 Dec 2018 14:26:16 +0300
Subject: [PATCH 277/932] MAGETWO-96407: [2.3.x] [B2B] Products with
 customizable options of type File aren't saved on requisition lists with the
 attachments

- Fix statics.
---
 lib/web/mage/dataPost.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/mage/dataPost.js b/lib/web/mage/dataPost.js
index 07d282d89f9fd..cc56ee266e08a 100644
--- a/lib/web/mage/dataPost.js
+++ b/lib/web/mage/dataPost.js
@@ -69,7 +69,7 @@ define([
 
             if (params.files) {
                 $form[0].enctype = 'multipart/form-data';
-                $.each(params.files, function(key, files) {
+                $.each(params.files, function (key, files) {
                     if (files instanceof FileList) {
                         input = document.createElement('input');
                         input.type = 'file';

From c0b52afb5f365e0f1239e0fff5a9b964b01953da Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 14 Dec 2018 15:21:02 +0300
Subject: [PATCH 278/932] MAGETWO-63036: CLONE - Quans: Orders API without
 key/value on ADDITIONAL_INFORMATION (only values)

- Add additional information to extension attributes.
---
 .../Data/PaymentAdditionalInfoInterface.php   | 17 ++++++
 .../Payment/Model/PaymentAdditionalInfo.php   | 60 +++++++++++++++++++
 app/code/Magento/Payment/etc/di.xml           |  1 +
 .../Magento/Sales/Model/OrderRepository.php   | 51 +++++++++++++++-
 .../Test/Unit/Model/OrderRepositoryTest.php   | 24 +++++++-
 .../Sales/etc/extension_attributes.xml        |  3 +
 .../Magento/Sales/Service/V1/OrderGetTest.php |  2 +
 .../Sales/Service/V1/OrderListTest.php        |  2 +
 .../Magento/Sales/_files/order_list.php       | 16 ++++-
 9 files changed, 172 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php
 create mode 100644 app/code/Magento/Payment/Model/PaymentAdditionalInfo.php

diff --git a/app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php b/app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php
new file mode 100644
index 0000000000000..8afa064efd3ea
--- /dev/null
+++ b/app/code/Magento/Payment/Api/Data/PaymentAdditionalInfoInterface.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Api\Data;
+
+use Magento\Framework\DataObject\KeyValueObjectInterface;
+
+/**
+ * Payment additional info interface.
+ */
+interface PaymentAdditionalInfoInterface extends KeyValueObjectInterface
+{
+}
diff --git a/app/code/Magento/Payment/Model/PaymentAdditionalInfo.php b/app/code/Magento/Payment/Model/PaymentAdditionalInfo.php
new file mode 100644
index 0000000000000..c4f135d5e0044
--- /dev/null
+++ b/app/code/Magento/Payment/Model/PaymentAdditionalInfo.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Model;
+
+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterface;
+
+/**
+ * Payment additional info class.
+ */
+class PaymentAdditionalInfo implements PaymentAdditionalInfoInterface
+{
+    /**
+     * @var string
+     */
+    private $key;
+
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @inheritdoc
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setKey($key)
+    {
+        $this->key = $key;
+        return $key;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
+        return $value;
+    }
+}
diff --git a/app/code/Magento/Payment/etc/di.xml b/app/code/Magento/Payment/etc/di.xml
index 74f553cc64094..b7422bb00d543 100644
--- a/app/code/Magento/Payment/etc/di.xml
+++ b/app/code/Magento/Payment/etc/di.xml
@@ -7,6 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Payment\Api\Data\PaymentMethodInterface" type="Magento\Payment\Model\PaymentMethod"/>
+    <preference for="Magento\Payment\Api\Data\PaymentAdditionalInfoInterface" type="Magento\Payment\Model\PaymentAdditionalInfo"/>
     <preference for="Magento\Payment\Api\PaymentMethodListInterface" type="Magento\Payment\Model\PaymentMethodList"/>
     <preference for="Magento\Payment\Gateway\Validator\ResultInterface" type="Magento\Payment\Gateway\Validator\Result"/>
     <preference for="Magento\Payment\Gateway\ConfigFactoryInterface" type="Magento\Payment\Gateway\Config\ConfigFactory" />
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
index a98d6193402a9..d809863044b70 100644
--- a/app/code/Magento/Sales/Model/OrderRepository.php
+++ b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -18,6 +18,9 @@
 use Magento\Sales\Model\ResourceModel\Metadata;
 use Magento\Framework\App\ObjectManager;
 use Magento\Tax\Api\OrderTaxManagementInterface;
+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterface;
+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterfaceFactory;
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
 
 /**
  * Repository class
@@ -61,6 +64,16 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
      */
     private $orderTaxManagement;
 
+    /**
+     * @var PaymentAdditionalInfoFactory
+     */
+    private $paymentAdditionalInfoFactory;
+
+    /**
+     * @var JsonSerializer
+     */
+    private $serializer;
+
     /**
      * Constructor
      *
@@ -69,13 +82,17 @@ class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
      * @param CollectionProcessorInterface|null $collectionProcessor
      * @param \Magento\Sales\Api\Data\OrderExtensionFactory|null $orderExtensionFactory
      * @param OrderTaxManagementInterface|null $orderTaxManagement
+     * @param PaymentAdditionalInfoInterfaceFactory|null $paymentAdditionalInfoFactory
+     * @param JsonSerializer|null $serializer
      */
     public function __construct(
         Metadata $metadata,
         SearchResultFactory $searchResultFactory,
         CollectionProcessorInterface $collectionProcessor = null,
         \Magento\Sales\Api\Data\OrderExtensionFactory $orderExtensionFactory = null,
-        OrderTaxManagementInterface $orderTaxManagement = null
+        OrderTaxManagementInterface $orderTaxManagement = null,
+        PaymentAdditionalInfoInterfaceFactory $paymentAdditionalInfoFactory = null,
+        JsonSerializer $serializer = null
     ) {
         $this->metadata = $metadata;
         $this->searchResultFactory = $searchResultFactory;
@@ -85,6 +102,10 @@ public function __construct(
             ->get(\Magento\Sales\Api\Data\OrderExtensionFactory::class);
         $this->orderTaxManagement = $orderTaxManagement ?: ObjectManager::getInstance()
             ->get(OrderTaxManagementInterface::class);
+        $this->paymentAdditionalInfoFactory = $paymentAdditionalInfoFactory ?: ObjectManager::getInstance()
+            ->get(PaymentAdditionalInfoInterfaceFactory::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
+            ->get(JsonSerializer::class);
     }
 
     /**
@@ -110,6 +131,7 @@ public function get($id)
             }
             $this->setOrderTaxDetails($entity);
             $this->setShippingAssignments($entity);
+            $this->setPaymentAdditionalInfo($entity);
             $this->registry[$id] = $entity;
         }
         return $this->registry[$id];
@@ -138,6 +160,32 @@ private function setOrderTaxDetails(OrderInterface $order)
         $order->setExtensionAttributes($extensionAttributes);
     }
 
+    /**
+     * Set additional info to the order.
+     *
+     * @param OrderInterface $order
+     * @return void
+     */
+    private function setPaymentAdditionalInfo(OrderInterface $order): void
+    {
+        $extensionAttributes = $order->getExtensionAttributes();
+        $paymentAdditionalInformation = $order->getPayment()->getAdditionalInformation();
+
+        $objects = [];
+        foreach ($paymentAdditionalInformation as $key => $value) {
+            /** @var PaymentAdditionalInfoInterface $additionalInformationObject */
+            $additionalInformationObject = $this->paymentAdditionalInfoFactory->create();
+            $additionalInformationObject->setKey($key);
+
+            $value = $this->serializer->serialize($value);
+            $additionalInformationObject->setValue($value);
+
+            $objects[] = $additionalInformationObject;
+        }
+        $extensionAttributes->setPaymentAdditionalInfo($objects);
+        $order->setExtensionAttributes($extensionAttributes);
+    }
+
     /**
      * Find entities by criteria
      *
@@ -153,6 +201,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         foreach ($searchResult->getItems() as $order) {
             $this->setShippingAssignments($order);
             $this->setOrderTaxDetails($order);
+            $this->setPaymentAdditionalInfo($order);
         }
         return $searchResult;
     }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
index 2e82d8064a9e8..7f0c0639d21f5 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php
@@ -10,6 +10,7 @@
 use Magento\Sales\Api\Data\OrderSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Sales\Model\ResourceModel\Metadata;
 use Magento\Tax\Api\OrderTaxManagementInterface;
+use Magento\Payment\Api\Data\PaymentAdditionalInfoInterfaceFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -46,6 +47,11 @@ class OrderRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     private $orderTaxManagementMock;
 
+    /**
+     * @var PaymentAdditionalInfoInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $paymentAdditionalInfoFactory;
+
     /**
      * Setup the test
      *
@@ -69,6 +75,8 @@ protected function setUp()
         $this->orderTaxManagementMock = $this->getMockBuilder(OrderTaxManagementInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->paymentAdditionalInfoFactory = $this->getMockBuilder(PaymentAdditionalInfoInterfaceFactory::class)
+            ->disableOriginalConstructor()->setMethods(['create'])->getMockForAbstractClass();
         $this->orderRepository = $this->objectManager->getObject(
             \Magento\Sales\Model\OrderRepository::class,
             [
@@ -76,7 +84,8 @@ protected function setUp()
                 'searchResultFactory' => $this->searchResultFactory,
                 'collectionProcessor' => $this->collectionProcessor,
                 'orderExtensionFactory' => $orderExtensionFactoryMock,
-                'orderTaxManagement' => $this->orderTaxManagementMock
+                'orderTaxManagement' => $this->orderTaxManagementMock,
+                'paymentAdditionalInfoFactory' => $this->paymentAdditionalInfoFactory
             ]
         );
     }
@@ -95,12 +104,16 @@ public function testGetList()
         $orderTaxDetailsMock = $this->getMockBuilder(\Magento\Tax\Api\Data\OrderTaxDetailsInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAppliedTaxes', 'getItems'])->getMockForAbstractClass();
+        $paymentMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderPaymentInterface::class)
+            ->disableOriginalConstructor()->getMockForAbstractClass();
+        $paymentAdditionalInfo = $this->getMockBuilder(\Magento\Payment\Api\Data\PaymentAdditionalInfoInterface::class)
+            ->disableOriginalConstructor()->setMethods(['setKey', 'setValue'])->getMockForAbstractClass();
 
         $extensionAttributes = $this->createPartialMock(
             \Magento\Sales\Api\Data\OrderExtension::class,
             [
                 'getShippingAssignments', 'setShippingAssignments', 'setConvertingFromQuote',
-                'setAppliedTaxes', 'setItemAppliedTaxes'
+                'setAppliedTaxes', 'setItemAppliedTaxes', 'setPaymentAdditionalInfo'
             ]
         );
         $shippingAssignmentBuilder = $this->createMock(
@@ -111,6 +124,13 @@ public function testGetList()
             ->method('process')
             ->with($searchCriteriaMock, $collectionMock);
         $itemsMock->expects($this->atLeastOnce())->method('getExtensionAttributes')->willReturn($extensionAttributes);
+        $itemsMock->expects($this->atleastOnce())->method('getPayment')->willReturn($paymentMock);
+        $paymentMock->expects($this->atLeastOnce())->method('getAdditionalInformation')
+            ->willReturn(['method' => 'checkmo']);
+        $this->paymentAdditionalInfoFactory->expects($this->atLeastOnce())->method('create')
+            ->willReturn($paymentAdditionalInfo);
+        $paymentAdditionalInfo->expects($this->atLeastOnce())->method('setKey')->willReturnSelf();
+        $paymentAdditionalInfo->expects($this->atLeastOnce())->method('setValue')->willReturnSelf();
         $this->orderTaxManagementMock->expects($this->atLeastOnce())->method('getOrderTaxDetails')
             ->willReturn($orderTaxDetailsMock);
         $extensionAttributes->expects($this->any())
diff --git a/app/code/Magento/Sales/etc/extension_attributes.xml b/app/code/Magento/Sales/etc/extension_attributes.xml
index 7280a1a071548..222f61cdc7324 100644
--- a/app/code/Magento/Sales/etc/extension_attributes.xml
+++ b/app/code/Magento/Sales/etc/extension_attributes.xml
@@ -10,4 +10,7 @@
     <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">
         <attribute code="shipping_assignments" type="Magento\Sales\Api\Data\ShippingAssignmentInterface[]" />
     </extension_attributes>
+    <extension_attributes for="Magento\Sales\Api\Data\OrderInterface">
+        <attribute code="payment_additional_info" type="Magento\Payment\Api\Data\PaymentAdditionalInfoInterface[]" />
+    </extension_attributes>
 </config>
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
index 09c49bed1de83..db96728e206be 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
@@ -133,6 +133,8 @@ public function testOrderGetExtensionAttributes(): void
         self::assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
         self::assertNotEmpty($appliedTaxes[0]['applied_taxes']);
         self::assertEquals(true, $result['extension_attributes']['converting_from_quote']);
+        self::assertArrayHasKey('payment_additional_info', $result['extension_attributes']);
+        self::assertNotEmpty($result['extension_attributes']['payment_additional_info']);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
index 5050b6be7e56c..506f82eab7ae2 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
@@ -90,6 +90,8 @@ public function testOrderListExtensionAttributes()
         $this->assertEquals($expectedTax['type'], $appliedTaxes[0]['type']);
         $this->assertNotEmpty($appliedTaxes[0]['applied_taxes']);
         $this->assertEquals(true, $result['items'][0]['extension_attributes']['converting_from_quote']);
+        $this->assertArrayHasKey('payment_additional_info', $result['items'][0]['extension_attributes']);
+        $this->assertNotEmpty($result['items'][0]['extension_attributes']['payment_additional_info']);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
index 251a384580062..1f4253f18487c 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
@@ -7,6 +7,7 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Sales\Model\Order\Payment;
 
 require 'order.php';
 /** @var Order $order */
@@ -68,13 +69,26 @@
     $shippingAddress = clone $billingAddress;
     $shippingAddress->setId(null)->setAddressType('shipping');
 
+    /** @var Payment $payment */
+    $payment = $objectManager->create(Payment::class);
+    $payment->setMethod('checkmo')
+        ->setAdditionalInformation('last_trans_id', '11122')
+        ->setAdditionalInformation(
+            'metadata',
+            [
+                'type' => 'free',
+                'fraudulent' => false,
+            ]
+        );
+
     $order
         ->setData($orderData)
         ->addItem($orderItem)
         ->setCustomerIsGuest(true)
         ->setCustomerEmail('customer@null.com')
         ->setBillingAddress($billingAddress)
-        ->setShippingAddress($shippingAddress);
+        ->setShippingAddress($shippingAddress)
+        ->setPayment($payment);
 
     $orderRepository->save($order);
     $orderList[] = $order;

From b2435d64bddd299ff930a8e34194ac16f2fb8777 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Fri, 14 Dec 2018 16:34:57 +0400
Subject: [PATCH 279/932] MAGETWO-96424: Requesition list qty of configurable
 product variation not updated individually

- Add automated test script
---
 .../AdminConfigurableProductActionGroup.xml    | 18 ++++++++++++++++++
 ...CreateProductConfigurationsPanelSection.xml |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
index 9ebadc236bb31..9085012f48c53 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -124,4 +124,22 @@
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
     </actionGroup>
+
+    <actionGroup name="createConfigurationsForTwoAttribute" extends="createConfigurationsForAttribute">
+        <arguments>
+            <argument name="secondAttributeCode" type="string"/>
+        </arguments>
+        <remove keyForRemoval="clickOnSelectAll"/>
+        <remove keyForRemoval="clickFilters"/>
+        <remove keyForRemoval="fillFilterAttributeCodeField"/>
+        <remove keyForRemoval="clickApplyFiltersButton"/>
+        <remove keyForRemoval="clickOnFirstCheckbox"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="clickOnFirstAttributeCheckbox" after="clickCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="clickOnSecondAttributeCheckbox" after="clickOnFirstAttributeCheckbox"/>
+        <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(attributeCode)}}" stepKey="grabFirstAttributeDefaultLabel" after="clickOnSecondAttributeCheckbox"/>
+        <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(secondAttributeCode)}}" stepKey="grabSecondAttributeDefaultLabel" after="grabFirstAttributeDefaultLabel"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFistAttribute" after="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="clickOnSelectAllForFistAttribute"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
index 7901b6f2290c9..cf7577814147f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminCreateProductConfigurationsPanelSection.xml
@@ -16,6 +16,8 @@
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
         <element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
         <element name="id" type="text" selector="//tr[contains(@data-repeat-index, '0')]/td[2]/div"/>
+        <element name="attributeCheckbox" type="checkbox" selector="//div[contains(text(), '{{arg}}')]/ancestor::tr//input[@data-action='select-row']" parameterized="true"/>
+        <element name="defaultLabel" type="text" selector="//div[contains(text(), '{{arg}}')]/ancestor::tr//td[3]/div[@class='data-grid-cell-content']" parameterized="true"/>
 
         <element name="selectAll" type="button" selector=".action-select-all"/>
         <element name="selectAllByAttribute" type="button" selector="//div[@data-attribute-title='{{attr}}']//button[contains(@class, 'action-select-all')]" parameterized="true"/>

From 2305acce27a57523232ca4be75571d4c6a6eb038 Mon Sep 17 00:00:00 2001
From: Brandon Brown <Brandon@encoremp.com>
Date: Fri, 14 Dec 2018 08:12:01 -0600
Subject: [PATCH 280/932] Fix typo so that subcategories appear

---
 app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
index 95f2531e5fdca..d1424d637937b 100644
--- a/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/ViewModel/Product/Breadcrumbs.php
@@ -105,7 +105,7 @@ public function getJsonConfigurationHtmlEscaped() : string
             [
                 'breadcrumbs' => [
                     'categoryUrlSuffix' => $this->escaper->escapeHtml($this->getCategoryUrlSuffix()),
-                    'userCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
+                    'useCategoryPathInUrl' => (int)$this->isCategoryUsedInProductUrl(),
                     'product' => $this->escaper->escapeHtml($this->getProductName())
                 ]
             ],

From 7ad78c9e89d165690592f407bce8e87ee9a9cd51 Mon Sep 17 00:00:00 2001
From: Brandon Brown <Brandon@encoremp.com>
Date: Fri, 14 Dec 2018 08:33:20 -0600
Subject: [PATCH 281/932] Update BreadcrumbsTest.php

---
 .../Test/Unit/ViewModel/Product/BreadcrumbsTest.php       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
index dbf1292e57368..a4ccaffc8fb6a 100644
--- a/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/ViewModel/Product/BreadcrumbsTest.php
@@ -152,21 +152,21 @@ public function productJsonEncodeDataProvider() : array
         return [
             [
                 $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test ™']]),
-                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":"Test \u2122"}}',
+                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","useCategoryPathInUrl":0,"product":"Test \u2122"}}',
             ],
             [
                 $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test "']]),
-                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":"Test &quot;"}}',
+                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","useCategoryPathInUrl":0,"product":"Test &quot;"}}',
             ],
             [
                 $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test <b>x</b>']]),
-                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":'
+                '{"breadcrumbs":{"categoryUrlSuffix":".&quot;html","useCategoryPathInUrl":0,"product":'
                 . '"Test &lt;b&gt;x&lt;\/b&gt;"}}',
             ],
             [
                 $this->getObjectManager()->getObject(Product::class, ['data' => ['name' => 'Test \'abc\'']]),
                 '{"breadcrumbs":'
-                . '{"categoryUrlSuffix":".&quot;html","userCategoryPathInUrl":0,"product":"Test &#039;abc&#039;"}}'
+                . '{"categoryUrlSuffix":".&quot;html","useCategoryPathInUrl":0,"product":"Test &#039;abc&#039;"}}'
             ],
         ];
     }

From da8625c678ee632453f7bc9dda80894bee0e1b3a Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Fri, 14 Dec 2018 16:58:01 +0200
Subject: [PATCH 282/932] MAGETWO-96400: [2.3.x] Company address attribute not
 displayed in Sales grid

---
 .../frontend/web/template/billing-address/details.html    | 1 +
 .../shipping-address/address-renderer/default.html        | 1 +
 app/code/Magento/Sales/etc/di.xml                         | 8 ++++++++
 3 files changed, 10 insertions(+)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
index ea521b3a8afd4..e1ddff3fe848f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -7,6 +7,7 @@
 <div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
     <text args="currentBillingAddress().prefix"/> <text args="currentBillingAddress().firstname"/> <text args="currentBillingAddress().middlename"/>
     <text args="currentBillingAddress().lastname"/> <text args="currentBillingAddress().suffix"/><br/>
+    <span if="currentBillingAddress().company"><span text="currentBillingAddress().company"></span><br></span>
     <text args="_.values(currentBillingAddress().street).join(', ')"/><br/>
     <text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
     <text args="getCountryName(currentBillingAddress().countryId)"/><br/>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
index cf64c0140b955..0d86ba673e460 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -7,6 +7,7 @@
 <div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()">
     <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
     <text args="address().lastname"/> <text args="address().suffix"/><br/>
+    <span if="address().company"><span text="address().company"></span><br/></span>
     <text args="_.values(address().street).join(', ')"/><br/>
     <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
     <text args="getCountryName(address().countryId)"/><br/>
diff --git a/app/code/Magento/Sales/etc/di.xml b/app/code/Magento/Sales/etc/di.xml
index be64ce5c84a35..5a5dd925a3098 100644
--- a/app/code/Magento/Sales/etc/di.xml
+++ b/app/code/Magento/Sales/etc/di.xml
@@ -745,6 +745,10 @@
     <virtualType name="ShippingAddressAggregator" type="Magento\Framework\DB\Sql\ConcatExpression">
         <arguments>
             <argument name="columns" xsi:type="array">
+                <item name="company" xsi:type="array">
+                    <item name="tableAlias" xsi:type="string">sales_shipping_address</item>
+                    <item name="columnName" xsi:type="string">company</item>
+                </item>
                 <item name="street" xsi:type="array">
                     <item name="tableAlias" xsi:type="string">sales_shipping_address</item>
                     <item name="columnName" xsi:type="string">street</item>
@@ -768,6 +772,10 @@
     <virtualType name="BillingAddressAggregator" type="Magento\Framework\DB\Sql\ConcatExpression">
         <arguments>
             <argument name="columns" xsi:type="array">
+                <item name="company" xsi:type="array">
+                    <item name="tableAlias" xsi:type="string">sales_billing_address</item>
+                    <item name="columnName" xsi:type="string">company</item>
+                </item>
                 <item name="street" xsi:type="array">
                     <item name="tableAlias" xsi:type="string">sales_billing_address</item>
                     <item name="columnName" xsi:type="string">street</item>

From 8e59e4bf4c679cb981f89b7384d00935748ff5bf Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Sat, 15 Dec 2018 11:53:27 +0530
Subject: [PATCH 283/932] Fixed-19791: Logo vertical misalignment.

---
 .../backend/Magento_Backend/web/css/source/module/_menu.less  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index ba28108326006..d0b17b3439d66 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -15,9 +15,9 @@
 
 @menu__background-color: @color-very-dark-grayish-orange;
 
-@menu-logo__padding-bottom: 2.2rem;
+@menu-logo__padding-bottom: 1.7rem;
 @menu-logo__outer-size: @menu-logo__padding-top + @menu-logo-img__height + @menu-logo__padding-bottom;
-@menu-logo__padding-top: 1.2rem;
+@menu-logo__padding-top: 1.7rem; 
 @menu-logo-img__height: 4.1rem;
 @menu-logo-img__width: 3.5rem;
 

From e30a0805eae4e2fbc448435405bf399080847dfe Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal.solanki@krishtechnolabs.com>
Date: Sat, 15 Dec 2018 14:53:22 +0530
Subject: [PATCH 284/932] Aligned sale order Invoice Update Qty button

---
 .../view/adminhtml/templates/order/invoice/create/items.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index fa5ea0568011b..2038ee004e782 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -31,9 +31,9 @@
                 <?php if ($block->canEditQty()): ?>
                 <tfoot>
                     <tr>
-                        <td colspan="2">&nbsp;</td>
-                        <td colspan="3"><?= $block->getUpdateButtonHtml() ?></td>
                         <td colspan="3">&nbsp;</td>
+                        <td><?= $block->getUpdateButtonHtml() ?></td>
+                        <td colspan="5">&nbsp;</td>
                     </tr>
                 </tfoot>
                 <?php endif; ?>

From 10e7927dbe7e3bc26618fb24706ed857a9371bd9 Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Sat, 15 Dec 2018 15:15:40 +0530
Subject: [PATCH 285/932] Fixed-19800: Contact us : design improvement.

---
 .../view/frontend/web/css/source/_module.less | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 app/code/Magento/Contact/view/frontend/web/css/source/_module.less

diff --git a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
new file mode 100644
index 0000000000000..d9314523bd2f7
--- /dev/null
+++ b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
@@ -0,0 +1,50 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+
+
+//
+//  Common
+//  _____________________________________________
+
+& when (@media-common = true) {
+    .contact-index-index {
+        .column:not(.sidebar-main){
+            .form.contact {
+                width: 50%;
+                float: none;
+            }
+        }
+        .column:not(.sidebar-additional) {
+            .form.contact {
+                width: 50%;
+                float: none;
+            }
+        }
+    }
+
+}
+
+//
+//  Mobile
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .contact-index-index {
+        .column:not(.sidebar-main){
+            .form.contact {
+                width: 100%;
+                float: none;
+            }
+        }
+        .column:not(.sidebar-additional) {
+            .form.contact {
+                width: 100%;
+                float: none;
+            }
+        }
+    }
+}
+

From 6e9ad7879ef0c2cb2324dae982c8d89ec1ec8ba5 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Sat, 15 Dec 2018 16:42:41 +0530
Subject: [PATCH 286/932] Fixed The ui-component field validation error not
 opening accordion tab that owns the field (field does not get focused)

---
 .../Magento/Ui/view/base/web/js/form/components/fieldset.js   | 4 ++++
 app/code/Magento/Ui/view/base/web/js/form/element/abstract.js | 1 +
 2 files changed, 5 insertions(+)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
index 6d33386fa1f1c..5f2fda830f5ba 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
@@ -162,6 +162,10 @@ define([
             }
 
             this.error(hasErrors || message);
+
+            if (hasErrors || message) {
+                this.open();
+            }
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
index 3b98d2c93c7a9..ca3d383accca1 100755
--- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -408,6 +408,7 @@ define([
                 isValid = this.disabled() || !this.visible() || result.passed;
 
             this.error(message);
+            this.error.valueHasMutated();
             this.bubble('error', message);
 
             //TODO: Implement proper result propagation for form

From 373fa092a62511a3aa357658e9ca33124aa8ceec Mon Sep 17 00:00:00 2001
From: Abrar pathan <abrarkhan@krishtechnolabs.com>
Date: Sat, 15 Dec 2018 18:11:50 +0530
Subject: [PATCH 287/932] Catalog category merchandiser product list missing
 move cursor in tile view

---
 .../Magento_VisualMerchandiser/web/css/source/_module.less      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
index 1cd867efdd13b..8eee978318d83 100644
--- a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
@@ -71,10 +71,12 @@
                 display: block;
                 float: left;
                 text-decoration: none;
+                cursor: move;
             }
 
             a:last-child {
                 float: right;
+                cursor: pointer;
             }
         }
 

From 536caa6fcbbadae2ace4e1bda43a0610021938fb Mon Sep 17 00:00:00 2001
From: "al.kravchuk" <al.kravchuk@ism-ukraine.com>
Date: Sat, 15 Dec 2018 14:51:05 +0200
Subject: [PATCH 288/932] magento/magento2#?: Mark not used downloadable
 blocks, tests, layout updates and templates as deprecated.

---
 .../Catalog/Product/Composite/Fieldset/Downloadable.php   | 2 ++
 .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php   | 2 ++
 .../Catalog/Product/Edit/Tab/Downloadable/Links.php       | 3 +++
 .../Catalog/Product/Edit/Tab/Downloadable/Samples.php     | 3 +++
 .../Catalog/Product/Edit/Tab/Downloadable/LinksTest.php   | 8 ++++++++
 .../Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php | 8 ++++++++
 .../adminhtml/layout/catalog_product_downloadable.xml     | 4 ++++
 .../view/adminhtml/layout/catalog_product_simple.xml      | 4 ++++
 .../layout/catalog_product_view_type_downloadable.xml     | 4 ++++
 .../view/adminhtml/layout/catalog_product_virtual.xml     | 4 ++++
 .../view/adminhtml/layout/downloadable_items.xml          | 4 ++++
 .../product/composite/fieldset/downloadable.phtml         | 1 +
 .../adminhtml/templates/product/edit/downloadable.phtml   | 1 +
 .../templates/product/edit/downloadable/links.phtml       | 1 +
 .../templates/product/edit/downloadable/samples.phtml     | 1 +
 15 files changed, 50 insertions(+)

diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
index f44d9ffe2b700..abb03de5fc376 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
@@ -14,6 +14,8 @@
 /**
  * @api
  * @since 100.0.2
+ * @deprecated
+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
  */
 class Downloadable extends \Magento\Downloadable\Block\Catalog\Product\Links
 {
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index e2694b3b93bb9..c45a5b9524599 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -15,6 +15,8 @@
  * Adminhtml catalog product downloadable items tab and form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @deprecated
+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
  */
 class Downloadable extends Widget implements TabInterface
 {
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 947e6dc1e8339..58567a1ce292b 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -10,6 +10,9 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ *
+ * @deprecated
+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links
  */
 class Links extends \Magento\Backend\Block\Template
 {
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 3c86bfb2f8d00..f245aeeeead67 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -9,6 +9,9 @@
  * Adminhtml catalog product downloadable items tab links section
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ *
+ * @deprecated
+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
  */
 class Samples extends \Magento\Backend\Block\Widget
 {
diff --git a/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
index 8b9900d747ce5..06b29fce1cd14 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
@@ -5,6 +5,14 @@
  */
 namespace Magento\Downloadable\Test\Unit\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
+/**
+ * Class LinksTest
+ *
+ * @package Magento\Downloadable\Test\Unit\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable
+ *
+ * @deprecated
+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links
+ */
 class LinksTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php b/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
index e850923bbd068..f0423606add55 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
@@ -5,6 +5,14 @@
  */
 namespace Magento\Downloadable\Test\Unit\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
+/**
+ * Class SamplesTest
+ *
+ * @package Magento\Downloadable\Test\Unit\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable
+ *
+ * @deprecated
+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
+ */
 class SamplesTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml
index 19b485f0b782f..0352c98bfa56d 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
+-->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="downloadable_items"/>
     <body>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml
index 843f9b4025649..d424db980f7a4 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
+-->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="downloadable_items"/>
 </page>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml
index d1e551ff1c96d..9c88e1ba15c4b 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_view_type_downloadable.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
+-->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="product.composite.fieldset">
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml
index 843f9b4025649..d424db980f7a4 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
+-->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="downloadable_items"/>
 </page>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/downloadable_items.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/downloadable_items.xml
index 958e922334db7..fec90e7049be2 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/downloadable_items.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/downloadable_items.xml
@@ -5,6 +5,10 @@
  * See COPYING.txt for license details.
  */
 -->
+<!--
+@deprecated Adminhtml Blocks extending for Downloadable products have neen moved to UI components
+@see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
+-->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_layout.xsd">
     <!--<referenceContainer name="product_form">-->
         <!--<block name="downloadable_items" class="Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable">-->
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
index c86eb56a39008..6ac6ecdfa6557 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// @deprecated
 // @codingStandardsIgnoreFile
 
 ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
index 7dc547c5e2752..a4443edb08e69 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// @deprecated
 // @codingStandardsIgnoreFile
 
 ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
index 3ec6010218fb6..c86019d9cd20c 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// @deprecated
 // @codingStandardsIgnoreFile
 
 ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
index 3645a184df216..947d1d0b38bef 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+// @deprecated
 // @codingStandardsIgnoreFile
 
 ?>

From dc062ad8ca1b35e5fac5e7e839527cd034d38e87 Mon Sep 17 00:00:00 2001
From: "al.kravchuk" <al.kravchuk@ism-ukraine.com>
Date: Sat, 15 Dec 2018 15:03:56 +0200
Subject: [PATCH 289/932] magento/magento2#?: Mark deprecated integration tests
 for not used classes.

---
 .../Catalog/Product/Edit/Tab/Downloadable/LinksTest.php    | 7 +++++++
 .../Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php  | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
index c743fcec1dd89..b07a6506c1b78 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
@@ -5,6 +5,13 @@
  */
 namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
+/**
+ * Class LinksTest
+ *
+ * @package Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable
+ * @deprecated
+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links
+ */
 class LinksTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
index 28d3680358329..3f3b3bd621953 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/SamplesTest.php
@@ -5,6 +5,13 @@
  */
 namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable;
 
+/**
+ * Class SamplesTest
+ *
+ * @package Magento\Downloadable\Block\Adminhtml\Catalog\Product\Edit\Tab\Downloadable
+ * @deprecated
+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
+ */
 class SamplesTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetUploadButtonsHtml()

From 26a07efbc3b4443b677b7280fb4a558637dc0130 Mon Sep 17 00:00:00 2001
From: "Leandro F. L" <lfluvisotto@gmail.com>
Date: Sat, 15 Dec 2018 23:44:10 -0200
Subject: [PATCH 290/932] Missing PHPDoc comment for method

---
 .../Model/ResourceModel/Stock/Item.php            | 15 +++++++++++++++
 .../Data/MySQLSearchDeprecationNotification.php   |  4 ++++
 .../Indexer/CustomerGroupDimensionProvider.php    |  7 +++++++
 .../Component/Form/Element/ActionDeleteTest.php   |  3 +++
 .../Component/Form/Element/CheckboxSetTest.php    |  3 +++
 .../Component/Form/Element/MultiSelectTest.php    |  3 +++
 .../Unit/Component/Form/Element/RadioSetTest.php  |  3 +++
 .../Unit/Component/Form/Element/SelectTest.php    |  3 +++
 .../Unit/Component/Form/Element/WysiwygTest.php   |  3 +++
 9 files changed, 44 insertions(+)

diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
index ce8930ad4f7a6..2ba2bc26d53b0 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
@@ -263,6 +263,11 @@ public function updateLowStockDate(int $websiteId)
         $connection->update($this->getMainTable(), $value, $where);
     }
 
+    /**
+     * @param string $tableAlias
+     *
+     * @return \Zend_Db_Expr
+     */
     public function getManageStockExpr(string $tableAlias = ''): \Zend_Db_Expr
     {
         if ($tableAlias) {
@@ -277,6 +282,11 @@ public function getManageStockExpr(string $tableAlias = ''): \Zend_Db_Expr
         return $manageStock;
     }
 
+    /**
+     * @param string $tableAlias
+     *
+     * @return \Zend_Db_Expr
+     */
     public function getBackordersExpr(string $tableAlias = ''): \Zend_Db_Expr
     {
         if ($tableAlias) {
@@ -291,6 +301,11 @@ public function getBackordersExpr(string $tableAlias = ''): \Zend_Db_Expr
         return $itemBackorders;
     }
 
+    /**
+     * @param string $tableAlias
+     *
+     * @return \Zend_Db_Expr
+     */
     public function getMinSaleQtyExpr(string $tableAlias = ''): \Zend_Db_Expr
     {
         if ($tableAlias) {
diff --git a/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php b/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php
index d3c5aa5aaa6f5..8fa9f56d78474 100644
--- a/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php
+++ b/app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php
@@ -25,6 +25,10 @@ class MySQLSearchDeprecationNotification implements \Magento\Framework\Setup\Pat
      */
     private $notifier;
 
+    /**
+     * @param \Magento\Framework\Search\EngineResolverInterface $searchEngineResolver
+     * @param \Magento\Framework\Notification\NotifierInterface $notifier
+     */
     public function __construct(
         \Magento\Framework\Search\EngineResolverInterface $searchEngineResolver,
         \Magento\Framework\Notification\NotifierInterface $notifier
diff --git a/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php b/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
index d4e0c5cce3401..0230832342b21 100644
--- a/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
+++ b/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
@@ -34,12 +34,19 @@ class CustomerGroupDimensionProvider implements DimensionProviderInterface
      */
     private $dimensionFactory;
 
+    /**
+     * @param CustomerGroupCollectionFactory $collectionFactory
+     * @param DimensionFactory $dimensionFactory
+     */
     public function __construct(CustomerGroupCollectionFactory $collectionFactory, DimensionFactory $dimensionFactory)
     {
         $this->dimensionFactory = $dimensionFactory;
         $this->collectionFactory = $collectionFactory;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function getIterator(): \Traversable
     {
         foreach ($this->getCustomerGroups() as $customerGroup) {
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
index 6f45c192d6c4c..a50e7b6aee42d 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
@@ -20,6 +20,9 @@ protected function getModelName()
         return ActionDelete::class;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function testGetComponentName()
     {
         $this->assertSame(ActionDelete::NAME, $this->getModel()->getComponentName());
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
index 025f4a1582458..bef5c184ee38b 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
@@ -22,6 +22,9 @@ protected function getModelName()
         return CheckboxSet::class;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function testGetComponentName()
     {
         $this->assertSame(CheckboxSet::NAME, $this->getModel()->getComponentName());
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
index cb91fbb945bb5..bc8eae46fd53f 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
@@ -22,6 +22,9 @@ protected function getModelName()
         return MultiSelect::class;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function testGetComponentName()
     {
         $this->contextMock->expects($this->never())->method('getProcessor');
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
index 0e0fef60df60b..d0a252b6c68c7 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
@@ -22,6 +22,9 @@ protected function getModelName()
         return RadioSet::class;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function testGetComponentName()
     {
         $this->assertSame(RadioSet::NAME, $this->getModel()->getComponentName());
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
index c695262681063..1ba5714f7ba3f 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
@@ -22,6 +22,9 @@ protected function getModelName()
         return Select::class;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function testGetComponentName()
     {
         $this->assertSame(Select::NAME, $this->getModel()->getComponentName());
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
index b345989ba05ef..0bfa5a93d3640 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
@@ -92,6 +92,9 @@ protected function getModelName()
         return Wysiwyg::class;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function testGetComponentName()
     {
         $this->assertSame(Wysiwyg::NAME, $this->getModel()->getComponentName());

From 46f47ce01f2a51747baa5e03becae4b560e3b3b2 Mon Sep 17 00:00:00 2001
From: Mariana Lashch <mlashch@magento.com>
Date: Sun, 16 Dec 2018 20:08:56 +0200
Subject: [PATCH 291/932] MAGETWO-96379: Cart Price Rule grid count and
 pagination is wrong - complete mftf test

---
 .../AdminCreateCartPriceRuleActionGroup.xml   | 11 +++++++++
 .../Section/AdminCartPriceRulesSection.xml    |  2 +-
 .../AdminGetWebsiteIdActionGroup.xml          | 24 -------------------
 3 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AdminGetWebsiteIdActionGroup.xml

diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
index 6ee7b556beb7d..adcaa429be384 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml
@@ -36,4 +36,15 @@
         <click selector="{{AdminCartPriceRulesFormSection.delete}}" stepKey="clickDeleteButton"/>
         <click selector="{{AdminCartPriceRulesFormSection.modalAcceptButton}}" stepKey="confirmDelete"/>
     </actionGroup>
+
+    <actionGroup name="CreateCartPriceRuleSecondWebsiteActionGroup">
+        <arguments>
+            <argument name="ruleName"/>
+        </arguments>
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForPriceList"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ruleName.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Second Website" stepKey="selectWebsites"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
index 55b4681580bb3..3d2682bf55713 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
@@ -16,6 +16,6 @@
         <element name="rowContainingText" type="text" selector="//*[@id='promo_quote_grid_table']/tbody/tr[td//text()[contains(., '{{var1}}')]]" parameterized="true" timeout="30"/>
         <element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
         <element name="rulesRow" type="text" selector="//tr[@data-role='row']"/>
-        <element name="buttonNextInactive" type="button" selector="//button[@class='action-next disabled']"/>
+        <element name="pageCurrent" type="text" selector="//label[@for='promo_quote_grid_page-current']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminGetWebsiteIdActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminGetWebsiteIdActionGroup.xml
deleted file mode 100644
index d7f5a6bcdb853..0000000000000
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminGetWebsiteIdActionGroup.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<!-- Admin creates new custom website -->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!--Get Website id-->
-    <actionGroup name="AdminGetWebsiteIdActionGroup">
-        <arguments>
-            <argument name="website"/>
-         </arguments>
-         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnTheStorePage"/>
-         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
-         <fillField selector="{{AdminStoresGridSection.websiteFilterTextField}}" userInput="{{website.name}}" stepKey="fillSearchWebsiteField"/>
-         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFilters" />
-         <see selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" userInput="{{website.name}}" stepKey="verifyThatCorrectWebsiteFound"/>
-         <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingWebsite"/>
-         <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabFromCurrentUrl"/>
-    </actionGroup>
-</actionGroups>
\ No newline at end of file

From 9e2d1aec605f21f8eb56f86d28416063ed1d976a Mon Sep 17 00:00:00 2001
From: Alexandre Jardin <info@ajardin.fr>
Date: Tue, 4 Dec 2018 18:41:34 +0100
Subject: [PATCH 292/932] Avoid duplicate loading of configuration files

---
 .../Theme/Model/PageLayout/Config/Builder.php    | 16 ++++++++++++----
 .../Unit/Model/PageLayout/Config/BuilderTest.php |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 98fa12ab987b6..2f0ffc4d7059e 100644
--- a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -27,6 +27,11 @@ class Builder implements \Magento\Framework\View\Model\PageLayout\Config\Builder
      */
     protected $themeCollection;
 
+    /**
+     * @var array
+     */
+    private $configFiles = [];
+
     /**
      * @param \Magento\Framework\View\PageLayout\ConfigFactory $configFactory
      * @param \Magento\Framework\View\PageLayout\File\Collector\Aggregated $fileCollector
@@ -56,11 +61,14 @@ public function getPageLayoutsConfig()
      */
     protected function getConfigFiles()
     {
-        $configFiles = [];
-        foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
-            $configFiles = array_merge($configFiles, $this->fileCollector->getFilesContent($theme, 'layouts.xml'));
+        if (empty($this->configFiles)) {
+            $configFiles = [];
+            foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
+                $configFiles[] = $this->fileCollector->getFilesContent($theme, 'layouts.xml');
+            }
+            $this->configFiles = array_merge(...$configFiles);
         }
 
-        return $configFiles;
+        return $this->configFiles;
     }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
index e5d69cbc820a1..8429be84cae44 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
@@ -83,7 +83,7 @@ public function testGetPageLayoutsConfig()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->themeCollection->expects($this->any())
+        $this->themeCollection->expects($this->once())
             ->method('loadRegisteredThemes')
             ->willReturn([$theme1, $theme2]);
 

From 985a8a15f30c08843b12fcc687bbd6aac30f918a Mon Sep 17 00:00:00 2001
From: Alexandre Jardin <info@ajardin.fr>
Date: Tue, 11 Dec 2018 21:14:08 +0100
Subject: [PATCH 293/932] Remove unneeded internal caching of options

---
 .../Model/Category/Attribute/Source/Layout.php | 18 ++++++++++++------
 .../Model/Product/Attribute/Source/Layout.php  | 18 ++++++++++++------
 .../Cms/Model/Page/Source/PageLayout.php       | 11 +++--------
 .../Theme/Model/PageLayout/Config/Builder.php  |  4 ++--
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
index 1890ea0f7d99e..20ea899a3d0d7 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
@@ -17,6 +17,12 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      */
     protected $pageLayoutBuilder;
 
+    /**
+     * @inheritdoc
+     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
+     */
+    protected $_options = null;
+
     /**
      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      */
@@ -26,14 +32,14 @@ public function __construct(\Magento\Framework\View\Model\PageLayout\Config\Buil
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllOptions()
     {
-        if (!$this->_options) {
-            $this->_options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
-            array_unshift($this->_options, ['value' => '', 'label' => __('No layout updates')]);
-        }
-        return $this->_options;
+        $options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
+        array_unshift($options, ['value' => '', 'label' => __('No layout updates')]);
+        $this->_options = $options;
+
+        return $options;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
index 63b1444d1db07..dbc7535dccfa9 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
@@ -17,6 +17,12 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      */
     protected $pageLayoutBuilder;
 
+    /**
+     * @inheritdoc
+     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
+     */
+    protected $_options = null;
+
     /**
      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      */
@@ -26,14 +32,14 @@ public function __construct(\Magento\Framework\View\Model\PageLayout\Config\Buil
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     public function getAllOptions()
     {
-        if (!$this->_options) {
-            $this->_options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
-            array_unshift($this->_options, ['value' => '', 'label' => __('No layout updates')]);
-        }
-        return $this->_options;
+        $options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
+        array_unshift($options, ['value' => '', 'label' => __('No layout updates')]);
+        $this->_options = $options;
+
+        return $options;
     }
 }
diff --git a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
index fb759348759b2..23a452c0fe58c 100644
--- a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
+++ b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
@@ -20,6 +20,7 @@ class PageLayout implements OptionSourceInterface
 
     /**
      * @var array
+     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
      */
     protected $options;
 
@@ -34,16 +35,10 @@ public function __construct(BuilderInterface $pageLayoutBuilder)
     }
 
     /**
-     * Get options
-     *
-     * @return array
+     * @inheritdoc
      */
     public function toOptionArray()
     {
-        if ($this->options !== null) {
-            return $this->options;
-        }
-
         $configOptions = $this->pageLayoutBuilder->getPageLayoutsConfig()->getOptions();
         $options = [];
         foreach ($configOptions as $key => $value) {
@@ -54,6 +49,6 @@ public function toOptionArray()
         }
         $this->options = $options;
 
-        return $this->options;
+        return $options;
     }
 }
diff --git a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 2f0ffc4d7059e..3306e5e32eb57 100644
--- a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\Framework\View\PageLayout\Config
+     * @inheritdoc
      */
     public function getPageLayoutsConfig()
     {
@@ -61,7 +61,7 @@ public function getPageLayoutsConfig()
      */
     protected function getConfigFiles()
     {
-        if (empty($this->configFiles)) {
+        if (!$this->configFiles) {
             $configFiles = [];
             foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
                 $configFiles[] = $this->fileCollector->getFilesContent($theme, 'layouts.xml');

From 099ed8718d9f09cac8fdd4464645f9f5d9fbb2dd Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Mon, 17 Dec 2018 18:32:08 +0300
Subject: [PATCH 294/932] MAGETWO-91650: Translation not working for product
 alerts

- Add bind for store id.
---
 .../Model/ResourceModel/AbstractResource.php  | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php b/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
index 710ede8ecefa6..c7b3d59138ecc 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/AbstractResource.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\ProductAlert\Model\ResourceModel;
 
+use Magento\Framework\Model\AbstractModel;
+
 /**
  * Product alert for back in abstract resource model
  *
@@ -15,13 +17,13 @@ abstract class AbstractResource extends \Magento\Framework\Model\ResourceModel\D
     /**
      * Retrieve alert row by object parameters
      *
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param AbstractModel $object
      * @return array|false
      */
-    protected function _getAlertRow(\Magento\Framework\Model\AbstractModel $object)
+    protected function _getAlertRow(AbstractModel $object)
     {
         $connection = $this->getConnection();
-        if ($object->getCustomerId() && $object->getProductId() && $object->getWebsiteId()) {
+        if ($this->isExistAllBindIds($object)) {
             $select = $connection->select()->from(
                 $this->getMainTable()
             )->where(
@@ -30,24 +32,41 @@ protected function _getAlertRow(\Magento\Framework\Model\AbstractModel $object)
                 'product_id  = :product_id'
             )->where(
                 'website_id  = :website_id'
+            )->where(
+                'store_id = :store_id'
             );
             $bind = [
                 ':customer_id' => $object->getCustomerId(),
                 ':product_id' => $object->getProductId(),
                 ':website_id' => $object->getWebsiteId(),
+                ':store_id' => $object->getStoreId()
             ];
             return $connection->fetchRow($select, $bind);
         }
         return false;
     }
 
+    /**
+     * Is exists all bind ids.
+     *
+     * @param AbstractModel $object
+     * @return bool
+     */
+    private function isExistAllBindIds(AbstractModel $object): bool
+    {
+        return ($object->getCustomerId()
+            && $object->getProductId()
+            && $object->getWebsiteId()
+            && $object->getStoreId());
+    }
+
     /**
      * Load object data by parameters
      *
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param AbstractModel $object
      * @return $this
      */
-    public function loadByParam(\Magento\Framework\Model\AbstractModel $object)
+    public function loadByParam(AbstractModel $object)
     {
         $row = $this->_getAlertRow($object);
         if ($row) {
@@ -59,13 +78,13 @@ public function loadByParam(\Magento\Framework\Model\AbstractModel $object)
     /**
      * Delete all customer alerts on website
      *
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param AbstractModel $object
      * @param int $customerId
      * @param int $websiteId
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function deleteCustomer(\Magento\Framework\Model\AbstractModel $object, $customerId, $websiteId = null)
+    public function deleteCustomer(AbstractModel $object, $customerId, $websiteId = null)
     {
         $connection = $this->getConnection();
         $where = [];

From e0ff9e7604b0255123bdcdc6b45d97707982affd Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Mon, 17 Dec 2018 12:57:46 -0600
Subject: [PATCH 295/932] MAGETWO-95034: [SPIKE] Investigate ability of
 addresses grid displaying on frontend

---
 .../Magento/Customer/Block/Address/Book.php   | 109 +++++-------------
 .../frontend/templates/address/book.phtml     |   2 +
 2 files changed, 31 insertions(+), 80 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 2076d389bb563..428e039aff4c9 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -48,6 +48,11 @@ class Book extends \Magento\Framework\View\Element\Template
      */
     private $addressesCollectionFactory;
 
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\Address\Collection
+     */
+    private $addressesCollection;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param CustomerRepositoryInterface $customerRepository
@@ -66,24 +71,15 @@ public function __construct(
         \Magento\Customer\Model\Address\Config $addressConfig,
         Mapper $addressMapper,
         array $data = [],
-        \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressesCollectionFactory,
-        \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
-        \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor = null,
-        \Magento\Framework\Api\FilterBuilder $filterBuilder,
-        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
+        \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressesCollectionFactory = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->currentCustomer = $currentCustomer;
         $this->addressRepository = $addressRepository;
         $this->_addressConfig = $addressConfig;
         $this->addressMapper = $addressMapper;
-        $this->addressesCollectionFactory = $addressesCollectionFactory;
-        $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
-        $this->collectionProcessor = $collectionProcessor ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
-            'Magento\Eav\Model\Api\SearchCriteria\CollectionProcessor'
-        );
-        $this->filterBuilder = $filterBuilder;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->addressesCollectionFactory = $addressesCollectionFactory?: ObjectManager::getInstance()
+            ->get(\Magento\Customer\Model\ResourceModel\Address\CollectionFactory::class);
 
         parent::__construct($context, $data);
     }
@@ -95,17 +91,14 @@ protected function _prepareLayout()
     {
         $this->pageConfig->getTitle()->set(__('Address Book'));
         parent::_prepareLayout();
-        if ($this->getAddresses()) {
+        $addresses = $this->getAddressesCollection();
+        if (null !== $addresses) {
             $pager = $this->getLayout()->createBlock(
                 \Magento\Theme\Block\Html\Pager::class,
                 'customer.addresses.pager'
-            )
-                ->setCollection(
-                $this->getAddresses()
-            )
-            ;
+            )->setCollection($this->getAddressesCollection());
             $this->setChild('pager', $pager);
-            $this->getAddresses()->load();
+            $this->getAddressesCollection()->load();
         }
         return $this;
     }
@@ -160,10 +153,7 @@ public function hasPrimaryAddress()
     public function getAdditionalAddresses()
     {
         try {
-            //$addresses = $this->customerRepository->getById($this->currentCustomer->getCustomerId())->getAddresses();
-
-            $addresses = $this->getAddresses();
-            // continue work here!!!
+            $addresses = $this->getAddressesCollection();
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             return false;
         }
@@ -268,71 +258,30 @@ public function getPagerHtml()
         return $this->getChildHtml('pager');
     }
 
-    /**
-     * @var \Magento\Customer\Model\ResourceModel\Address\Collection
-     */
-    private $addressesCollection;
-
-
-    /**
-     * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory
-     */
-    private $addressCollectionFactory;
-
-    /**
-     * @var \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface
-     */
-    private $extensionAttributesJoinProcessor;
-
-    /**
-     * @var \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface
-     */
-    private $collectionProcessor;
-
-    /**
-     * @var \Magento\Framework\Api\FilterBuilder
-     */
-    private $filterBuilder;
-
-    /**
-     * @var \Magento\Framework\Api\SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-
-    private function getAddresses()
+    private function getAddressesCollection()
     {
-        $customerId = $this->currentCustomer->getCustomerId();
-
-        if (!($customerId)) {
-            return false;
-        }
-        if (!$this->addressesCollection) {
-
-            $filter = $this->filterBuilder->setField('parent_id')
-                ->setValue($customerId)
-                ->setConditionType('eq')
-                ->create();
-
-
-            $searchCriteria = $this->searchCriteriaBuilder->addFilters([$filter])->create();
-
-            //$listtt = $this->addressRepository->getList($searchCriteria);
-
-            /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
+        if (null === $this->addressesCollection) {
+           /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
             $collection = $this->addressesCollectionFactory->create();
-            $this->extensionAttributesJoinProcessor->process(
-                $collection,
-                \Magento\Customer\Api\Data\AddressInterface::class
-            );
-
-            $this->collectionProcessor->process($searchCriteria, $collection);
             $collection->setOrder(
-                'created_at',
+                'entity_id',
                 'desc'
             );
+            $collection->setCustomerFilter([$this->currentCustomer->getCustomer()->getId()]);
             $this->addressesCollection = $collection;
         }
 
         return $this->addressesCollection;
     }
+
+    /**
+     * @param $countryId
+     * @return string
+     */
+    public function getCountryById($countryId) :string
+    {
+        $country = '';
+
+        return $country;
+    }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index 95e381455a293..bb68329766360 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -79,6 +79,7 @@
                         <th scope="col" class="col streetaddress"><?= /* @escapeNotVerified */ __('Street Address') ?></th>
                         <th scope="col" class="col city"><?= /* @escapeNotVerified */ __('City') ?></th>
                         <th scope="col" class="col country"><?= /* @escapeNotVerified */ __('Country') ?></th>
+                        <th scope="col" class="col state"><?= /* @escapeNotVerified */ __('State') ?></th>
                         <th scope="col" class="col zip"><?= /* @escapeNotVerified */ __('Zip/Postal Code') ?></th>
                         <th scope="col" class="col phone"><?= /* @escapeNotVerified */ __('Phone') ?></th>
                         <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
@@ -93,6 +94,7 @@
                             <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->getStreetAddress($address->getStreet()) ?></td>
                             <td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= /* @escapeNotVerified */ $address->getCity() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= /* @escapeNotVerified */ $address->getCountryId() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion()->getRegion() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= /* @escapeNotVerified */ $address->getPostcode() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= /* @escapeNotVerified */ $address->getTelephone() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">

From 3ab076bb47ddd46ff1455e98b5cfbb933f936b64 Mon Sep 17 00:00:00 2001
From: vprohorov <prohorov.vital@gmail.com>
Date: Tue, 18 Dec 2018 03:03:45 +0300
Subject: [PATCH 296/932] MAGETWO-91589: Slow query delete on sub SELECT query

- Changed from subquery to simple
---
 .../Model/ResourceModel/Category/Product.php      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php b/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
index 685a9d2828741..311cc6de76114 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ResourceModel/Category/Product.php
@@ -8,6 +8,9 @@
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\UrlRewrite\Model\Storage\DbStorage;
 
+/**
+ * Product Resource Class
+ */
 class Product extends AbstractDb
 {
     /**
@@ -38,6 +41,8 @@ protected function _construct()
     }
 
     /**
+     * Save multiple data
+     *
      * @param array $insertData
      * @return int
      */
@@ -70,7 +75,10 @@ public function removeMultiple(array $removeData)
     }
 
     /**
-     * Removes multiple entities from url_rewrite table using entities from catalog_url_rewrite_product_category
+     * Removes multiple data by filter
+     *
+     * Removes multiple entities from url_rewrite table
+     * using entities from catalog_url_rewrite_product_category
      * Example: $filter = ['category_id' => [1, 2, 3], 'product_id' => [1, 2, 3]]
      *
      * @param array $filter
@@ -78,10 +86,7 @@ public function removeMultiple(array $removeData)
      */
     public function removeMultipleByProductCategory(array $filter)
     {
-        return $this->getConnection()->delete(
-            $this->getTable(self::TABLE_NAME),
-            ['url_rewrite_id in (?)' => $this->prepareSelect($filter)]
-        );
+        return $this->getConnection()->deleteFromSelect($this->prepareSelect($filter), self::TABLE_NAME);
     }
 
     /**

From 0e0f413b01d7c73dc6f4ffbfd7b490609273467b Mon Sep 17 00:00:00 2001
From: Dmitriy Kogut <kogut.dmitriy@gmail.com>
Date: Tue, 18 Dec 2018 10:34:07 +0200
Subject: [PATCH 297/932] MAGETWO-97034: Import Products with Delete Entities

---
 .../Test/Mftf/Page/AdminImportIndexPage.xml   | 15 ++++
 .../Mftf/Section/AdminImportHeaderSection.xml | 14 ++++
 .../Mftf/Section/AdminImportMainSection.xml   | 18 +++++
 ...inImportProductsWithDeleteEntitiesTest.xml | 76 +++++++++++++++++++
 .../Section/AdminDataGridTableSection.xml     |  1 +
 .../tests/_data/catalog_products.csv          |  5 ++
 6 files changed, 129 insertions(+)
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
 create mode 100644 dev/tests/acceptance/tests/_data/catalog_products.csv

diff --git a/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
new file mode 100644
index 0000000000000..87807eb9b0e85
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminImportIndexPage" url="admin/import/" area="admin" module="Magento_ImportExport">
+        <section name="AdminImportHeaderSection"/>
+        <section name="AdminImportMainSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
new file mode 100644
index 0000000000000..748580be09406
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminImportHeaderSection">
+        <element name="checkDataButton" type="button" selector="#upload_button" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
new file mode 100644
index 0000000000000..365aca53b4dc0
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminImportMainSection">
+        <element name="entityType" type="select" selector="#entity"/>
+        <element name="importBehavior" type="select" selector="#basic_behavior"/>
+        <element name="selectFileToImport" type="input" selector="#import_file"/>
+        <element name="importButton" type="button" selector="#import_validation_container button" timeout="30"/>
+        <element name="noticeMessage" type="text" selector="#import_validation_messages .message.message-notice.notice"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
new file mode 100644
index 0000000000000..805c7141bfdff
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
@@ -0,0 +1,76 @@
+<?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="AdminImportProductsWithDeleteEntitiesTest">
+        <annotations>
+            <description value="Verify Magento native import products with delete behavior."/>
+            <stories value="Verify Magento native import products with delete behavior."/>
+            <features value="Import/Export"/>
+            <title value="Verify Magento native import products with delete behavior."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-30587"/>
+            <group value="importExport"/>
+        </annotations>
+        <before>
+            <!--Create Simple product-->
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
+                <field key="name">Simple Product for Test</field>
+                <field key="sku">Simple Product for Test</field>
+            </createData>
+            <!--Create Virtual product-->
+            <createData entity="VirtualProduct" stepKey="createVirtualProduct">
+                <field key="name">Virtual Product for Test</field>
+                <field key="sku">Virtual Product for Test</field>
+            </createData>
+            <!--Create Gift Card product-->
+            <createData entity="ApiGiftCard" stepKey="createApiGiftCard">
+                <field key="name">Api Gift Card for Test</field>
+                <field key="sku">Api Gift Card for Test</field>
+            </createData>
+            <!-- Create Downloadable product -->
+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct">
+                <field key="name">Api Downloadable Product for Test</field>
+                <field key="sku">Api Downloadable Product for Test</field>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="goToImportIndexPage"/>
+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Delete" stepKey="selectDeleteOption"/>
+        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="catalog_products.csv" stepKey="attachFileForImport"/>
+        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
+        <waitForAjaxLoad stepKey="waitForFileToImportProcessed"/>
+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
+        <waitForAjaxLoad stepKey="waitForFileToImportProcessed1"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
+        <see selector="{{AdminImportMainSection.noticeMessage}}" userInput="Created: 0, Updated: 0, Deleted: 4" stepKey="assertNoticeMessage"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchSimpleProductOnBackend">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchVirtualProductOnBackend">
+            <argument name="product" value="$$createVirtualProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage1"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchGiftCardOnBackend">
+            <argument name="product" value="$$createApiGiftCard$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage2"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchDownloadableProductOnBackend">
+            <argument name="product" value="$$createDownloadableProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage3"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
index edcc70a82396d..680b1265ec558 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
@@ -18,5 +18,6 @@
         <!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
         <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
         <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
+        <element name="dataGridNoData" type="block" selector=".data-grid-tr-no-data td"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/_data/catalog_products.csv b/dev/tests/acceptance/tests/_data/catalog_products.csv
new file mode 100644
index 0000000000000..c3be232ee8601
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/catalog_products.csv
@@ -0,0 +1,5 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
+"Simple Product for Test",,Default,simple,,base,"Simple Product for Test",,,,1,"Taxable Goods","Catalog, Search",123.0000,,,,simple-product-for-test,,,,,,,,,,,,"12/17/18, 8:49 AM","12/17/18, 8:49 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Virtual Product for Test",,Default,virtual,,base,"Virtual Product for Test",,,0.0000,1,"Taxable Goods","Catalog, Search",99.9900,,,,virtual-product-for-test,,,,,,,,,,,,"12/17/18, 8:49 AM","12/17/18, 8:49 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Api Gift Card for Test",,Default,giftcard,,base,"Api Gift Card for Test","API Product Description5c17b791672531","API Product Short Description5c17b791672a11",,1,,"Catalog, Search",,,,,api-gift-card-for-test,,,,,,,,,,,,"12/17/18, 8:49 AM","12/17/18, 8:49 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Api Downloadable Product for Test",,Default,downloadable,,base,"Api Downloadable Product for Test","API Product Description5c17b791672532","API Product Short Description5c17b791672a12",,1,"Taxable Goods","Catalog, Search",123.0000,,,,api-downloadable-product-for-test,,,,,,,,,,,,"12/17/18, 8:49 AM","12/17/18, 8:49 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,

From ac05cbbf8ee30007db3718514356dae2f9476e0b Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Tue, 18 Dec 2018 14:47:22 +0400
Subject: [PATCH 298/932] MAGETWO-96850: [2.3.x] One page Checkout resets
 Customer data if Product Qty was changed

- Add automated test script
---
 .../Section/CheckoutCartProductSection.xml    |  1 +
 ...ntOnePageCheckoutDataWhenChangeQtyTest.xml | 94 +++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index ab82d9fdd93b5..0d3c6e419cc07 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -31,5 +31,6 @@
         <element name="nthBundleOptionName" type="text" selector=".product-item-details .item-options:nth-of-type({{numOption}}) dt" parameterized="true"/>
         <element name="productSubtotalByName" type="input" selector="//main//table[@id='shopping-cart-table']//tbody//tr[..//strong[contains(@class, 'product-item-name')]//a/text()='{{var1}}'][1]//td[contains(@class, 'subtotal')]//span[@class='price']" parameterized="true"/>
         <element name="updateShoppingCartButton" type="button" selector="#form-validate button[type='submit'].update" timeout="30"/>
+        <element name="qty" type="input" selector="//input[@data-cart-item-id='{{var}}'][@title='Qty']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
new file mode 100644
index 0000000000000..778c1637a802d
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -0,0 +1,94 @@
+<?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="StorefrontOnePageCheckoutDataWhenChangeQtyTest">
+        <annotations>
+            <features value="Checkout"/>
+            <title value="One page Checkout Customer data when changing Product Qty"/>
+            <description value="One page Checkout Customer data when changing Product Qty"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-96960"/>
+            <useCaseId value="MAGETWO-96850"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!--Create a product-->
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <!--Add product to cart and checkout-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="enterEmail"/>
+        <fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="enterFirstName"/>
+        <fillField selector="{{CheckoutShippingSection.lastName}}" userInput="{{CustomerEntityOne.lastname}}" stepKey="enterLastName"/>
+        <fillField selector="{{CheckoutShippingSection.street}}" userInput="{{CustomerAddressSimple.street[0]}}" stepKey="enterStreet"/>
+        <fillField selector="{{CheckoutShippingSection.city}}" userInput="{{CustomerAddressSimple.city}}" stepKey="enterCity"/>
+        <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{CustomerAddressSimple.state}}" stepKey="selectRegion"/>
+        <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{CustomerAddressSimple.postcode}}" stepKey="enterPostcode"/>
+        <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{CustomerAddressSimple.telephone}}" stepKey="enterTelephone"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+
+        <!--Grab customer data to check it-->
+        <grabValueFrom selector="{{CheckoutShippingSection.email}}" stepKey="grabEmail"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.firstName}}" stepKey="grabFirstName"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.lastName}}" stepKey="grabLastName"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.street}}" stepKey="grabStreet"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.city}}" stepKey="grabCity"/>
+        <grabTextFrom selector="{{CheckoutShippingSection.region}}" stepKey="grabRegion"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.postcode}}" stepKey="grabPostcode"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.telephone}}" stepKey="grabTelephone"/>
+
+        <!--Select shipping method and finalize checkout-->
+        <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
+
+        <!--Go to cart page, update qty and proceed to checkout-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCartPage"/>
+        <waitForPageLoad stepKey="waitForCartPageLoad"/>
+        <see userInput="Shopping Cart" stepKey="seeCartPageIsOpened"/>
+        <fillField selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" userInput="2" stepKey="updateProductQty"/>
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCart"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+        <grabValueFrom selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" stepKey="grabQty"/>
+        <assertEquals expected="2" actual="$grabQty" stepKey="assertQty"/>
+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+
+        <!--Check that form is filled with customer data-->
+        <grabValueFrom selector="{{CheckoutShippingSection.email}}" stepKey="grabEmail1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.firstName}}" stepKey="grabFirstName1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.lastName}}" stepKey="grabLastName1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.street}}" stepKey="grabStreet1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.city}}" stepKey="grabCity1"/>
+        <grabTextFrom selector="{{CheckoutShippingSection.region}}" stepKey="grabRegion1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.postcode}}" stepKey="grabPostcode1"/>
+        <grabValueFrom selector="{{CheckoutShippingSection.telephone}}" stepKey="grabTelephone1"/>
+
+        <assertEquals expected="$grabEmail" actual="$grabEmail1" stepKey="assertEmail"/>
+        <assertEquals expected="$grabFirstName" actual="$grabFirstName1" stepKey="assertFirstName"/>
+        <assertEquals expected="$grabLastName" actual="$grabLastName1" stepKey="assertLastName"/>
+        <assertEquals expected="$grabStreet" actual="$grabStreet1" stepKey="assertStreet"/>
+        <assertEquals expected="$grabCity" actual="$grabCity1" stepKey="assertCity"/>
+        <assertEquals expected="$grabRegion" actual="$grabRegion1" stepKey="assertRegion"/>
+        <assertEquals expected="$grabPostcode" actual="$grabPostcode1" stepKey="assertPostcode"/>
+        <assertEquals expected="$grabTelephone" actual="$grabTelephone1" stepKey="assertTelephone"/>
+    </test>
+</tests>

From 89ff91c507758762696f1f6cac26d1934d614bd5 Mon Sep 17 00:00:00 2001
From: Dmitriy Kogut <kogut.dmitriy@gmail.com>
Date: Tue, 18 Dec 2018 14:15:53 +0200
Subject: [PATCH 299/932] MAGETWO-97034: Import Products with Delete Entities

---
 .../AdminImportProductsWithDeleteEntitiesTest.xml     | 11 +----------
 dev/tests/acceptance/tests/_data/catalog_products.csv |  7 +++----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
index 805c7141bfdff..c3412fa3fbc69 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
@@ -34,11 +34,6 @@
                 <field key="name">Api Gift Card for Test</field>
                 <field key="sku">Api Gift Card for Test</field>
             </createData>
-            <!-- Create Downloadable product -->
-            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct">
-                <field key="name">Api Downloadable Product for Test</field>
-                <field key="sku">Api Downloadable Product for Test</field>
-            </createData>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -55,7 +50,7 @@
         <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
         <waitForAjaxLoad stepKey="waitForFileToImportProcessed1"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
-        <see selector="{{AdminImportMainSection.noticeMessage}}" userInput="Created: 0, Updated: 0, Deleted: 4" stepKey="assertNoticeMessage"/>
+        <see selector="{{AdminImportMainSection.noticeMessage}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNoticeMessage"/>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchSimpleProductOnBackend">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
@@ -68,9 +63,5 @@
             <argument name="product" value="$$createApiGiftCard$$"/>
         </actionGroup>
         <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage2"/>
-        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchDownloadableProductOnBackend">
-            <argument name="product" value="$$createDownloadableProduct$$"/>
-        </actionGroup>
-        <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage3"/>
     </test>
 </tests>
diff --git a/dev/tests/acceptance/tests/_data/catalog_products.csv b/dev/tests/acceptance/tests/_data/catalog_products.csv
index c3be232ee8601..c6f6e03db8436 100644
--- a/dev/tests/acceptance/tests/_data/catalog_products.csv
+++ b/dev/tests/acceptance/tests/_data/catalog_products.csv
@@ -1,5 +1,4 @@
 sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
-"Simple Product for Test",,Default,simple,,base,"Simple Product for Test",,,,1,"Taxable Goods","Catalog, Search",123.0000,,,,simple-product-for-test,,,,,,,,,,,,"12/17/18, 8:49 AM","12/17/18, 8:49 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
-"Virtual Product for Test",,Default,virtual,,base,"Virtual Product for Test",,,0.0000,1,"Taxable Goods","Catalog, Search",99.9900,,,,virtual-product-for-test,,,,,,,,,,,,"12/17/18, 8:49 AM","12/17/18, 8:49 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
-"Api Gift Card for Test",,Default,giftcard,,base,"Api Gift Card for Test","API Product Description5c17b791672531","API Product Short Description5c17b791672a11",,1,,"Catalog, Search",,,,,api-gift-card-for-test,,,,,,,,,,,,"12/17/18, 8:49 AM","12/17/18, 8:49 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
-"Api Downloadable Product for Test",,Default,downloadable,,base,"Api Downloadable Product for Test","API Product Description5c17b791672532","API Product Short Description5c17b791672a12",,1,"Taxable Goods","Catalog, Search",123.0000,,,,api-downloadable-product-for-test,,,,,,,,,,,,"12/17/18, 8:49 AM","12/17/18, 8:49 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Simple Product for Test",,Default,simple,,base,"Simple Product for Test",,,,1,"Taxable Goods","Catalog, Search",123.0000,,,,simple-product-for-test,,,,,,,,,,,,"12/18/18, 5:51 AM","12/18/18, 5:51 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Virtual Product for Test",,Default,virtual,,base,"Virtual Product for Test",,,0.0000,1,"Taxable Goods","Catalog, Search",99.9900,,,,virtual-product-for-test,,,,,,,,,,,,"12/18/18, 5:52 AM","12/18/18, 5:52 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Api Gift Card for Test",,Default,giftcard,,base,"Api Gift Card for Test","API Product Description5c18df63aaebc1","API Product Short Description5c18df63aaf011",,1,,"Catalog, Search",,,,,api-gift-card-for-test,,,,,,,,,,,,"12/18/18, 5:52 AM","12/18/18, 5:52 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,

From 6512b57802a9a55dbcbc6d6685f2e3336749bb4f Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Tue, 18 Dec 2018 15:27:11 +0300
Subject: [PATCH 300/932] MAGETWO-82221: [CE 2.1.0 rc3] - Cancel an order
 [configurable product] #5313

- Fixed an issue with incorrect qty_invoiced value for configurable products;
---
 .../Sales/Model/Service/InvoiceService.php    | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Service/InvoiceService.php b/app/code/Magento/Sales/Model/Service/InvoiceService.php
index 2806f76b1389b..791274d3f23bd 100644
--- a/app/code/Magento/Sales/Model/Service/InvoiceService.php
+++ b/app/code/Magento/Sales/Model/Service/InvoiceService.php
@@ -142,10 +142,10 @@ public function prepareInvoice(Order $order, array $qtys = [])
                 continue;
             }
             $item = $this->orderConverter->itemToInvoiceItem($orderItem);
-            if ($orderItem->isDummy()) {
-                $qty = $orderItem->getQtyOrdered() ? $orderItem->getQtyOrdered() : 1;
-            } elseif (isset($qtys[$orderItem->getId()])) {
+            if (isset($qtys[$orderItem->getId()])) {
                 $qty = (double) $qtys[$orderItem->getId()];
+            } elseif ($orderItem->isDummy()) {
+                $qty = $orderItem->getQtyOrdered() ? $orderItem->getQtyOrdered() : 1;
             } elseif (empty($qtys)) {
                 $qty = $orderItem->getQtyToInvoice();
             } else {
@@ -172,27 +172,44 @@ private function prepareItemsQty(Order $order, array $qtys = [])
     {
         foreach ($order->getAllItems() as $orderItem) {
             if (empty($qtys[$orderItem->getId()])) {
-                continue;
-            }
-            if ($orderItem->isDummy()) {
-                if ($orderItem->getHasChildren()) {
-                    foreach ($orderItem->getChildrenItems() as $child) {
-                        if (!isset($qtys[$child->getId()])) {
-                            $qtys[$child->getId()] = $child->getQtyToInvoice();
-                        }
-                    }
-                } elseif ($orderItem->getParentItem()) {
-                    $parent = $orderItem->getParentItem();
-                    if (!isset($qtys[$parent->getId()])) {
-                        $qtys[$parent->getId()] = $parent->getQtyToInvoice();
-                    }
+                $parentId = $orderItem->getParentItemId();
+                if ($parentId && array_key_exists($parentId, $qtys)) {
+                    $qtys[$orderItem->getId()] = $qtys[$parentId];
+                } else {
+                    continue;
                 }
             }
+            $this->prepareItemQty($orderItem, $qtys);
         }
 
         return $qtys;
     }
 
+    /**
+     * Prepare qty to invoice item.
+     *
+     * @param Order\Item $orderItem
+     * @param array $qtys
+     * @return void
+     */
+    private function prepareItemQty(\Magento\Sales\Api\Data\OrderItemInterface $orderItem, &$qtys)
+    {
+        if ($orderItem->isDummy()) {
+            if ($orderItem->getHasChildren()) {
+                foreach ($orderItem->getChildrenItems() as $child) {
+                    if (!isset($qtys[$child->getId()])) {
+                        $qtys[$child->getId()] = $child->getQtyToInvoice();
+                    }
+                }
+            } elseif ($orderItem->getParentItem()) {
+                $parent = $orderItem->getParentItem();
+                if (!isset($qtys[$parent->getId()])) {
+                    $qtys[$parent->getId()] = $parent->getQtyToInvoice();
+                }
+            }
+        }
+    }
+
     /**
      * Check if order item can be invoiced.
      *

From b029e34e661b0740d52caf7afa65e2af911f7b1a Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Tue, 18 Dec 2018 16:24:48 +0300
Subject: [PATCH 301/932] MAGETWO-94556: Undefined variables during product
 save

- Update automated test
---
 .../Mftf/Section/AdminChooseAffectedAttributeSetSection.xml   | 1 +
 .../Test/Mftf/Test/AdminConfigurableProductCreateTest.xml     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminChooseAffectedAttributeSetSection.xml
index 4289638352990..fb83251ab287d 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="close" type="button" selector="//button[@data-index='confirm_button']/ancestor::div[@class='modal-inner-wrap']//button[@data-role='closeBtn']"  timeout="30" />
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
index bba352b16cc8a..a3da630fa2dfb 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest.xml
@@ -113,11 +113,11 @@
         <grabValueFrom selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}"  stepKey="grabTextFromContent"/>
         <fillField stepKey="fillMoreThan64Symbols" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="01234567890123456789012345678901234567890123456789012345678901234"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct1"/>
-        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickOnConfirmInPopup1"/>
+        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.close}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.close}}" visible="true" stepKey="clickOnCloseInPopup"/>
         <see stepKey="seeErrorMessage" userInput="Please enter less or equal than 64 symbols."/>
         <fillField stepKey="fillCorrectSKU" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="$grabTextFromContent"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
-        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickOnConfirmInPopup2"/>
+        <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickOnConfirmInPopup"/>
         <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
         <waitForPageLoad stepKey="waitForProductAttributes"/>

From a94e85ec7d360f30defbb69cff2741ce38c59d87 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Tue, 18 Dec 2018 08:04:32 -0600
Subject: [PATCH 302/932] MAGETWO-95034: [SPIKE] Investigate ability of
 addresses grid displaying on frontend

---
 .../Magento/Customer/Block/Address/Book.php   | 31 +++++++++++++++----
 .../frontend/templates/address/book.phtml     |  4 +--
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 428e039aff4c9..362b87a80f91a 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -8,6 +8,8 @@
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Address\Mapper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Directory\Model\CountryFactory;
 
 /**
  * Customer address book block
@@ -53,6 +55,11 @@ class Book extends \Magento\Framework\View\Element\Template
      */
     private $addressesCollection;
 
+    /**
+     * @var CountryFactory
+     */
+    private $countryFactory;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param CustomerRepositoryInterface $customerRepository
@@ -62,6 +69,7 @@ class Book extends \Magento\Framework\View\Element\Template
      * @param Mapper $addressMapper
      * @param array $data
      * @param \Magento\Customer\Model\ResourceModel\Address\Collection $addressesCollection
+     * @param CountryFactory|null $countryFactory
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -71,15 +79,17 @@ public function __construct(
         \Magento\Customer\Model\Address\Config $addressConfig,
         Mapper $addressMapper,
         array $data = [],
-        \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressesCollectionFactory = null
+        \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressesCollectionFactory = null,
+        CountryFactory $countryFactory = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->currentCustomer = $currentCustomer;
         $this->addressRepository = $addressRepository;
         $this->_addressConfig = $addressConfig;
         $this->addressMapper = $addressMapper;
-        $this->addressesCollectionFactory = $addressesCollectionFactory?: ObjectManager::getInstance()
+        $this->addressesCollectionFactory = $addressesCollectionFactory ?: ObjectManager::getInstance()
             ->get(\Magento\Customer\Model\ResourceModel\Address\CollectionFactory::class);
+        $this->countryFactory = $countryFactory ?: ObjectManager::getInstance()->get(CountryFactory::class);
 
         parent::__construct($context, $data);
     }
@@ -258,10 +268,16 @@ public function getPagerHtml()
         return $this->getChildHtml('pager');
     }
 
+    /**
+     * Get customer addresses collection.
+     * Filters collection by customer id
+     *
+     * @return \Magento\Customer\Model\ResourceModel\Address\Collection
+     */
     private function getAddressesCollection()
     {
         if (null === $this->addressesCollection) {
-           /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
+            /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
             $collection = $this->addressesCollectionFactory->create();
             $collection->setOrder(
                 'entity_id',
@@ -275,13 +291,16 @@ private function getAddressesCollection()
     }
 
     /**
+     * Get country name by $countryId
+     * Using \Magento\Directory\Model\Country to get country name by $countryId
+     *
      * @param $countryId
      * @return string
      */
     public function getCountryById($countryId) :string
     {
-        $country = '';
-
-        return $country;
+        /** @var \Magento\Directory\Model\Country $country */
+        $country = $this->countryFactory->create();
+        return $country->loadByCode($countryId)->getName();
     }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index bb68329766360..21bb1a3713120 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -93,8 +93,8 @@
                             <td data-th="<?= $block->escapeHtml(__('Last Name')) ?>" class="col lastname"><?= /* @escapeNotVerified */ $address->getLastname() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->getStreetAddress($address->getStreet()) ?></td>
                             <td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= /* @escapeNotVerified */ $address->getCity() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= /* @escapeNotVerified */ $address->getCountryId() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion()->getRegion() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= /* @escapeNotVerified */ $block->getCountryById($address->getCountryId()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= /* @escapeNotVerified */ $address->getPostcode() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= /* @escapeNotVerified */ $address->getTelephone() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">

From 116bdb2bac58eb7025c823c8428e6ec13088f027 Mon Sep 17 00:00:00 2001
From: Dmitriy Kogut <kogut.dmitriy@gmail.com>
Date: Tue, 18 Dec 2018 16:06:35 +0200
Subject: [PATCH 303/932] MAGETWO-97034: Import Products with Delete Entities

---
 .../AdminImportProductsWithDeleteEntitiesTest.xml    | 12 ++++++------
 .../acceptance/tests/_data/catalog_products.csv      |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
index c3412fa3fbc69..d65f31b7e5c80 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
@@ -29,10 +29,10 @@
                 <field key="name">Virtual Product for Test</field>
                 <field key="sku">Virtual Product for Test</field>
             </createData>
-            <!--Create Gift Card product-->
-            <createData entity="ApiGiftCard" stepKey="createApiGiftCard">
-                <field key="name">Api Gift Card for Test</field>
-                <field key="sku">Api Gift Card for Test</field>
+            <!-- Create Downloadable product -->
+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct">
+                <field key="name">Api Downloadable Product for Test</field>
+                <field key="sku">Api Downloadable Product for Test</field>
             </createData>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
@@ -59,8 +59,8 @@
             <argument name="product" value="$$createVirtualProduct$$"/>
         </actionGroup>
         <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage1"/>
-        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchGiftCardOnBackend">
-            <argument name="product" value="$$createApiGiftCard$$"/>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchDownloadableProductOnBackend">
+            <argument name="product" value="$$createDownloadableProduct$$"/>
         </actionGroup>
         <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage2"/>
     </test>
diff --git a/dev/tests/acceptance/tests/_data/catalog_products.csv b/dev/tests/acceptance/tests/_data/catalog_products.csv
index c6f6e03db8436..3b580172d6a05 100644
--- a/dev/tests/acceptance/tests/_data/catalog_products.csv
+++ b/dev/tests/acceptance/tests/_data/catalog_products.csv
@@ -1,4 +1,4 @@
 sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,deferred_stock_update,use_config_deferred_stock_update,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
-"Simple Product for Test",,Default,simple,,base,"Simple Product for Test",,,,1,"Taxable Goods","Catalog, Search",123.0000,,,,simple-product-for-test,,,,,,,,,,,,"12/18/18, 5:51 AM","12/18/18, 5:51 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
-"Virtual Product for Test",,Default,virtual,,base,"Virtual Product for Test",,,0.0000,1,"Taxable Goods","Catalog, Search",99.9900,,,,virtual-product-for-test,,,,,,,,,,,,"12/18/18, 5:52 AM","12/18/18, 5:52 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
-"Api Gift Card for Test",,Default,giftcard,,base,"Api Gift Card for Test","API Product Description5c18df63aaebc1","API Product Short Description5c18df63aaf011",,1,,"Catalog, Search",,,,,api-gift-card-for-test,,,,,,,,,,,,"12/18/18, 5:52 AM","12/18/18, 5:52 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Simple Product for Test",,Default,simple,,base,"Simple Product for Test",,,,1,"Taxable Goods","Catalog, Search",123.0000,,,,simple-product-for-test,,,,,,,,,,,,"12/18/18, 7:50 AM","12/18/18, 7:50 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Virtual Product for Test",,Default,virtual,,base,"Virtual Product for Test",,,0.0000,1,"Taxable Goods","Catalog, Search",99.9900,,,,virtual-product-for-test,,,,,,,,,,,,"12/18/18, 7:51 AM","12/18/18, 7:51 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,
+"Api Downloadable Product for Test",,Default,downloadable,,base,"Api Downloadable Product for Test","API Product Description5c18fb47982621","API Product Short Description5c18fb47982e21",,1,"Taxable Goods","Catalog, Search",123.0000,,,,api-downloadable-product-for-test,,,,,,,,,,,,"12/18/18, 7:51 AM","12/18/18, 7:51 AM",,,"Block after Info Column",,,,,,,,,,,,,,1000.0000,0.0000,1,0,0,1,1.0000,1,0.0000,1,1,,1,0,1,1,0.0000,1,0,0,0,0,1,,,,,,,,,,,,,,,,,,,

From 5702c3adfa2ae38e8d2e3818cfa724d62e14951b Mon Sep 17 00:00:00 2001
From: Mariana Lashch <mlashch@magento.com>
Date: Tue, 18 Dec 2018 17:20:09 +0200
Subject: [PATCH 304/932] MAGETWO-96379: Cart Price Rule grid count and
 pagination is wrong - fix CheckTierPricingOfProductsTest

---
 .../Mftf/Test/CheckTierPricingOfProductsTest.xml   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
index 281bad4e49591..c93f0394cdf71 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
@@ -108,6 +108,10 @@
         </actionGroup>
         <actionGroup ref="ClearProductsFilterActionGroup" stepKey="ClearProductsFilterActionGroup"/>
 
+        <!--Flush cache-->
+        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+
+
         <!--Edit customer info-->
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
             <argument name="customer" value="$$customer$$"/>
@@ -318,13 +322,17 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <createData entity="DefaultConfigCatalogPrice" stepKey="defaultConfigCatalogPrice"/>
-            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
-                <argument name="websiteName" value="secondWebsite"/>
-            </actionGroup>
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
                 <argument name="ruleName" value="ship"/>
             </actionGroup>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
+                <argument name="websiteName" value="secondWebsite"/>
+            </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
+
+            <!--Do reindex and flush cache-->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </after>
     </test>
 </tests>

From f8fb9f31d19f57d5b77486804749d0cbe7288d83 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Tue, 18 Dec 2018 20:10:28 +0400
Subject: [PATCH 305/932] MAGETWO-91688: Exception when login as restricted
 admin with access only to CMS Block

- Move test to EE.
---
 ...inRestrictedUserOnlyAccessCmsBlockTest.xml | 66 -------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml
deleted file mode 100644
index f39912b6c9440..0000000000000
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminRestrictedUserOnlyAccessCmsBlockTest.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminRestrictedUserOnlyAccessCmsBlockTest">
-        <annotations>
-            <features value="Cms"/>
-            <stories value="MAGETWO-91688: Exception when login as restricted admin with access only to CMS Block"/>
-            <title value="Check: restricted admin with access only to CMS Block"/>
-            <description value="Check that the system shows information only in Blocks"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-94804"/>
-            <group value="Cms"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
-        </before>
-
-        <!--Create restricted roles for this user. Access to Content->Blocks only-->
-        <actionGroup ref="AdminCreateRoleActionGroup" stepKey="adminCreateRole">
-            <argument name="restrictedRole" value="Blocks"/>
-            <argument name="User" value="adminRole"/>
-        </actionGroup>
-
-        <!--Create new admin user-->
-        <actionGroup ref="AdminCreateUserActionGroup" stepKey="adminCreateUser">
-            <argument name="role" value="adminRole"/>
-        </actionGroup>
-
-        <!--Log out-->
-        <actionGroup ref="SignOut" stepKey="SignOut"/>
-        <!--Log in as new user-->
-        <actionGroup ref="LoginAsAnyUser" stepKey="LoginActionGroup">
-            <argument name="uname" value="{{newAdmin.username}}"/>
-            <argument name="passwd" value="{{newAdmin.password}}"/>
-        </actionGroup>
-
-        <!--Verify that The system shows information included in "Blocks"-->
-        <see stepKey="seeBlocksPage" userInput="Blocks"/>
-        <seeInCurrentUrl url="{{CmsBlocksPage.url}}" stepKey="assertUrl"/>
-
-        <!--Log Out-->
-        <actionGroup ref="logout" stepKey="logOut1"/>
-
-        <after>
-            <!--Login as Admin-->
-            <actionGroup ref="LoginAsAdmin" stepKey="logInForDeletingCreatedData"/>
-            <!--Delete created user-->
-            <actionGroup ref="DeleteCreatedUserActionGroup" stepKey="AdminDeleteUserActionGroup">
-                <argument name="user" value="adminRole"/>
-            </actionGroup>
-            <!--Delete created role-->
-            <actionGroup ref="AdminDeleteCreatedRoleActionGroup" stepKey="AdminDeleteRoleActionGroup">
-                <argument name="role" value="adminRole"/>
-            </actionGroup>
-            <!--Log Out-->
-            <actionGroup ref="logout" stepKey="logOut2"/>
-        </after>
-    </test>
-</tests>

From 94391bdeb98bbd100313d33d1257f16c982e2a13 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Tue, 18 Dec 2018 19:09:00 +0200
Subject: [PATCH 306/932] MAGETWO-96594: Image Position issue with Associated
 Products

---
 .../view/frontend/web/js/configurable.js            | 13 ++++++++++++-
 .../view/frontend/web/js/swatch-renderer.js         |  5 +----
 lib/web/mage/gallery/gallery.js                     |  8 ++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
index 78974877dd90d..5021ef8ec3d74 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -291,6 +291,7 @@ define([
             images = this.options.spConfig.images[this.simpleProduct];
 
             if (images) {
+                images = this._sortImages(images);
                 if (this.options.gallerySwitchStrategy === 'prepend') {
                     images = images.concat(initialImages);
                 }
@@ -309,7 +310,17 @@ define([
                 $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
             }
 
-            galleryObject.first();
+        },
+
+        /**
+         * Sorting images array
+         *
+         * @private
+         */
+        _sortImages: function (images) {
+            return _.sortBy(images, function (image) {
+                return image.position;
+            });
         },
 
         /**
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index ca39516c13a00..938028f62502d 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -695,7 +695,7 @@ define([
          */
         _sortImages: function (images) {
             return _.sortBy(images, function (image) {
-                return image.isMain === true ? -1 : image.position;
+                return image.position;
             });
         },
 
@@ -1243,9 +1243,6 @@ define([
                         dataMergeStrategy: this.options.gallerySwitchStrategy
                     });
                 }
-
-                gallery.first();
-
             } else if (justAnImage && justAnImage.img) {
                 context.find('.product-image-photo').attr('src', justAnImage.img);
             }
diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js
index db98a1cc39a30..de43d41c7b1c4 100644
--- a/lib/web/mage/gallery/gallery.js
+++ b/lib/web/mage/gallery/gallery.js
@@ -472,8 +472,16 @@ define([
                      * @param {Array.<Object>} data - Set of gallery items to update.
                      */
                     updateData: function (data) {
+                        var mainImageIndex;
                         if (_.isArray(data)) {
                             settings.fotoramaApi.load(data);
+                            mainImageIndex = getMainImageIndex(data);
+                            if (mainImageIndex) {
+                                settings.fotoramaApi.show({
+                                    index: mainImageIndex,
+                                    time: 0
+                                });
+                            }
 
                             $.extend(false, settings, {
                                 data: data,

From 1dc27c1bd245402a894035e52ff53f02dc329451 Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@Devagoudas-MacBook-Pro.local>
Date: Wed, 19 Dec 2018 13:00:14 +0530
Subject: [PATCH 307/932] MC-5593: [Modularity] Braintree module MFTF contain
 wide used sections and action groups - Moved/updated files and deleted some
 to remove deplication

---
 .../Test/Mftf/Section/AdminMenuSection.xml    |  6 ++++
 .../AdminOrderBraintreeFillActionGroup.xml    |  2 +-
 .../ConfigureBraintreeActionGroup.xml         |  2 +-
 .../Mftf/Section/AdminEditRoleInfoSection.xml | 21 --------------
 .../Mftf/Section/AdminEditUserRoleSection.xml | 17 -----------
 .../Mftf/Section/AdminEditUserSection.xml     | 28 -------------------
 .../Test/Mftf/Section/AdminMenuSection.xml    | 23 ---------------
 .../Mftf/Section/AdminRoleGridSection.xml     | 17 -----------
 .../Section/BraintreeConfiguraionSection.xml  |  3 +-
 .../Section/ConfigurationPaymentSection.xml   |  4 +--
 .../Mftf/Section/StoresSubmenuSection.xml     | 14 ----------
 .../CreateNewProductActionGroup.xml           |  4 +--
 .../ActionGroup/DeleteProductActionGroup.xml  |  2 +-
 .../Test/Mftf/Data/NewProductData.xml         |  2 +-
 .../Mftf/Section/CatalogSubmenuSection.xml    |  2 +-
 .../Mftf/Section/NewProductPageSection.xml    |  2 +-
 .../Test/Mftf/Section/ProductsPageSection.xml |  2 +-
 .../ActionGroup/CreateCustomerActionGroup.xml |  2 +-
 .../ActionGroup/DeleteCustomerActionGroup.xml |  0
 .../ActionGroup/SwitchAccountActionGroup.xml  |  3 +-
 .../Test/Mftf/Data/NewCustomerData.xml        |  2 +-
 .../Mftf/Section/AdminCreateUserSection.xml   |  3 +-
 .../Mftf/Section/AdminDeleteUserSection.xml   |  3 +-
 .../Mftf/Section/AdminUserGridSection.xml     |  3 +-
 .../Mftf/Section/CustomersPageSection.xml     |  2 +-
 .../Mftf/Section/CustomersSubmenuSection.xml  |  2 +-
 .../Mftf/Section/NewCustomerPageSection.xml   |  2 +-
 .../Mftf/Section/SwitchAccountSection.xml     |  3 +-
 .../ActionGroup/CreateNewOrderActionGroup.xml |  3 +-
 .../Mftf/Section/ConfigurationListSection.xml |  2 +-
 .../Test/Mftf/Section/NewOrderSection.xml     |  3 +-
 .../Mftf/ActionGroup/AdminTaxActionGroup.xml  |  8 +++---
 .../Mftf/Section/AdminCreateRoleSection.xml   |  3 +-
 .../Mftf/Section/AdminDeleteRoleSection.xml   |  5 ++--
 .../Mftf/Section/AdminEditUserSection.xml     |  6 +++-
 35 files changed, 50 insertions(+), 156 deletions(-)
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
 delete mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml (84%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml (86%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Data/NewProductData.xml (66%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Section/CatalogSubmenuSection.xml (68%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Section/NewProductPageSection.xml (81%)
 rename app/code/Magento/{Braintree => Catalog}/Test/Mftf/Section/ProductsPageSection.xml (84%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml (94%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml (100%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml (85%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Data/NewCustomerData.xml (77%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/AdminCreateUserSection.xml (82%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/AdminDeleteUserSection.xml (69%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/AdminUserGridSection.xml (75%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/CustomersPageSection.xml (84%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/CustomersSubmenuSection.xml (68%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/NewCustomerPageSection.xml (92%)
 rename app/code/Magento/{Braintree => Customer}/Test/Mftf/Section/SwitchAccountSection.xml (78%)
 rename app/code/Magento/{Braintree => Sales}/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml (90%)
 rename app/code/Magento/{Braintree => Sales}/Test/Mftf/Section/ConfigurationListSection.xml (72%)
 rename app/code/Magento/{Braintree => Sales}/Test/Mftf/Section/NewOrderSection.xml (90%)
 rename app/code/Magento/{Braintree => User}/Test/Mftf/Section/AdminCreateRoleSection.xml (84%)
 rename app/code/Magento/{Braintree => User}/Test/Mftf/Section/AdminDeleteRoleSection.xml (64%)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index 9e4a6d9219526..30c3c4bbca3b3 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -16,5 +16,11 @@
         <element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
         <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
         <element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
+        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
+        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
+        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
+        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
+        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
+        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
index c2e6af9dcd735..eb909e967fb75 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
 
     <actionGroup name="AdminOrderBraintreeFillActionGroup">
         <!--Select Braintree Payment method on Admin Order Create Page-->
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
index 9eaae8b33e73f..cbb065704fbc1 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml
@@ -12,7 +12,7 @@
         <!-- GoTo ConfigureBraintree fields -->
         <click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
         <waitForPageLoad stepKey="waitForConfiguration" time="2"/>
-        <click stepKey="clickOnConfigurations" selector="{{StoresSubmenuSection.configuration}}" />
+        <click stepKey="clickOnConfigurations" selector="{{AdminMenuSection.configuration}}" />
         <waitForPageLoad stepKey="waitForSales" time="2"/>
         <click stepKey="clickOnSales" selector="{{ConfigurationListSection.sales}}" />
         <waitForPageLoad stepKey="waitForPaymentMethods" time="2"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
deleted file mode 100644
index e37ce8f4738b3..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminEditRoleInfoSection">
-        <element name="roleName" type="input" selector="#role_name"/>
-        <element name="password" type="input" selector="#current_password"/>
-        <element name="roleResourcesTab" type="button" selector="#role_info_tabs_account"/>
-        <element name="backButton" type="button" selector="button[title='Back']"/>
-        <element name="resetButton" type="button" selector="button[title='Reset']"/>
-        <element name="deleteButton" type="button" selector="button[title='Delete Role']"/>
-        <element name="saveButton" type="button" selector="button[title='Save Role']"/>
-        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
-        <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
-        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
deleted file mode 100644
index e999413c96d74..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminEditUserRoleSection">
-        <element name="usernameTextField" type="input" selector="#user_username"/>
-        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
deleted file mode 100644
index 2e5fcfb7b5c8d..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminEditUserSection">
-        <element name="system" type="input" selector="#menu-magento-backend-system"/>
-        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
-        <element name="create" type="input" selector="#add"/>
-        <element name="usernameTextField" type="input" selector="#user_username"/>
-        <element name="firstNameTextField" type="input" selector="#user_firstname"/>
-        <element name="lastNameTextField" type="input" selector="#user_lastname"/>
-        <element name="emailTextField" type="input" selector="#user_email"/>
-        <element name="passwordTextField" type="input" selector="#user_password"/>
-        <element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
-        <element name="currentPasswordField" type="input" selector="#user_current_password"/>
-        <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
-        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-        <element name="saveButton" type="button" selector="#save"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
deleted file mode 100644
index eb7a9ce2c376e..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminMenuSection">
-        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
-        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
-        <element name="catalog" type="button" selector="//li[@id='menu-magento-catalog-catalog']"/>
-        <element name="customers" type="button" selector="//li[@id='menu-magento-customer-customer']"/>
-        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
-        <element name="content" type="button" selector="//li[@id='menu-magento-backend-content']"/>
-        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
-        <element name="stores" type="button" selector="//li[@id='menu-magento-backend-stores']"/>
-        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
-        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
deleted file mode 100644
index 63cbadc71d3d3..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminRoleGridSection">
-        <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
-        <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
-        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
-        <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
-        <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
-        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
-    </section>
-</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
index 016af2e102744..98dc849644fe9 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BraintreeConfiguraionSection">
         <element name="titleForBraintreeSettings" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_title']"/>
         <element name="environment" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_environment']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
index 885a45be721f1..8632dc62cd19d 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
@@ -7,8 +7,8 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="ConfigurationPaymentSection">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+         <section name="ConfigurationPaymentSection">
         <element name="configureButton" type="button" selector="//button[@id='payment_us_braintree_section_braintree-head']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
deleted file mode 100644
index f094baa9f3446..0000000000000
--- a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StoresSubmenuSection">
-        <element name="configuration" type="button" selector="//li[@id='menu-magento-backend-stores']//li[@data-ui-id='menu-magento-config-system-config']"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
index 19de3e859ae9a..bad5eec86bc90 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
@@ -6,8 +6,8 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="CreateNewProductActionGroup">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+                 <actionGroup name="CreateNewProductActionGroup">
 
         <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
         <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
similarity index 86%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
index 724c6d92846c4..d6f9d03271f55 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeleteProductActionGroup">
         <arguments>
             <argument name="productName" defaultValue=""/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
similarity index 66%
rename from app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
rename to app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.xml
index 72661ae94076f..ff13217cbcb53 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/NewProductData.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="NewProductData" type="braintree_config_state">
         <data key="ProductName">ProductTest</data>
         <data key="Price">100</data>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
similarity index 68%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
index 32f02a69f817e..84a81c5204acc 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/CatalogSubmenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CatalogSubmenuSection">
         <element name="products" type="button" selector="//li[@id='menu-magento-catalog-catalog']//li[@data-ui-id='menu-magento-catalog-catalog-products']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
similarity index 81%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
index 42e451940c91b..b98bd47b54132 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/NewProductPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewProductPageSection">
         <element name="productName" type="input" selector="//input[@name='product[name]']"/>
         <element name="sku" type="input" selector="//input[@name='product[sku]']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
index 267efdf3d0e5e..6cf56f7baacae 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/ProductsPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ProductsPageSection">
         <element name="addProductButton" type="button" selector="//button[@id='add_new_product-button']"/>
         <element name="checkboxForProduct" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
similarity index 94%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
index a68042127ec48..de24616b8adc9 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateCustomerActionGroup">
         <click stepKey="openCustomers" selector="{{AdminMenuSection.customers}}"/>
         <waitForAjaxLoad stepKey="waitForCatalogSubmenu" time="5"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
similarity index 100%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/DeleteCustomerActionGroup.xml
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
similarity index 85%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
index 7c774a634b369..c3963f3dbef97 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
@@ -6,8 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Sign out-->
     <actionGroup name="SignOut">
         <click selector="{{SignOutSection.admin}}" stepKey="clickToAdminProfile"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
similarity index 77%
rename from app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
rename to app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.xml
index 30345ec31bacd..9c1e7c48a74a2 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/NewCustomerData.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="NewCustomerData" type="braintree_config_state">
         <data key="FirstName">Abgar</data>
         <data key="LastName">Abgaryan</data>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
similarity index 82%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
index 98d748b5a30ea..9eaf0ae33d15b 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCreateUserSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateUserSection">
         <element name="system" type="input" selector="#menu-magento-backend-system"/>
         <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
similarity index 69%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
index bf2e2b44eb602..af48b8f78216a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDeleteUserSection">
         <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
         <element name="password" selector="#user_current_password" type="input"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
similarity index 75%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
index 9564bc61f799c..9f51822684254 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminUserGridSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminUserGridSection">
         <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
index e4a75b1b6a842..60c635387199a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CustomersPageSection">
         <element name="addNewCustomerButton" type="button" selector="//*[@id='add']"/>
         <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
similarity index 68%
rename from app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
index 937afb83da96f..6eeef1ba9daf0 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/CustomersSubmenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CustomersSubmenuSection">
         <element name="allCustomers" type="button" selector="//li[@id='menu-magento-customer-customer']//li[@data-ui-id='menu-magento-customer-customer-manage']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
similarity index 92%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
index d302f9c7d0cba..db11f2d260b15 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/NewCustomerPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewCustomerPageSection">
         <element name="associateToWebsite" type="select" selector="//*[@class='admin__field-control _with-tooltip']//*[@class='admin__control-select']"/>
         <element name="group" type="select" selector="//div[@class='admin__field-control admin__control-fields required']//div[@class='admin__field-control']//select[@class='admin__control-select']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
similarity index 78%
rename from app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
rename to app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
index 3a07cbc6dd145..e7655924133e1 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/SwitchAccountSection.xml
@@ -7,8 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="LoginFormSection">
         <element name="username" type="input" selector="#username"/>
         <element name="password" type="input" selector="#login"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
similarity index 90%
rename from app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
rename to app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
index 17d634c009b3e..93434471fe38f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -6,8 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="useBraintreeForMasterCard">
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
         <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
similarity index 72%
rename from app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
index 100407438eaae..bce5f95cf78a6 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/ConfigurationListSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ConfigurationListSection">
         <element name="sales" type="button" selector="//div[contains(@class, 'admin__page-nav-title title _collapsible')]/strong[text()='Sales']"/>
         <element name="salesPaymentMethods" type="button" selector="//span[text()='Payment Methods']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
similarity index 90%
rename from app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
rename to app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
index 13f59ad2cf18e..cde46c1ad63e8 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/NewOrderSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewOrderSection">
         <element name="createNewOrder" type="button" selector="#add"/>
         <element name="customer" type="button" selector="//td[contains(text(), 'Abgar')]"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
index b3395bd4afaa9..33b1db76d09db 100644
--- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -128,12 +128,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales" time="5"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1" time="5"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
@@ -156,12 +156,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales" time="5"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1" time="5"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1" time="5"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
index 1158f471d51f0..eb8344008794f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -5,7 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateRoleSection">
         <element name="create" type="button" selector="#add"/>
         <element name="name" type="button" selector="#role_name"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
similarity index 64%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
index 220c9a444b02f..d3b19a3f00bcf 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="AdminDeleteRoleSection">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+<section name="AdminDeleteRoleSection">
         <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
         <element name="current_pass" type="button" selector="#current_password"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
index 5b866b45e2fbe..64068a0a5ef58 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
@@ -5,8 +5,12 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditUserSection">
+        <element name="system" type="input" selector="#menu-magento-backend-system"/>
+        <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
+        <element name="create" type="input" selector="#add"/>
         <element name="usernameTextField" type="input" selector="#user_username"/>
         <element name="firstNameTextField" type="input" selector="#user_firstname"/>
         <element name="lastNameTextField" type="input" selector="#user_lastname"/>

From e21aae365e4b17dbadc825adeb4cf063be887662 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Wed, 19 Dec 2018 10:02:45 +0200
Subject: [PATCH 308/932] MAGETWO-96594: Image Position issue with Associated
 Products

---
 .../ConfigurableProduct/view/frontend/web/js/configurable.js     | 1 +
 lib/web/mage/gallery/gallery.js                                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
index 5021ef8ec3d74..6357bbd6c7c0c 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -292,6 +292,7 @@ define([
 
             if (images) {
                 images = this._sortImages(images);
+
                 if (this.options.gallerySwitchStrategy === 'prepend') {
                     images = images.concat(initialImages);
                 }
diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js
index de43d41c7b1c4..00604fce89cdd 100644
--- a/lib/web/mage/gallery/gallery.js
+++ b/lib/web/mage/gallery/gallery.js
@@ -473,6 +473,7 @@ define([
                      */
                     updateData: function (data) {
                         var mainImageIndex;
+
                         if (_.isArray(data)) {
                             settings.fotoramaApi.load(data);
                             mainImageIndex = getMainImageIndex(data);

From 4d299eb1294fecb16f89df80525de2fe198c7310 Mon Sep 17 00:00:00 2001
From: Vinoth Kumar <vinogcs@users.noreply.github.com>
Date: Wed, 19 Dec 2018 14:37:50 +0530
Subject: [PATCH 309/932] Added required error message.

If any JSON error occurs user will be be shown error message if the app mode is not in Production.
---
 .../Framework/Serialize/Serializer/Json.php   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index e352d0c2d7124..dc56ee8867589 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -15,6 +15,12 @@
  */
 class Json implements SerializerInterface
 {
+    private $appState = NULL;
+
+    public function __construct(){
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $this->appState = $this->objectmanager->get('Magento\Framework\App\State');
+    }
     /**
      * {@inheritDoc}
      * @since 100.2.0
@@ -23,7 +29,11 @@ public function serialize($data)
     {
         $result = json_encode($data);
         if (false === $result) {
-            throw new \InvalidArgumentException('Unable to serialize value.');
+            $errorMessage = "Unable to serialize value.";
+            if(!$this->isOnProduction()){
+                $errorMessage .= "Error: " . json_last_error_msg();
+            }
+            throw new \InvalidArgumentException($errorMessage);
         }
         return $result;
     }
@@ -36,8 +46,16 @@ public function unserialize($string)
     {
         $result = json_decode($string, true);
         if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new \InvalidArgumentException('Unable to unserialize value.');
+            $errorMessage = "Unable to unserialize value.";
+            if(!$this->isOnProduction()){
+                $errorMessage .= "Error: " . json_last_error_msg();
+            }
+            throw new \InvalidArgumentException($errorMessage);
         }
         return $result;
     }
+    
+    private function isOnProduction(){
+        return $this->appState === \Magento\Framework\App\State::MODE_PRODUCTION;
+    }
 }

From 0a868f7aeac4c68f9dae4fc646734351e1ecf6e5 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Wed, 19 Dec 2018 11:32:57 +0200
Subject: [PATCH 310/932] MAGETWO-96594: Image Position issue with Associated
 Products

---
 lib/web/mage/gallery/gallery.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/web/mage/gallery/gallery.js b/lib/web/mage/gallery/gallery.js
index 00604fce89cdd..15c3d01cf2be3 100644
--- a/lib/web/mage/gallery/gallery.js
+++ b/lib/web/mage/gallery/gallery.js
@@ -477,6 +477,7 @@ define([
                         if (_.isArray(data)) {
                             settings.fotoramaApi.load(data);
                             mainImageIndex = getMainImageIndex(data);
+
                             if (mainImageIndex) {
                                 settings.fotoramaApi.show({
                                     index: mainImageIndex,

From c4f9b60e5c255a540a391d8e00bd07fc54e53e78 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Wed, 19 Dec 2018 12:40:26 +0300
Subject: [PATCH 311/932] MAGETWO-94556: Undefined variables during product
 save

- Update automated test
---
 .../Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index 2e4b9c6cb0430..611f12a39b510 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductGridFilterSection">
-        <element name="filters" type="button" selector="//button[text()='Filters']"/>
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
         <element name="clearAll" type="button" selector=".admin__data-grid-header .admin__data-grid-filters-current._show .action-clear" timeout="30"/>
         <element name="enabledFilters" type="textarea" selector=".admin__data-grid-header .admin__data-grid-filters-current._show"/>
         <element name="basicSearchFilter" type="textarea" selector=".admin__control-text.data-grid-search-control"/>

From 959beff3e8448f202ab0f06d942b638ffd5caf1b Mon Sep 17 00:00:00 2001
From: Vinoth Kumar <vinogcs@users.noreply.github.com>
Date: Wed, 19 Dec 2018 15:32:41 +0530
Subject: [PATCH 312/932] Fixed Unused Local variable

---
 lib/internal/Magento/Framework/Serialize/Serializer/Json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index dc56ee8867589..d3b56e97bd58c 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -19,7 +19,7 @@ class Json implements SerializerInterface
 
     public function __construct(){
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->appState = $this->objectmanager->get('Magento\Framework\App\State');
+        $this->appState = $objectmanager->get('Magento\Framework\App\State');
     }
     /**
      * {@inheritDoc}

From b2c1890d1ac0875b6094e671f228a315125825d3 Mon Sep 17 00:00:00 2001
From: Vinoth Kumar <vinogcs@users.noreply.github.com>
Date: Wed, 19 Dec 2018 15:35:03 +0530
Subject: [PATCH 313/932] Fixed unused local variable

---
 lib/internal/Magento/Framework/Serialize/Serializer/Json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index d3b56e97bd58c..053576eda8b74 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -19,7 +19,7 @@ class Json implements SerializerInterface
 
     public function __construct(){
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->appState = $objectmanager->get('Magento\Framework\App\State');
+        $this->appState = $objectManager->get('Magento\Framework\App\State');
     }
     /**
      * {@inheritDoc}

From 143120bced6cb455999aa25725700f5f4f0258c7 Mon Sep 17 00:00:00 2001
From: Vinoth Kumar <vinogcs@users.noreply.github.com>
Date: Wed, 19 Dec 2018 16:48:29 +0530
Subject: [PATCH 314/932] Removed use of Class ObjectManager in Construct

---
 .../Magento/Framework/Serialize/Serializer/Json.php    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index 053576eda8b74..7f1e69d3f2c4d 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -15,12 +15,6 @@
  */
 class Json implements SerializerInterface
 {
-    private $appState = NULL;
-
-    public function __construct(){
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->appState = $objectManager->get('Magento\Framework\App\State');
-    }
     /**
      * {@inheritDoc}
      * @since 100.2.0
@@ -56,6 +50,8 @@ public function unserialize($string)
     }
     
     private function isOnProduction(){
-        return $this->appState === \Magento\Framework\App\State::MODE_PRODUCTION;
+        $appState = \Magento\Framework\App\ObjectManager::getInstance()
+            ->get('Magento\Framework\App\State');
+        return $appState === \Magento\Framework\App\State::MODE_PRODUCTION;
     }
 }

From 36531bc5a182cbd2039f114f93ddc3391fe42e02 Mon Sep 17 00:00:00 2001
From: Dmitriy Kogut <kogut.dmitriy@gmail.com>
Date: Wed, 19 Dec 2018 14:40:36 +0200
Subject: [PATCH 315/932] MAGETWO-97034: Import Products with Delete Entities

---
 .../Test/Mftf/Section/AdminMessagesSection.xml       |  1 +
 .../Test/Mftf/Section/AdminImportMainSection.xml     |  1 -
 ...=> AdminImportProductsWithDeleteBehaviorTest.xml} | 12 +++++-------
 .../Test/Mftf/Section/AdminDataGridTableSection.xml  |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename app/code/Magento/ImportExport/Test/Mftf/Test/{AdminImportProductsWithDeleteEntitiesTest.xml => AdminImportProductsWithDeleteBehaviorTest.xml} (81%)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
index b1350d5dcc1d7..88e740d689cdd 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
@@ -12,5 +12,6 @@
         <element name="success" type="text" selector="#messages div.message-success"/>
         <element name="nthSuccess" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
         <element name="error" type="text" selector="#messages div.message-error"/>
+        <element name="notice" type="text" selector=".message.message-notice.notice"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
index 365aca53b4dc0..2ce6b1e35777f 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
@@ -13,6 +13,5 @@
         <element name="importBehavior" type="select" selector="#basic_behavior"/>
         <element name="selectFileToImport" type="input" selector="#import_file"/>
         <element name="importButton" type="button" selector="#import_validation_container button" timeout="30"/>
-        <element name="noticeMessage" type="text" selector="#import_validation_messages .message.message-notice.notice"/>
     </section>
 </sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
similarity index 81%
rename from app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
rename to app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
index d65f31b7e5c80..4cbb0603d9073 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteEntitiesTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminImportProductsWithDeleteBehaviorTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminImportProductsWithDeleteEntitiesTest">
+    <test name="AdminImportProductsWithDeleteBehaviorTest">
         <annotations>
             <description value="Verify Magento native import products with delete behavior."/>
             <stories value="Verify Magento native import products with delete behavior."/>
@@ -46,22 +46,20 @@
         <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Delete" stepKey="selectDeleteOption"/>
         <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="catalog_products.csv" stepKey="attachFileForImport"/>
         <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
-        <waitForAjaxLoad stepKey="waitForFileToImportProcessed"/>
         <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-        <waitForAjaxLoad stepKey="waitForFileToImportProcessed1"/>
         <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage"/>
-        <see selector="{{AdminImportMainSection.noticeMessage}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNoticeMessage"/>
+        <see selector="{{AdminMessagesSection.notice}}" userInput="Created: 0, Updated: 0, Deleted: 3" stepKey="assertNotice"/>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchSimpleProductOnBackend">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
-        <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage"/>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchVirtualProductOnBackend">
             <argument name="product" value="$$createVirtualProduct$$"/>
         </actionGroup>
-        <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage1"/>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage1"/>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchDownloadableProductOnBackend">
             <argument name="product" value="$$createDownloadableProduct$$"/>
         </actionGroup>
-        <see selector="{{AdminDataGridTableSection.dataGridNoData}}" userInput="We couldn't find any records." stepKey="assertDataGridNoDataMessage2"/>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
index 680b1265ec558..a2b7ba8c1ffd5 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
@@ -18,6 +18,6 @@
         <!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
         <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
         <element name="rowViewAction" type="button" selector=".data-grid tbody > tr:nth-of-type({{row}}) .action-menu-item" parameterized="true" timeout="30"/>
-        <element name="dataGridNoData" type="block" selector=".data-grid-tr-no-data td"/>
+        <element name="dataGridEmpty" type="block" selector=".data-grid-tr-no-data td"/>
     </section>
 </sections>

From bf643485567979e6bc3c5d9f348b5f08e1eea74a Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 19 Dec 2018 13:46:41 +0100
Subject: [PATCH 316/932] Mutation placeholder removed

---
 app/code/Magento/GraphQl/etc/schema.graphqls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
index 2281495d059e1..7ea715097cdf3 100644
--- a/app/code/Magento/GraphQl/etc/schema.graphqls
+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -5,7 +5,6 @@ type Query {
 }
 
 type Mutation {
-    placeholderMutation: String @doc(description: "Mutation type cannot be declared without fields. The placeholder will be removed when at least one mutation field is declared.")
 }
 
 input FilterTypeInput @doc(description: "FilterTypeInput specifies which action will be performed in a query ") {

From ab5c2971ca88abec3cd6f3fa02889d00ac9a96cc Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 19 Dec 2018 15:53:31 +0300
Subject: [PATCH 317/932] MAGETWO-71344: Update product from mini shopping cart
 doesn't reflect in the shopping cart

- Reload shopping cart after updating in mini cart.
---
 app/code/Magento/Checkout/view/frontend/web/js/sidebar.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index dde1ad72ba15e..2ebe2fe6b330c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -25,6 +25,7 @@ define([
             }
         },
         scrollHeight: 0,
+        shoppingCartUrl: window.checkout.shoppingCartUrl,
 
         /**
          * Create sidebar.
@@ -215,6 +216,9 @@ define([
                 'item_id': itemId,
                 'item_qty': $('#cart-item-' + itemId + '-qty').val()
             }, elem, this._updateItemQtyAfter);
+            if (window.location.href === this.shoppingCartUrl) {
+                window.location.reload(false);
+            }
         },
 
         /**

From f254504bfec3b8067960343605cf35dad8b7b522 Mon Sep 17 00:00:00 2001
From: Oksana_Kremen <Oksana_Kremen@epam.com>
Date: Wed, 19 Dec 2018 16:00:00 +0200
Subject: [PATCH 318/932] MAGETWO-62495: Products change in one category will
 cause cache miss for other categories (Only reproducible by unassigning
 products from backend category page)

- Fixed incorrect formatting of PURGE requests to Varnish
- Removed unnecessary cache tag invalidation after product changes in the category
---
 app/code/Magento/CacheInvalidate/Model/PurgeCache.php | 4 ++--
 app/code/Magento/Catalog/Model/Category.php           | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 727e18280d76f..2152f842d4a29 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -94,7 +94,7 @@ private function splitTags($tagsPattern)
         $formattedTags = explode('|', $tagsPattern);
         foreach ($formattedTags as $formattedTag) {
             if ($tagsBatchSize + strlen($formattedTag) > $this->requestSize - count($formattedTagsChunk) - 1) {
-                yield implode('|', array_unique($formattedTagsChunk));
+                yield implode('|', $formattedTagsChunk);
                 $formattedTagsChunk = [];
                 $tagsBatchSize = 0;
             }
@@ -103,7 +103,7 @@ private function splitTags($tagsPattern)
             $formattedTagsChunk[] = $formattedTag;
         }
         if (!empty($formattedTagsChunk)) {
-            yield implode('|', array_unique($formattedTagsChunk));
+            yield implode('|', $formattedTagsChunk);
         }
     }
 
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 29fb0d282a87c..1f62bed93e23f 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -1152,13 +1152,14 @@ public function getIdentities()
         $identities = [
             self::CACHE_TAG . '_' . $this->getId(),
         ];
-        if (!$this->getId() || $this->hasDataChanges()
-            || $this->isDeleted() || $this->dataHasChangedFor(self::KEY_INCLUDE_IN_MENU)
-        ) {
+        if ($this->hasDataChanges()) {
+            $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $this->getId();
+        }
+        if (!$this->getId() || $this->isDeleted() || $this->dataHasChangedFor(self::KEY_INCLUDE_IN_MENU)) {
             $identities[] = self::CACHE_TAG;
             $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $this->getId();
         }
-        return $identities;
+        return array_unique($identities);
     }
 
     /**

From 60efe627c36390f68e130f0ceae87b1f6518bbc9 Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@ip-192-168-1-15.ec2.internal>
Date: Wed, 19 Dec 2018 19:30:02 +0530
Subject: [PATCH 319/932] MC-5593: [Modularity] Braintree module MFTF contain
 wide used sections and action groups - removed unwanted wait paramateres from
 waitForPageLoad

---
 .../CreateAnAdminOrderUsingBraintreePaymentTest1.xml   |  4 ++--
 .../Mftf/ActionGroup/CreateNewOrderActionGroup.xml     | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
index 2ddefa40b536c..35d03d69b662f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -74,8 +74,8 @@
         <actionGroup ref="useBraintreeForMasterCard" stepKey="selectCardWithBraintree"/>
 
         <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
-        <waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
-        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
+        <waitForPageLoad stepKey="waitForSaveConfig"/>
+        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage"/>
 
         <after>
             <!-- Disable BrainTree -->
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
index 93434471fe38f..2c549d5c01cf2 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -9,30 +9,26 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="useBraintreeForMasterCard">
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
-        <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
+        <waitForPageLoad stepKey="waitForBraintreeConfigs"/>
         <click stepKey="openCardTypes" selector="{{NewOrderSection.openCardTypes}}"/>
-        <waitForPageLoad stepKey="waitForCardTypes" time="3"/>
+        <waitForPageLoad stepKey="waitForCardTypes"/>
         <click stepKey="chooseCardType" selector="{{NewOrderSection.masterCard}}"/>
-        <waitForPageLoad stepKey="waitForCardSelected" time="3"/>
+        <waitForPageLoad stepKey="waitForCardSelected"/>
 
         <switchToIFrame stepKey="switchToCardNumber" selector="{{NewOrderSection.cardFrame}}"/>
         <fillField stepKey="fillCardNumber" selector="{{NewOrderSection.creditCardNumber}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
-        <waitForPageLoad stepKey="waitForFillCardNumber" time="1"/>
         <switchToIFrame stepKey="switchBackFromCard"/>
 
         <switchToIFrame stepKey="switchToExpirationMonth" selector="{{NewOrderSection.monthFrame}}"/>
         <fillField stepKey="fillMonth" selector="{{NewOrderSection.expirationMonth}}" userInput="{{PaymentAndShippingInfo.month}}"/>
-        <waitForPageLoad stepKey="waitForFillMonth" time="1"/>
         <switchToIFrame stepKey="switchBackFromMonth"/>
 
         <switchToIFrame stepKey="switchToExpirationYear" selector="{{NewOrderSection.yearFrame}}"/>
         <fillField stepKey="fillYear" selector="{{NewOrderSection.expirationYear}}" userInput="{{PaymentAndShippingInfo.year}}"/>
-        <waitForPageLoad stepKey="waitForFillYear" time="1"/>
         <switchToIFrame stepKey="switchBackFromYear"/>
 
         <switchToIFrame stepKey="switchToCVV" selector="{{NewOrderSection.cvvFrame}}"/>
         <fillField stepKey="fillCVV" selector="{{NewOrderSection.cvv}}" userInput="{{PaymentAndShippingInfo.cvv}}"/>
-        <wait stepKey="waitForFillCVV" time="1"/>
         <switchToIFrame stepKey="switchBackFromCVV"/>
     </actionGroup>
 </actionGroups>
\ No newline at end of file

From e7d6486313f33b1132b893f0d7e8f2448364714f Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Wed, 19 Dec 2018 17:04:34 +0300
Subject: [PATCH 320/932] MAGETWO-92226: Product export creates 2 rows for
 Simple product with custom options

- Fixed an issue with incorrect product export process with custom options;
---
 .../Model/Export/Product.php                  | 88 ++++++++++++++-----
 1 file changed, 65 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 345d323e6e129..6a98fde6fa0e0 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -1290,11 +1290,23 @@ private function appendMultirowData(&$dataRow, $multiRawData)
         }
 
         if (!empty($multiRawData['customOptionsData'][$productLinkId][$storeId])) {
+            $shouldBeMerged = true;
             $customOptionsRows = $multiRawData['customOptionsData'][$productLinkId][$storeId];
-            $multiRawData['customOptionsData'][$productLinkId][$storeId] = [];
-            $customOptions = implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $customOptionsRows);
 
-            $dataRow = array_merge($dataRow, ['custom_options' => $customOptions]);
+            if ($storeId != Store::DEFAULT_STORE_ID
+                && !empty($multiRawData['customOptionsData'][$productLinkId][Store::DEFAULT_STORE_ID])
+            ) {
+                $defaultCustomOptions = $multiRawData['customOptionsData'][$productLinkId][Store::DEFAULT_STORE_ID];
+                if (!array_diff($defaultCustomOptions, $customOptionsRows)) {
+                    $shouldBeMerged = false;
+                }
+            }
+
+            if ($shouldBeMerged) {
+                $multiRawData['customOptionsData'][$productLinkId][$storeId] = [];
+                $customOptions = implode(ImportProduct::PSEUDO_MULTI_LINE_SEPARATOR, $customOptionsRows);
+                $dataRow = array_merge($dataRow, ['custom_options' => $customOptions]);
+            }
         }
 
         if (empty($dataRow)) {
@@ -1390,6 +1402,7 @@ protected function optionRowToCellString($option)
     protected function getCustomOptionsData($productIds)
     {
         $customOptionsData = [];
+        $defaultOptionsData = [];
 
         foreach (array_keys($this->_storeIdToCode) as $storeId) {
             $options = $this->_optionColFactory->create();
@@ -1402,38 +1415,42 @@ protected function getCustomOptionsData($productIds)
                 ->addValuesToResult($storeId);
 
             foreach ($options as $option) {
+                $optionData = $option->toArray();
                 $row = [];
                 $productId = $option['product_id'];
                 $row['name'] = $option['title'];
                 $row['type'] = $option['type'];
-                if (Store::DEFAULT_STORE_ID === $storeId) {
-                    $row['required'] = $option['is_require'];
-                    $row['price'] = $option['price'];
-                    $row['price_type'] = ($option['price_type'] === 'percent') ? 'percent' : 'fixed';
-                    $row['sku'] = $option['sku'];
-                    if ($option['max_characters']) {
-                        $row['max_characters'] = $option['max_characters'];
-                    }
-
-                    foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
-                        if (!isset($option[$fileOptionKey])) {
-                            continue;
-                        }
 
-                        $row[$fileOptionKey] = $option[$fileOptionKey];
+                $row['required'] = $this->getOptionValue('is_require', $defaultOptionsData, $optionData);
+                $row['price'] = $this->getOptionValue('price', $defaultOptionsData, $optionData);
+                $row['sku'] = $this->getOptionValue('sku', $defaultOptionsData, $optionData);
+                if (array_key_exists('max_characters', $optionData)
+                    || array_key_exists('max_characters', $defaultOptionsData)
+                ) {
+                    $row['max_characters'] = $this->getOptionValue('max_characters', $defaultOptionsData, $optionData);
+                }
+                foreach (['file_extension', 'image_size_x', 'image_size_y'] as $fileOptionKey) {
+                    if (isset($option[$fileOptionKey]) || isset($defaultOptionsData[$fileOptionKey])) {
+                        $row[$fileOptionKey] = $this->getOptionValue($fileOptionKey, $defaultOptionsData, $optionData);
                     }
                 }
+                $percentType = $this->getOptionValue('price_type', $defaultOptionsData, $optionData);
+                $row['price_type'] = ($percentType === 'percent') ? 'percent' : 'fixed';
+
+                if (Store::DEFAULT_STORE_ID === $storeId) {
+                    $optionId = $option['option_id'];
+                    $defaultOptionsData[$optionId] = $option->toArray();
+                }
+
                 $values = $option->getValues();
 
                 if ($values) {
                     foreach ($values as $value) {
                         $row['option_title'] = $value['title'];
-                        if (Store::DEFAULT_STORE_ID === $storeId) {
-                            $row['option_title'] = $value['title'];
-                            $row['price'] = $value['price'];
-                            $row['price_type'] = ($value['price_type'] === 'percent') ? 'percent' : 'fixed';
-                            $row['sku'] = $value['sku'];
-                        }
+                        $row['option_title'] = $value['title'];
+                        $row['price'] = $value['price'];
+                        $row['price_type'] = ($value['price_type'] === 'percent') ? 'percent' : 'fixed';
+                        $row['sku'] = $value['sku'];
                         $customOptionsData[$productId][$storeId][] = $this->optionRowToCellString($row);
                     }
                 } else {
@@ -1447,6 +1464,31 @@ protected function getCustomOptionsData($productIds)
         return $customOptionsData;
     }
 
+    /**
+     * Get value for custom option according to store or default value
+     *
+     * @param string $optionName
+     * @param array $defaultOptionsData
+     * @param array $optionData
+     * @return mixed
+     */
+    private function getOptionValue($optionName, $defaultOptionsData, $optionData)
+    {
+        $optionId = $optionData['option_id'];
+
+        if (array_key_exists($optionName, $optionData) && $optionData[$optionName] !== null) {
+            return $optionData[$optionName];
+        }
+
+        if (array_key_exists($optionId, $defaultOptionsData)
+            && array_key_exists($optionName, $defaultOptionsData[$optionId])
+        ) {
+            return $defaultOptionsData[$optionId][$optionName];
+        }
+
+        return null;
+    }
+
     /**
      * Clean up already loaded attribute collection.
      *

From 2e5607181545d6d89f20cc6cc7e9f0f6a348bbe2 Mon Sep 17 00:00:00 2001
From: Mariana Lashch <mlashch@magento.com>
Date: Wed, 19 Dec 2018 16:23:57 +0200
Subject: [PATCH 321/932] MAGETWO-96379: Cart Price Rule grid count and
 pagination is wrong - add selector check

---
 .../SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
index 3d2682bf55713..14d3a734408db 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml
@@ -17,5 +17,6 @@
         <element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
         <element name="rulesRow" type="text" selector="//tr[@data-role='row']"/>
         <element name="pageCurrent" type="text" selector="//label[@for='promo_quote_grid_page-current']"/>
+        <element name="totalCount" type="text" selector="span[data-ui-id*='grid-total-count']"/>
     </section>
 </sections>

From 20306a464c20fa326e8615c0bb6cb8616e852bf3 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Wed, 19 Dec 2018 16:55:09 +0100
Subject: [PATCH 322/932] Fix static tests Remove dependency

---
 .../Products/DataProvider/CategoryTree.php    |   2 +-
 .../ExtractDataFromCategoryTree.php           |   2 +-
 .../Cart/AddDownloadableProductToCart.php     | 149 ++++++++++++++++++
 3 files changed, 151 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Cart/AddDownloadableProductToCart.php

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index a5fbd4f8c782b..35ed52ff0501d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -105,7 +105,7 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterato
         $collection->setOrder('level');
         $collection->setOrder(
             'position',
-            \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::SORT_ORDER_DESC
+            $collection::SORT_ORDER_DESC
         );
         $collection->getSelect()->orWhere(
             $collection->getSelect()
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
index e94daaff559b0..351754cda9f29 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
@@ -54,7 +54,7 @@ public function execute(\Iterator $iterator): array
             $iterator->next();
 
             $pathElements = explode("/", $category->getPath());
-            if (empty($tree)){
+            if (empty($tree)) {
                 $this->startCategoryFetchLevel = count($pathElements) - 1;
             }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddDownloadableProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddDownloadableProductToCart.php
new file mode 100644
index 0000000000000..aa5b41daebdc3
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddDownloadableProductToCart.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\DataObjectFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Add simple product to cart
+ *
+ * TODO: should be replaced for different types resolver
+ */
+class AddSimpleProductToCart
+{
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @var DataObjectFactory
+     */
+    private $dataObjectFactory;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @param ArrayManager $arrayManager
+     * @param DataObjectFactory $dataObjectFactory
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(
+        ArrayManager $arrayManager,
+        DataObjectFactory $dataObjectFactory,
+        ProductRepositoryInterface $productRepository
+    ) {
+        $this->arrayManager = $arrayManager;
+        $this->dataObjectFactory = $dataObjectFactory;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Add simple product to cart
+     *
+     * @param Quote $cart
+     * @param array $cartItemData
+     * @return void
+     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlInputException
+     */
+    public function execute(Quote $cart, array $cartItemData): void
+    {
+        $sku = $this->extractSku($cartItemData);
+        $qty = $this->extractQty($cartItemData);
+        $customizableOptions = $this->extractCustomizableOptions($cartItemData);
+
+        try {
+            $product = $this->productRepository->get($sku);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
+        }
+
+        $result = $cart->addProduct($product, $this->createBuyRequest($qty, $customizableOptions));
+
+        if (is_string($result)) {
+            throw new GraphQlInputException(__($result));
+        }
+    }
+
+    /**
+     * Extract SKU from cart item data
+     *
+     * @param array $cartItemData
+     * @return string
+     * @throws GraphQlInputException
+     */
+    private function extractSku(array $cartItemData): string
+    {
+        $sku = $this->arrayManager->get('data/sku', $cartItemData);
+        if (!isset($sku)) {
+            throw new GraphQlInputException(__('Missing key "sku" in cart item data'));
+        }
+        return (string)$sku;
+    }
+
+    /**
+     * Extract Qty from cart item data
+     *
+     * @param array $cartItemData
+     * @return float
+     * @throws GraphQlInputException
+     */
+    private function extractQty(array $cartItemData): float
+    {
+        $qty = $this->arrayManager->get('data/qty', $cartItemData);
+        if (!isset($qty)) {
+            throw new GraphQlInputException(__('Missing key "qty" in cart item data'));
+        }
+        return (float)$qty;
+    }
+
+    /**
+     * Extract Customizable Options from cart item data
+     *
+     * @param array $cartItemData
+     * @return array
+     */
+    private function extractCustomizableOptions(array $cartItemData): array
+    {
+        $customizableOptions = $this->arrayManager->get('customizable_options', $cartItemData, []);
+
+        $customizableOptionsData = [];
+        foreach ($customizableOptions as $customizableOption) {
+            $customizableOptionsData[$customizableOption['id']] = $customizableOption['value'];
+        }
+        return $customizableOptionsData;
+    }
+
+    /**
+     * Format GraphQl input data to a shape that buy request has
+     *
+     * @param float $qty
+     * @param array $customOptions
+     * @return DataObject
+     */
+    private function createBuyRequest(float $qty, array $customOptions): DataObject
+    {
+        return $this->dataObjectFactory->create([
+            'data' => [
+                'qty' => $qty,
+                'options' => $customOptions,
+            ],
+        ]);
+    }
+}

From 754e3919802a015ef081aeb394c4e1e9e541cad4 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Wed, 19 Dec 2018 16:57:06 +0100
Subject: [PATCH 323/932] Remove not needed file

---
 .../Cart/AddDownloadableProductToCart.php     | 149 ------------------
 1 file changed, 149 deletions(-)
 delete mode 100644 app/code/Magento/QuoteGraphQl/Model/Cart/AddDownloadableProductToCart.php

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddDownloadableProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddDownloadableProductToCart.php
deleted file mode 100644
index aa5b41daebdc3..0000000000000
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddDownloadableProductToCart.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\QuoteGraphQl\Model\Cart;
-
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\DataObject;
-use Magento\Framework\DataObjectFactory;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Quote\Model\Quote;
-
-/**
- * Add simple product to cart
- *
- * TODO: should be replaced for different types resolver
- */
-class AddSimpleProductToCart
-{
-    /**
-     * @var ArrayManager
-     */
-    private $arrayManager;
-
-    /**
-     * @var DataObjectFactory
-     */
-    private $dataObjectFactory;
-
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-
-    /**
-     * @param ArrayManager $arrayManager
-     * @param DataObjectFactory $dataObjectFactory
-     * @param ProductRepositoryInterface $productRepository
-     */
-    public function __construct(
-        ArrayManager $arrayManager,
-        DataObjectFactory $dataObjectFactory,
-        ProductRepositoryInterface $productRepository
-    ) {
-        $this->arrayManager = $arrayManager;
-        $this->dataObjectFactory = $dataObjectFactory;
-        $this->productRepository = $productRepository;
-    }
-
-    /**
-     * Add simple product to cart
-     *
-     * @param Quote $cart
-     * @param array $cartItemData
-     * @return void
-     * @throws GraphQlNoSuchEntityException
-     * @throws GraphQlInputException
-     */
-    public function execute(Quote $cart, array $cartItemData): void
-    {
-        $sku = $this->extractSku($cartItemData);
-        $qty = $this->extractQty($cartItemData);
-        $customizableOptions = $this->extractCustomizableOptions($cartItemData);
-
-        try {
-            $product = $this->productRepository->get($sku);
-        } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
-        }
-
-        $result = $cart->addProduct($product, $this->createBuyRequest($qty, $customizableOptions));
-
-        if (is_string($result)) {
-            throw new GraphQlInputException(__($result));
-        }
-    }
-
-    /**
-     * Extract SKU from cart item data
-     *
-     * @param array $cartItemData
-     * @return string
-     * @throws GraphQlInputException
-     */
-    private function extractSku(array $cartItemData): string
-    {
-        $sku = $this->arrayManager->get('data/sku', $cartItemData);
-        if (!isset($sku)) {
-            throw new GraphQlInputException(__('Missing key "sku" in cart item data'));
-        }
-        return (string)$sku;
-    }
-
-    /**
-     * Extract Qty from cart item data
-     *
-     * @param array $cartItemData
-     * @return float
-     * @throws GraphQlInputException
-     */
-    private function extractQty(array $cartItemData): float
-    {
-        $qty = $this->arrayManager->get('data/qty', $cartItemData);
-        if (!isset($qty)) {
-            throw new GraphQlInputException(__('Missing key "qty" in cart item data'));
-        }
-        return (float)$qty;
-    }
-
-    /**
-     * Extract Customizable Options from cart item data
-     *
-     * @param array $cartItemData
-     * @return array
-     */
-    private function extractCustomizableOptions(array $cartItemData): array
-    {
-        $customizableOptions = $this->arrayManager->get('customizable_options', $cartItemData, []);
-
-        $customizableOptionsData = [];
-        foreach ($customizableOptions as $customizableOption) {
-            $customizableOptionsData[$customizableOption['id']] = $customizableOption['value'];
-        }
-        return $customizableOptionsData;
-    }
-
-    /**
-     * Format GraphQl input data to a shape that buy request has
-     *
-     * @param float $qty
-     * @param array $customOptions
-     * @return DataObject
-     */
-    private function createBuyRequest(float $qty, array $customOptions): DataObject
-    {
-        return $this->dataObjectFactory->create([
-            'data' => [
-                'qty' => $qty,
-                'options' => $customOptions,
-            ],
-        ]);
-    }
-}

From 205529122d143bab757f5d08e329c311ce0b4cc2 Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Wed, 19 Dec 2018 21:52:57 +0530
Subject: [PATCH 324/932] issue #19609 fixed

---
 .../Config/Block/System/Config/Form.php       | 25 +++++++++++++++++--
 .../Unit/Block/System/Config/FormTest.php     |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 81e39a83296d7..f9faa364d3c9f 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -366,9 +366,12 @@ protected function _initElement(
 
         $sharedClass = $this->_getSharedCssClass($field);
         $requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
+        $isReadOnly = $this->isDefaultFieldReadOnly($path);
+        if (!$isReadOnly) {
+            $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
+                ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
+        }
 
-        $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
-            ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
         $formField = $fieldset->addField(
             $elementId,
             $field->getType(),
@@ -797,6 +800,24 @@ private function getAppConfig()
         return $this->appConfig;
     }
 
+    /**
+     * Check Default Path Readonly
+     *
+     * @param string $path
+     * @return boolean
+     */
+    private function isDefaultFieldReadOnly($path)
+    {
+        $scope = $this->getScope();
+        $isReadOnly = false;
+        if ($scope !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
+            $isReadOnly = $this->getSettingChecker()->isReadOnly(
+                $path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+            );
+        } 
+        return $isReadOnly;
+    }
+
     /**
      * Retrieve deployment config data value by path
      *
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
index 93650dd62657c..008dae1eaab55 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
@@ -532,7 +532,7 @@ public function testInitFields(
 
         $elementVisibilityMock = $this->getMockBuilder(ElementVisibilityInterface::class)
             ->getMockForAbstractClass();
-        $elementVisibilityMock->expects($this->once())
+        $elementVisibilityMock->expects($this->any())
             ->method('isDisabled')
             ->willReturn($isDisabled);
 

From 573f74764a23877866ae7627fc43884164668899 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Wed, 19 Dec 2018 18:30:59 +0200
Subject: [PATCH 325/932] MAGETWO-97235: Not all sizes are available in the
 layered navigation (on Sample Data) with ElasticSearch

---
 .../CatalogSearch/Model/Layer/Filter/Attribute.php       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index 7aac6e98fc044..7b239d84bf962 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -91,12 +91,10 @@ protected function _getItemsData()
             return $this->itemDataBuilder->build();
         }
 
-        $productSize = $productCollection->getSize();
-
         $options = $attribute->getFrontend()
             ->getSelectOptions();
         foreach ($options as $option) {
-            $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize);
+            $this->buildOptionData($option, $isAttributeFilterable, $optionsFacetedData);
         }
 
         return $this->itemDataBuilder->build();
@@ -108,17 +106,16 @@ protected function _getItemsData()
      * @param array $option
      * @param boolean $isAttributeFilterable
      * @param array $optionsFacetedData
-     * @param int $productSize
      * @return void
      */
-    private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData, $productSize)
+    private function buildOptionData($option, $isAttributeFilterable, $optionsFacetedData)
     {
         $value = $this->getOptionValue($option);
         if ($value === false) {
             return;
         }
         $count = $this->getOptionCount($value, $optionsFacetedData);
-        if ($isAttributeFilterable && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)) {
+        if ($isAttributeFilterable && $count === 0) {
             return;
         }
 

From ffc99e5f057215ed9b4dae0017e359bbc9646427 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Wed, 19 Dec 2018 18:45:52 +0200
Subject: [PATCH 326/932] MAGETWO-97235: Not all sizes are available in the
 layered navigation (on Sample Data) with ElasticSearch

---
 .../Test/Unit/Model/Layer/Filter/AttributeTest.php         | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
index abc0fdd1069fe..69e2c33d02d1a 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/AttributeTest.php
@@ -321,10 +321,6 @@ public function testGetItemsWithoutApply()
             ->method('build')
             ->will($this->returnValue($builtData));
 
-        $this->fulltextCollection->expects($this->once())
-            ->method('getSize')
-            ->will($this->returnValue(50));
-
         $expectedFilterItems = [
             $this->createFilterItem(0, $builtData[0]['label'], $builtData[0]['value'], $builtData[0]['count']),
             $this->createFilterItem(1, $builtData[1]['label'], $builtData[1]['value'], $builtData[1]['count']),
@@ -383,9 +379,6 @@ public function testGetItemsOnlyWithResults()
         $this->fulltextCollection->expects($this->once())
             ->method('getFacetedData')
             ->willReturn($facetedData);
-        $this->fulltextCollection->expects($this->once())
-            ->method('getSize')
-            ->will($this->returnValue(50));
 
         $this->itemDataBuilder->expects($this->once())
             ->method('addItemData')

From 34c2f06848b601531f86b0f7d35340453e1ab4ed Mon Sep 17 00:00:00 2001
From: John S <john00ivy@gmail.com>
Date: Wed, 19 Dec 2018 14:57:12 -0600
Subject: [PATCH 327/932] MQE-1393 - Adding new Action Group so we can edit it
 in B2B

- Adding new Action Group so we can edit it in B2B
---
 .../AdminUpdateCustomerGroupActionGroup.xml   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
new file mode 100644
index 0000000000000..3af02370cd222
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminUpdateCustomerGroupByEmailActionGroup">
+        <arguments>
+            <argument name="emailAddress"/>
+            <argument name="customerGroup" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomerPage1"/>
+        <waitForPageLoad stepKey="waitForPageLoad01"/>
+
+        <!-- Start of Action Group: searchAdminDataGridByKeyword -->
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters1"/>
+        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{emailAddress}}" stepKey="fillKeywordSearchField1"/>
+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch1"/>
+        <!-- End of Action Group: searchAdminDataGridByKeyword -->
+
+        <click selector="{{AdminGridRow.editByValue($customer.customer[email]$)}}" stepKey="clickOnCustomer1"/>
+        <waitForPageLoad stepKey="waitForPageLoad02"/>
+
+        <conditionalClick selector="#tab_customer" dependentSelector="#tab_customer" visible="true" stepKey="clickOnAccountInformation1"/>
+        <waitForPageLoad stepKey="waitForPageLoad03"/>
+
+        <click selector=".admin__control-select[name='customer[group_id]']" stepKey="clickOnCustomerGroup1"/>
+        <selectOption selector=".admin__control-select[name='customer[group_id]']" userInput="{{customerGroup}}" stepKey="selectCustomerGroup1"/>
+
+        <click selector="#save" stepKey="clickOnSave1"/>
+        <waitForPageLoad stepKey="waitForPageLoad04"/>
+    </actionGroup>
+</actionGroups>

From f13a71a3a585cbcc8698eb7a00a440a8f5b237c2 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Wed, 19 Dec 2018 15:57:10 -0600
Subject: [PATCH 328/932] MC-5545: RSS feed works only from cache

---
 .../Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php    | 6 +++---
 .../Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php      | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
index ac1fd8c692ed2..eb6da28d268f7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
@@ -54,8 +54,8 @@ protected function _construct()
      */
     public function getRssData()
     {
-        $newUrl = $this->rssUrlBuilder->getUrl(['_secure' => true, '_nosecret' => true, 'type' => 'notifystock']);
-        $title = __('Low Stock Products');
+         $newUrl = $this->rssUrlBuilder->getUrl(['_secure' => true, '_nosecret' => true, 'type' => 'notifystock']);
+        $title = __('Low Stock Products')->render();
         $data = ['title' => $title, 'description' => $title, 'link' => $newUrl, 'charset' => 'UTF-8'];
 
         foreach ($this->rssModel->getProductsCollection() as $item) {
@@ -65,7 +65,7 @@ public function getRssData()
                 ['id' => $item->getId(), '_secure' => true, '_nosecret' => true]
             );
             $qty = 1 * $item->getQty();
-            $description = __('%1 has reached a quantity of %2.', $item->getName(), $qty);
+            $description = __('%1 has reached a quantity of %2.', $item->getName(), $qty)->render();
             $data['entries'][] = ['title' => $item->getName(), 'link' => $url, 'description' => $description];
         }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
index 1dd866f1fe2ca..da35d845468d5 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Rss/NotifyStockTest.php
@@ -96,7 +96,12 @@ public function testGetRssData()
         $this->urlBuilder->expects($this->once())->method('getUrl')
             ->with('catalog/product/edit', ['id' => 1, '_secure' => true, '_nosecret' => true])
             ->will($this->returnValue('http://magento.com/catalog/product/edit/id/1'));
-        $this->assertEquals($this->rssFeed, $this->block->getRssData());
+
+        $data = $this->block->getRssData();
+        $this->assertTrue(is_string($data['title']));
+        $this->assertTrue(is_string($data['description']));
+        $this->assertTrue(is_string($data['entries'][0]['description']));
+        $this->assertEquals($this->rssFeed, $data);
     }
 
     public function testGetCacheLifetime()

From 3125194f673b4e42cc1f1527d32fd60653cc8347 Mon Sep 17 00:00:00 2001
From: John S <john00ivy@gmail.com>
Date: Wed, 19 Dec 2018 16:13:11 -0600
Subject: [PATCH 329/932] MQE-1393 - Adding new Action Group so we can edit it
 in B2B

- Updating stepKeys to prevent conflicts.
---
 .../AdminUpdateCustomerGroupActionGroup.xml   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
index 3af02370cd222..50ea92ab91ff7 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
@@ -14,25 +14,26 @@
             <argument name="customerGroup" type="string"/>
         </arguments>
 
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomerPage1"/>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomerPage01"/>
         <waitForPageLoad stepKey="waitForPageLoad01"/>
 
         <!-- Start of Action Group: searchAdminDataGridByKeyword -->
-        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters1"/>
-        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{emailAddress}}" stepKey="fillKeywordSearchField1"/>
-        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch1"/>
-        <!-- End of Action Group: searchAdminDataGridByKeyword -->
-
-        <click selector="{{AdminGridRow.editByValue($customer.customer[email]$)}}" stepKey="clickOnCustomer1"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters0"/>
+        <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{emailAddress}}" stepKey="fillKeywordSearchField01"/>
+        <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch01"/>
         <waitForPageLoad stepKey="waitForPageLoad02"/>
+        <!-- End of Action Group: searchAdminDataGridByKeyword -->
 
-        <conditionalClick selector="#tab_customer" dependentSelector="#tab_customer" visible="true" stepKey="clickOnAccountInformation1"/>
+        <click selector="{{AdminGridRow.editByValue(emailAddress)}}" stepKey="clickOnCustomer01"/>
         <waitForPageLoad stepKey="waitForPageLoad03"/>
 
-        <click selector=".admin__control-select[name='customer[group_id]']" stepKey="clickOnCustomerGroup1"/>
-        <selectOption selector=".admin__control-select[name='customer[group_id]']" userInput="{{customerGroup}}" stepKey="selectCustomerGroup1"/>
-
-        <click selector="#save" stepKey="clickOnSave1"/>
+        <conditionalClick selector="#tab_customer" dependentSelector="#tab_customer" visible="true" stepKey="clickOnAccountInformation01"/>
         <waitForPageLoad stepKey="waitForPageLoad04"/>
+
+        <click selector=".admin__control-select[name='customer[group_id]']" stepKey="clickOnCustomerGroup01"/>
+        <selectOption selector=".admin__control-select[name='customer[group_id]']" userInput="{{customerGroup}}" stepKey="selectCustomerGroup01"/>
+
+        <click selector="#save" stepKey="clickOnSave01"/>
+        <waitForPageLoad stepKey="waitForPageLoad05"/>
     </actionGroup>
 </actionGroups>

From 4c823bd866b9ae3330ad72ff8a615f8e7b2a51d0 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Wed, 19 Dec 2018 17:12:56 -0600
Subject: [PATCH 330/932] MC-4382: Convert DeleteCategoryEntityTest to MFTF

---
 .../Catalog/Test/Mftf/Data/CategoryData.xml   |  8 ++
 ...nDeleteRootCategoryAssignedToStoreTest.xml | 48 +++++++++++
 .../Mftf/Test/AdminDeleteRootCategoryTest.xml | 41 ++++++++++
 .../Test/AdminDeleteRootSubCategoryTest.xml   | 82 +++++++++++++++++++
 .../Section/AdminUrlRewriteIndexSection.xml   |  2 +
 5 files changed, 181 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index ff3c5cb4403bf..591c899e67c1f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -30,6 +30,14 @@
         <data key="include_in_menu">true</data>
         <data key="parent_id">1</data>
     </entity>
+    <entity name="SimpleRootSubCategory" type="category">
+        <data key="name" unique="suffix">SimpleRootSubCategory</data>
+        <data key="name_lwr" unique="suffix">simplerootsubcategory</data>
+        <data key="is_active">true</data>
+        <data key="include_in_menu">true</data>
+        <data key="url_key" unique="suffix">simplerootsubcategory</data>
+        <var key="parent_id" entityType="category" entityKey="id" />
+    </entity>
     <entity name="SubCategoryWithParent" type="category">
         <data key="name" unique="suffix">subCategory</data>
         <data key="name_lwr" unique="suffix">subCategory</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
new file mode 100644
index 0000000000000..3897769ffbc6a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.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="AdminDeleteRootCategoryAssignedToStoreTest">
+        <annotations>
+            <stories value="Delete categories"/>
+            <title value="Cannot delete root category assigned to some store"/>
+            <description value="Login as admin and root category can not be deleted when category is assigned with any store."/>
+            <testCaseId value="MC-6050"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="NewRootCategory" stepKey="rootCategory" />
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCreatedStore">
+                <argument name="storeGroupName" value="customStore.code"/>
+            </actionGroup>
+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+        <see userInput="You saved the store." stepKey="seeSaveMessage"/>
+        <!--Verify Delete Root Category can not be deleted-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded1"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name))}}" stepKey="clickRootCategoryInTree"/>
+        <!--Verify Delete button is not displayed-->
+        <dontSeeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="dontSeeDeleteButton"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml
new file mode 100644
index 0000000000000..ff281b3637336
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml
@@ -0,0 +1,41 @@
+<?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="AdminDeleteRootCategoryTest">
+        <annotations>
+            <stories value="Delete categories"/>
+            <title value="Can delete a root category not assigned to any store"/>
+            <description value="Login as admin and delete a root category not assigned to any store"/>
+            <testCaseId value="MC-6048"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="NewRootCategory" stepKey="rootCategory" />
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Verify Created root Category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <seeElement selector="{{AdminCategoryBasicFieldSection.CategoryNameInput(NewRootCategory.name)}}" stepKey="seeRootCategory"/>
+        <!--Delete Root Category-->
+        <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
+        <!--Verify Root Category is not listed in backend-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories1"/>
+        <dontSee selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{NewRootCategory.name}}" stepKey="dontSeeRootCategory"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml
new file mode 100644
index 0000000000000..79d7041bebdb6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml
@@ -0,0 +1,82 @@
+<?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="AdminDeleteRootSubCategoryTest">
+        <annotations>
+            <stories value="Delete categories"/>
+            <title value="Can delete a subcategory"/>
+            <description value="Login as admin and delete a root sub category"/>
+            <testCaseId value="MC-6049"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="NewRootCategory" stepKey="rootCategory" />
+            <createData entity="SimpleRootSubCategory" stepKey="category">
+                <requiredEntity createDataKey="rootCategory"/>
+            </createData>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCreatedStore">
+                <argument name="storeGroupName" value="customStore.code"/>
+            </actionGroup>
+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Create a Store-->
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+        <see userInput="You saved the store." stepKey="seeSaveMessage"/>
+        <!--Create a Store View/>-->
+        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="selectCreateStoreView"/>
+        <click selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="clickDropDown"/>
+        <selectOption userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreViewStatus"/>
+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
+        <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="enableStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
+        <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
+        <see userInput="You saved the store view." stepKey="seeSaveMessage1"/>
+        <!--Go To store front page -->
+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
+        <!--Verify subcategory displayed in store front-->
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="selectMainWebsite"/>
+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}"  stepKey="selectMainWebsite1"/>
+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeSubCategoryInStoreFront"/>
+        <!--Delete SubCategory-->
+        <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        <!--Verify Sub Category is absent in backend -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories2"/>
+        <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="dontSeeCategoryInTree"/>
+        <!--Verify Sub Category is not present in Store Front-->
+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad2"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryInStoreFront"/>
+        <!--Verify in Category is not in Url Rewrite grid-->
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
+        <waitForPageLoad stepKey="waitForUrlRewritePageTopLoad"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleRootSubCategory.url_key}}" stepKey="fillRequestPath"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <see selector="{{AdminUrlRewriteIndexSection.emptyRecordMessage}}" userInput="We couldn't find any records." stepKey="seeEmptyRow"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
index 0880b50950e15..4e6e81e7e7d32 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -11,5 +11,7 @@
     <section name="AdminUrlRewriteIndexSection">
         <element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
         <element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
+        <element name="searchButton" type="button" selector="//button[@data-ui-id='widget-button-1']" timeout="30"/>
+        <element name="emptyRecordMessage" type="text" selector="//*[@class='empty-text']"/>
     </section>
 </sections>

From 92b2cfb70e344f094b819b23662ff82181c20180 Mon Sep 17 00:00:00 2001
From: Brendan Falkowski <brendan@gravitydept.com>
Date: Wed, 19 Dec 2018 15:34:43 -0800
Subject: [PATCH 331/932] Fix spelling in schema comments

---
 app/code/Magento/StoreGraphQl/etc/schema.graphqls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
index af79d0e3e28b7..d9f7eaaaa294c 100644
--- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -6,10 +6,10 @@ type Query {
 
 type Website @doc(description: "The type contains information about a website") {
     id : Int @doc(description: "The ID number assigned to the website")
-    name : String @doc(description: "The website name. Websites use this name to identify it easyer.")
+    name : String @doc(description: "The website name. Websites use this name to identify it easier.")
     code : String @doc(description: "A code assigned to the website to identify it")
     sort_order : Int @doc(description: "The attribute to use for sorting websites")
-    default_group_id : String @doc(description: "The default group id that the website has")
+    default_group_id : String @doc(description: "The default group ID that the website has")
     is_default : Boolean @doc(description: "Specifies if this is the default website")
 }
 

From 27bd19659d2c941dac1429f10a0c11c217e6d228 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Thu, 20 Dec 2018 12:18:36 +0300
Subject: [PATCH 332/932] MAGETWO-63036: CLONE - Quans: Orders API without
 key/value on ADDITIONAL_INFORMATION (only values)

- Delete strings encoding.
---
 app/code/Magento/Sales/Model/OrderRepository.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
index d809863044b70..9a1392fbe9065 100644
--- a/app/code/Magento/Sales/Model/OrderRepository.php
+++ b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -177,7 +177,9 @@ private function setPaymentAdditionalInfo(OrderInterface $order): void
             $additionalInformationObject = $this->paymentAdditionalInfoFactory->create();
             $additionalInformationObject->setKey($key);
 
-            $value = $this->serializer->serialize($value);
+            if (!is_string($value)) {
+                $value = $this->serializer->serialize($value);
+            }
             $additionalInformationObject->setValue($value);
 
             $objects[] = $additionalInformationObject;

From 510f7a4f74cdbf22ec82977f60856f42908b9a7e Mon Sep 17 00:00:00 2001
From: vtymchynskyi <vtymchynskyi@magento.com>
Date: Thu, 20 Dec 2018 11:59:57 +0200
Subject: [PATCH 333/932] MAGETWO-97131: B2B module and persistent shopping
 cart do not work together and logged out users cannot checkout

---
 .../Checkout/GuestPaymentInformationManagementPlugin.php      | 4 ++--
 app/code/Magento/Persistent/Model/QuoteManager.php            | 3 ++-
 .../Checkout/GuestPaymentInformationManagementPluginTest.php  | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php b/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
index 2c0259bd12b00..2641102ca4d72 100644
--- a/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
+++ b/app/code/Magento/Persistent/Model/Checkout/GuestPaymentInformationManagementPlugin.php
@@ -108,8 +108,8 @@ public function beforeSavePaymentInformationAndPlaceOrder(
             $this->customerSession->setCustomerId(null);
             $this->customerSession->setCustomerGroupId(null);
             $this->quoteManager->convertCustomerCartToGuest();
-            /** @var \Magento\Quote\Api\Data\CartInterface $quote */
-            $quote = $this->cartRepository->get($this->checkoutSession->getQuote()->getId());
+            $quoteId = $this->checkoutSession->getQuoteId();
+            $quote = $this->cartRepository->get($quoteId);
             $quote->setCustomerEmail($email);
             $quote->getAddressesCollection()->walk('setEmail', ['email' => $email]);
             $this->cartRepository->save($quote);
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index cd7ce400a0be1..35c2c70be30dc 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -108,8 +108,9 @@ public function setGuest($checkQuote = false)
      */
     public function convertCustomerCartToGuest()
     {
+        $quoteId = $this->checkoutSession->getQuoteId();
         /** @var $quote \Magento\Quote\Model\Quote */
-        $quote = $this->quoteRepository->get($this->checkoutSession->getQuoteId());
+        $quote = $this->quoteRepository->get($quoteId);
         if ($quote && $quote->getId()) {
             $this->_setQuotePersistent = false;
             $quote->setIsActive(true)
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
index b9285715146a5..c7f84b476fa7e 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/Checkout/GuestPaymentInformationManagementPluginTest.php
@@ -102,8 +102,7 @@ public function testBeforeSavePaymentInformationAndPlaceOrderCartConvertsToGuest
             ['setCustomerEmail', 'getAddressesCollection'],
             false
         );
-        $this->checkoutSessionMock->expects($this->once())->method('getQuote')->willReturn($quoteMock);
-        $quoteMock->expects($this->once())->method('getId')->willReturn($cartId);
+        $this->checkoutSessionMock->method('getQuoteId')->willReturn($cartId);
         $this->cartRepositoryMock->expects($this->once())->method('get')->with($cartId)->willReturn($quoteMock);
         $quoteMock->expects($this->once())->method('setCustomerEmail')->with($email);
         /** @var \Magento\Framework\Data\Collection|\PHPUnit_Framework_MockObject_MockObject $collectionMock */

From 08754f065a68b84ad0090a4a2ec0eb1c581ef999 Mon Sep 17 00:00:00 2001
From: bshevchenko <1408sheva@gmail.com>
Date: Thu, 20 Dec 2018 12:00:46 +0200
Subject: [PATCH 334/932] MAGETWO-96706: Cart Price Rule with related Banner
 for specific Customer Segment is persisted under long-term

---
 .../Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml        | 1 -
 .../ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml    | 2 +-
 .../VerifySubscribedNewsletterDisplayedActionGroup.xml        | 2 +-
 ...anageSection.xml => StorefrontNewsletterManageSection.xml} | 4 ++--
 .../Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml   | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename app/code/Magento/Newsletter/Test/Mftf/Section/{StorFrontNewsletterManageSection.xml => StorefrontNewsletterManageSection.xml} (86%)

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
index b0262c18f1002..280c7dfd8263e 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCMSPageSection.xml
@@ -14,6 +14,5 @@
         <element name="mainTitle" type="text" selector="#maincontent .page-title"/>
         <element name="mainContent" type="text" selector="#maincontent"/>
         <element name="footerTop" type="text" selector="footer.page-footer"/>
-        <element name="bannerImage" type="block" selector=".banner-items img"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
index 94a47bcb6b1bc..c3ccab53a7636 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -11,7 +11,7 @@
         <arguments>
             <argument name="Customer" defaultValue="CustomerEntityOne"/>
         </arguments>
-        <amOnPage stepKey="amOnStorefrontPage"  url="/"/>
+        <amOnPage stepKey="amOnStorefrontPage"  url="{{StorefrontHomePage.url}}"/>
         <waitForPageLoad stepKey="waitForStorefrontPage"/>
         <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
         <fillField  stepKey="fillFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
index de63fd34c62b4..8414a1231f922 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
@@ -26,7 +26,7 @@
     </actionGroup>
 
     <!--Check Subscribed Newsletter via StoreFront-->
-    <actionGroup name="checkSubscribedNewsletterActionGroup">
+    <actionGroup name="CheckSubscribedNewsletterActionGroup">
         <amOnPage url="{{StorefrontNewsletterManagePage.url}}" stepKey="goToNewsletterManage"/>
         <seeElement selector="{{StorefrontNewsletterManageSection.subscriptionChecked}}" stepKey="checkSubscribedNewsletter"/>
     </actionGroup>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorFrontNewsletterManageSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
similarity index 86%
rename from app/code/Magento/Newsletter/Test/Mftf/Section/StorFrontNewsletterManageSection.xml
rename to app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
index 4685e2b9a1ec1..7d4c9e476b777 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Section/StorFrontNewsletterManageSection.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontNewsletterManageSection">
-        <element name="subscriptionCheckbox" type="checkbox" selector="input#subscription" />
-        <element name="subscriptionChecked" type="checkbox" selector="input#subscription[checked='checked']" />
+        <element name="subscriptionCheckbox" type="checkbox" selector="#subscription" />
+        <element name="subscriptionChecked" type="checkbox" selector="#subscription[checked='checked']" />
     </section>
 </sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
index 541f745a6c941..33bbeff73864f 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
@@ -18,11 +18,11 @@
     </actionGroup>
 
     <!--Set Subtotal condition for Customer Segment-->
-    <actionGroup name="setCartAttributeConditionForCartPriceRuleActionGroup">
+    <actionGroup name="SetCartAttributeConditionForCartPriceRuleActionGroup">
         <arguments>
             <argument name="attributeName" type="string"/>
             <argument name="operatorType" defaultValue="is" type="string"/>
-            <argument name="value" defaultValue="100" type="string"/>
+            <argument name="value" type="string"/>
         </arguments>
         <scrollTo selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" stepKey="scrollToActionTab"/>
         <conditionalClick selector="{{AdminCartPriceRulesFormSection.conditionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.conditionsHeaderOpen}}"

From dbb0a3131281d23ca348dfade923969270288d57 Mon Sep 17 00:00:00 2001
From: Yevhen Sentiabov <isentiabov@magento.com>
Date: Thu, 20 Dec 2018 12:30:19 +0200
Subject: [PATCH 335/932] MAGETWO-96379: Cart Price Rule grid count and
 pagination is wrong

  - Fixed incorrect steps order
---
 .../Test/Mftf/Test/CheckTierPricingOfProductsTest.xml       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
index 281bad4e49591..c6a557d1cafdc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
@@ -317,13 +317,13 @@
             <deleteData createDataKey="product4" stepKey="deleteProduct4"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
+                <argument name="ruleName" value="ship"/>
+            </actionGroup>
             <createData entity="DefaultConfigCatalogPrice" stepKey="defaultConfigCatalogPrice"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
                 <argument name="websiteName" value="secondWebsite"/>
             </actionGroup>
-            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
-                <argument name="ruleName" value="ship"/>
-            </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
     </test>

From 4a77f295f2ed085db9cff24a6edae44916cae252 Mon Sep 17 00:00:00 2001
From: Wojtek Naruniec <wojtek@naruniec.me>
Date: Thu, 20 Dec 2018 11:46:13 +0100
Subject: [PATCH 336/932] Fix negative credit memo bug caused by credit memo
 discount total calculator

---
 app/code/Magento/Sales/Model/Order/CreditmemoFactory.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index e61c2597975bb..69a0c7ed7471b 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -200,6 +200,7 @@ protected function initData($creditmemo, $data)
     {
         if (isset($data['shipping_amount'])) {
             $creditmemo->setBaseShippingAmount((double)$data['shipping_amount']);
+            $creditmemo->setBaseShippingInclTax((double)$data['shipping_amount']);
         }
         if (isset($data['adjustment_positive'])) {
             $creditmemo->setAdjustmentPositive($data['adjustment_positive']);

From 8a3fa6157fe0d416303fb04270522db484870400 Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal.solanki@krishtechnolabs.com>
Date: Thu, 20 Dec 2018 18:21:59 +0530
Subject: [PATCH 337/932] Resolved table footer column width

---
 .../view/adminhtml/templates/order/invoice/create/items.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index 2038ee004e782..4a77c3b166de9 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -33,7 +33,7 @@
                     <tr>
                         <td colspan="3">&nbsp;</td>
                         <td><?= $block->getUpdateButtonHtml() ?></td>
-                        <td colspan="5">&nbsp;</td>
+                        <td colspan="4">&nbsp;</td>
                     </tr>
                 </tfoot>
                 <?php endif; ?>

From 760fb2ef14512cb6c322992dd2fb6eeb1dce6963 Mon Sep 17 00:00:00 2001
From: bshevchenko <1408sheva@gmail.com>
Date: Thu, 20 Dec 2018 14:58:20 +0200
Subject: [PATCH 338/932] MAGETWO-96706: Cart Price Rule with related Banner
 for specific Customer Segment is persisted under long-term cookie

---
 .../ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
index c3ccab53a7636..76acf6e865963 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/SignUpNewUserFromStorefrontActionGroup.xml
@@ -11,8 +11,7 @@
         <arguments>
             <argument name="Customer" defaultValue="CustomerEntityOne"/>
         </arguments>
-        <amOnPage stepKey="amOnStorefrontPage"  url="{{StorefrontHomePage.url}}"/>
-        <waitForPageLoad stepKey="waitForStorefrontPage"/>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
         <click stepKey="clickOnCreateAccountLink" selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}"/>
         <fillField  stepKey="fillFirstName" userInput="{{Customer.firstname}}" selector="{{StorefrontCustomerCreateFormSection.firstnameField}}"/>
         <fillField  stepKey="fillLastName" userInput="{{Customer.lastname}}" selector="{{StorefrontCustomerCreateFormSection.lastnameField}}"/>

From 5000d937ecd2e9399f268c481e7b7412d3e7db0b Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 20 Dec 2018 17:03:00 +0300
Subject: [PATCH 339/932] MAGETWO-66872: Customer Address Attribute not being
 marked as required when the "Values Required" setting is overriden on Website
 scope

- Update automation test
---
 ...tCustomerAddressesFromAdminActionGroup.xml | 12 +++----
 .../AdminEditCustomerAddressesSection.xml     | 33 ++++++++++---------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
index 8eaf5a1f1d284..617c895bc1201 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/EditCustomerAddressesFromAdminActionGroup.xml
@@ -12,11 +12,10 @@
             <argument name="customerAddress"/>
         </arguments>
         <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="proceedToAddresses"/>
-        <click selector="{{AdminEditCustomerAddressesSection.addNewAddresses}}" stepKey="addNewAddresses"/>
+        <click selector="{{AdminEditCustomerAddressesSection.addNewAddress}}" stepKey="addNewAddresses"/>
+        <waitForPageLoad time="60" stepKey="wait5678" />
         <fillField  stepKey="fillPrefixName" userInput="{{customerAddress.prefix}}" selector="{{AdminEditCustomerAddressesSection.prefixName}}"/>
-        <fillField  stepKey="fillFirstName" userInput="{{customerAddress.firstname}}" selector="{{AdminEditCustomerAddressesSection.firstName}}"/>
         <fillField  stepKey="fillMiddleName" userInput="{{customerAddress.middlename}}" selector="{{AdminEditCustomerAddressesSection.middleName}}"/>
-        <fillField  stepKey="fillLastName" userInput="{{customerAddress.lastname}}" selector="{{AdminEditCustomerAddressesSection.lastName}}"/>
         <fillField  stepKey="fillSuffixName" userInput="{{customerAddress.suffix}}" selector="{{AdminEditCustomerAddressesSection.suffixName}}"/>
         <fillField  stepKey="fillCompany" userInput="{{customerAddress.company}}" selector="{{AdminEditCustomerAddressesSection.company}}"/>
         <fillField  stepKey="fillStreetAddress" userInput="{{customerAddress.street}}" selector="{{AdminEditCustomerAddressesSection.streetAddress}}"/>
@@ -26,10 +25,7 @@
         <fillField  stepKey="fillZipCode" userInput="{{customerAddress.postcode}}" selector="{{AdminEditCustomerAddressesSection.zipCode}}"/>
         <fillField  stepKey="fillPhone" userInput="{{customerAddress.telephone}}" selector="{{AdminEditCustomerAddressesSection.phone}}"/>
         <fillField  stepKey="fillVAT" userInput="{{customerAddress.vat_id}}" selector="{{AdminEditCustomerAddressesSection.vat}}"/>
-        <click selector="{{CustomerAccountSection.save}}" stepKey="saveAddress"/>
-        <waitForPageLoad stepKey="waitForStorefrontPage"/>
-        <conditionalClick selector="{{CustomerAccountSection.save}}" dependentSelector="{{CustomerAccountSection.save}}" visible="true" stepKey="clickSaveAgain"/>
-        <waitForPageLoad stepKey="waitForCustomerSaved"/>
-        <see stepKey="seeSaveMessage" userInput="You saved the customer."/>
+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="saveAddress"/>
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
index 0718800c871a7..04d6c4dc2a09d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml
@@ -10,22 +10,23 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditCustomerAddressesSection">
         <element name="addresses" type="button" selector="//span[text()='Addresses']" timeout="30"/>
-        <element name="addNewAddresses" type="button" selector="//span[text()='Add New Addresses']"/>
-        <element name="defaultBillingAddress" type="text" selector="input[name='address[new_0][default_billing]']"/>
-        <element name="defaultShippingAddress" type="text" selector="input[name='address[new_0][default_shipping]']"/>
-        <element name="prefixName" type="text" selector="input[name='address[new_0][prefix]']"/>
-        <element name="firstName" type="text" selector="input[name='address[new_0][firstname]']" />
-        <element name="middleName" type="text" selector="input[name='address[new_0][middlename]']" />
-        <element name="lastName" type="text" selector="input[name='address[new_0][lastname]']" />
-        <element name="suffixName" type="text" selector="input[name='address[new_0][suffix]']" />
-        <element name="company" type="text" selector="input[name='address[new_0][company]']" />
-        <element name="streetAddress" type="text" selector="input[name='address[new_0][street][0]']" />
-        <element name="city" type="text" selector="input[name='address[new_0][city]']" />
-        <element name="country" type="select" selector="select[name='address[new_0][country_id]']" />
-        <element name="state" type="select" selector="select[name='address[new_0][region_id]']" />
-        <element name="zipCode" type="text" selector="input[name='address[new_0][postcode]']" />
-        <element name="phone" type="text" selector="input[name='address[new_0][telephone]']" />
-        <element name="vat" type="text" selector="input[name='address[new_0][vat_id]']" />
+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Address']"/>
+        <element name="defaultBillingAddress" type="text" selector="input[name='default_billing']"/>
+        <element name="defaultShippingAddress" type="text" selector="input[name='default_shipping']"/>
+        <element name="prefixName" type="text" selector="input[name='prefix']"/>
+        <element name="firstName" type="text" selector="input[name='firstname']" />
+        <element name="middleName" type="text" selector="input[name='middlename']" />
+        <element name="lastName" type="text" selector="input[name='lastname']" />
+        <element name="suffixName" type="text" selector="input[name='suffix']" />
+        <element name="company" type="text" selector="input[name='company']" />
+        <element name="streetAddress" type="text" selector="input[name='street[0]']" />
+        <element name="city" type="text" selector="//*[@class='modal-component']//input[@name='city']" />
+        <element name="country" type="select" selector="//*[@class='modal-component']//select[@name='country_id']" />
+        <element name="state" type="select" selector="//*[@class='modal-component']//select[@name='region_id']" />
+        <element name="zipCode" type="text" selector="//*[@class='modal-component']//input[@name='postcode']" />
+        <element name="phone" type="text" selector="//*[@class='modal-component']//input[@name='telephone']" />
+        <element name="vat" type="text" selector="input[name='vat_id']" />
+        <element name="save" type="button" selector="//button[@title='Save']" />
     </section>
 
 </sections>

From 3998176c0995dbb912977719039fdac956c8a43c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 20 Dec 2018 16:09:29 +0200
Subject: [PATCH 340/932] ENGCOM-3491: Static test fix.

---
 app/code/Magento/Sales/Model/Order/Config.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index 8999fca174de9..70cf8c181cf95 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -75,6 +75,8 @@ public function __construct(
     }
 
     /**
+     * Get collection.
+     *
      * @return \Magento\Sales\Model\ResourceModel\Order\Status\Collection
      */
     protected function _getCollection()
@@ -86,6 +88,8 @@ protected function _getCollection()
     }
 
     /**
+     * Get state.
+     *
      * @param string $state
      * @return Status
      */
@@ -275,8 +279,9 @@ public function getInvisibleOnFrontStatuses()
     }
 
     /**
-     * Get existing order statuses
-     * Visible or invisible on frontend according to passed param
+     * Get existing order statuses.
+     *
+     * Visible or invisible on frontend according to passed param.
      *
      * @param bool $visibility
      * @return array

From b34d5fda5a20b8f4e51ca5b08ccb6c8de1276a0f Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 20 Dec 2018 16:12:46 +0200
Subject: [PATCH 341/932] MAGETWO-96400: [2.3.x] Company address attribute not
 displayed in Sales grid

- revert render of address
---
 .../view/frontend/web/template/billing-address/details.html      | 1 -
 .../web/template/shipping-address/address-renderer/default.html  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
index e1ddff3fe848f..ea521b3a8afd4 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -7,7 +7,6 @@
 <div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
     <text args="currentBillingAddress().prefix"/> <text args="currentBillingAddress().firstname"/> <text args="currentBillingAddress().middlename"/>
     <text args="currentBillingAddress().lastname"/> <text args="currentBillingAddress().suffix"/><br/>
-    <span if="currentBillingAddress().company"><span text="currentBillingAddress().company"></span><br></span>
     <text args="_.values(currentBillingAddress().street).join(', ')"/><br/>
     <text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
     <text args="getCountryName(currentBillingAddress().countryId)"/><br/>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
index 0d86ba673e460..cf64c0140b955 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -7,7 +7,6 @@
 <div class="shipping-address-item" css="'selected-item' : isSelected() , 'not-selected-item':!isSelected()">
     <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
     <text args="address().lastname"/> <text args="address().suffix"/><br/>
-    <span if="address().company"><span text="address().company"></span><br/></span>
     <text args="_.values(address().street).join(', ')"/><br/>
     <text args="address().city "/>, <span text="address().region"></span> <text args="address().postcode"/><br/>
     <text args="getCountryName(address().countryId)"/><br/>

From 198111d57fd12729161adecb4832d711b017bf14 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 20 Dec 2018 14:15:55 +0200
Subject: [PATCH 342/932] MAGETWO-97259: [2.3] If an request includes required
 image attribute, the admin user cannot process save

---
 lib/web/mage/validation.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index f1e735d09c7f2..67307c24d3de0 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1134,8 +1134,8 @@
                 if (!result) {
                     ovId = $(elm).attr('id') + '_value';
 
-                    if ($(ovId)) {
-                        result = !$.mage.isEmptyNoTrim($(ovId).val());
+                    if ($('#' + ovId)) {
+                        result = !$.mage.isEmptyNoTrim($('#' + ovId).val());
                     }
                 }
 

From c60a0c98c233c5afa43b6e5d7ac226ab70663590 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Thu, 20 Dec 2018 17:35:33 +0200
Subject: [PATCH 343/932] MAGETWO-97247: Impossible to enable shared catalog
 through cli command

---
 .../Command/ConfigSet/DefaultProcessor.php    |  44 +++-
 app/code/Magento/Config/Model/Config.php      |  72 ++++--
 .../Config/Test/Unit/Model/ConfigTest.php     | 217 ++++++++++--------
 app/code/Magento/Store/etc/di.xml             |   1 +
 app/etc/di.xml                                |   7 +
 .../Magento/Framework/App/ScopeDefault.php    |   4 +-
 6 files changed, 221 insertions(+), 124 deletions(-)

diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index d7d513bfad423..34b8afb7ef144 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -7,17 +7,20 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSetCommand;
+use Magento\Config\Model\Config\Factory as ConfigFactory;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ScopeResolverPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Config\Model\PreparedValueFactory;
-use Magento\Framework\App\Config\Value;
 
 /**
  * Processes default flow of config:set command.
+ *
  * This processor saves the value of configuration into database.
  *
- * {@inheritdoc}
+ * @inheritdoc
  * @api
  * @since 100.2.0
  */
@@ -44,26 +47,44 @@ class DefaultProcessor implements ConfigSetProcessorInterface
      */
     private $preparedValueFactory;
 
+    /**
+     * @var ScopeResolverPool
+     */
+    private $scopeResolverPool;
+
+    /**
+     * @var ConfigFactory
+     */
+    private $configFactory;
+
     /**
      * @param PreparedValueFactory $preparedValueFactory The factory for prepared value
      * @param DeploymentConfig $deploymentConfig The deployment configuration reader
      * @param ConfigPathResolver $configPathResolver The resolver for configuration paths according to source type
+     * @param ScopeResolverPool|null $scopeResolverPool
+     * @param ConfigFactory|null $configFactory
      */
     public function __construct(
         PreparedValueFactory $preparedValueFactory,
         DeploymentConfig $deploymentConfig,
-        ConfigPathResolver $configPathResolver
+        ConfigPathResolver $configPathResolver,
+        ScopeResolverPool $scopeResolverPool = null,
+        ConfigFactory $configFactory = null
     ) {
         $this->preparedValueFactory = $preparedValueFactory;
         $this->deploymentConfig = $deploymentConfig;
         $this->configPathResolver = $configPathResolver;
+
+        $this->scopeResolverPool = $scopeResolverPool ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
+        $this->configFactory = $configFactory ?? ObjectManager::getInstance()->get(ConfigFactory::class);
     }
 
     /**
      * Processes database flow of config:set command.
+     *
      * Requires installed application.
      *
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.2.0
      */
     public function process($path, $value, $scope, $scopeCode)
@@ -78,12 +99,15 @@ public function process($path, $value, $scope, $scopeCode)
         }
 
         try {
-            /** @var Value $backendModel */
-            $backendModel = $this->preparedValueFactory->create($path, $value, $scope, $scopeCode);
-            if ($backendModel instanceof Value) {
-                $resourceModel = $backendModel->getResource();
-                $resourceModel->save($backendModel);
-            }
+            $resolvedScope = $this->scopeResolverPool->get($scope)
+                ->getScope($scopeCode);
+            $config = $this->configFactory->create([
+                'scope' => $resolvedScope->getScopeType(),
+                'scope_id' => $resolvedScope->getId(),
+                'scope_code' => $resolvedScope->getCode(),
+            ]);
+            $config->setDataByPath($path, $value);
+            $config->save();
         } catch (\Exception $exception) {
             throw new CouldNotSaveException(__('%1', $exception->getMessage()), $exception);
         }
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index a9c400c46643d..66b0112f5cef6 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -9,15 +9,31 @@
 use Magento\Config\Model\Config\Structure\Element\Group;
 use Magento\Config\Model\Config\Structure\Element\Field;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Framework\App\ScopeResolverPool;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
 
 /**
  * Backend config model
  *
  * Used to save configuration
+ *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
+ * @method string getSection()
+ * @method void setSection(string $section)
+ * @method string getWebsite()
+ * @method void setWebsite(string $website)
+ * @method string getStore()
+ * @method void setStore(string $store)
+ * @method string getScope()
+ * @method void setScope(string $scope)
+ * @method int getScopeId()
+ * @method void setScopeId(int $scopeId)
+ * @method string getScopeCode()
+ * @method void setScopeCode(string $scopeCode)
  */
 class Config extends \Magento\Framework\DataObject
 {
@@ -87,6 +103,11 @@ class Config extends \Magento\Framework\DataObject
      */
     private $settingChecker;
 
+    /**
+     * @var ScopeResolverPool
+     */
+    private $scopeResolverPool;
+
     /**
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -97,6 +118,7 @@ class Config extends \Magento\Framework\DataObject
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
      * @param array $data
+     * @param ScopeResolverPool|null $scopeResolverPool
      */
     public function __construct(
         \Magento\Framework\App\Config\ReinitableConfigInterface $config,
@@ -107,7 +129,8 @@ public function __construct(
         \Magento\Framework\App\Config\ValueFactory $configValueFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         SettingChecker $settingChecker = null,
-        array $data = []
+        array $data = [],
+        ScopeResolverPool $scopeResolverPool = null
     ) {
         parent::__construct($data);
         $this->_eventManager = $eventManager;
@@ -117,7 +140,8 @@ public function __construct(
         $this->_configLoader = $configLoader;
         $this->_configValueFactory = $configValueFactory;
         $this->_storeManager = $storeManager;
-        $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
+        $this->settingChecker = $settingChecker ?? ObjectManager::getInstance()->get(SettingChecker::class);
+        $this->scopeResolverPool = $scopeResolverPool ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
     }
 
     /**
@@ -505,9 +529,8 @@ public function setDataByPath($path, $value)
     }
 
     /**
-     * Get scope name and scopeId
+     * Resolve scope data
      *
-     * @todo refactor to scope resolver
      * @return void
      */
     private function initScope()
@@ -522,24 +545,33 @@ private function initScope()
             $this->setStore('');
         }
 
-        if ($this->getStore()) {
-            $scope = 'stores';
-            $store = $this->_storeManager->getStore($this->getStore());
-            $scopeId = (int)$store->getId();
-            $scopeCode = $store->getCode();
-        } elseif ($this->getWebsite()) {
-            $scope = 'websites';
-            $website = $this->_storeManager->getWebsite($this->getWebsite());
-            $scopeId = (int)$website->getId();
-            $scopeCode = $website->getCode();
+        if ($this->getScope() && $this->getScopeId() && $this->getScopeCode()) {
+            $scope = $this->scopeResolverPool->get($this->getScope())
+                ->getScope($this->getScopeId());
+            if (StoreScopeInterface::SCOPE_WEBSITE === $scope->getScopeType()) {
+                $this->setWebsite($scope->getId());
+            } elseif (StoreScopeInterface::SCOPE_STORE === $scope->getScopeType()) {
+                $this->setStore($scope->getId());
+            }
         } else {
-            $scope = 'default';
-            $scopeId = 0;
-            $scopeCode = '';
+            switch (true) {
+                case $this->getStore():
+                    $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_STORE)
+                        ->getScope($this->getStore());
+                    break;
+                case $this->getWebsite():
+                    $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_WEBSITE)
+                        ->getScope($this->getWebsite());
+                    break;
+                default:
+                    $scope = $this->scopeResolverPool->get(ScopeInterface::SCOPE_DEFAULT)
+                        ->getScope(0);
+                    break;
+            }
+            $this->setScope($scope->getScopeType());
+            $this->setScopeId($scope->getId());
+            $this->setScopeCode($scope->getCode());
         }
-        $this->setScope($scope);
-        $this->setScopeId($scopeId);
-        $this->setScopeCode($scopeCode);
     }
 
     /**
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index d0568f48ded1e..ab0070a3a88e7 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Config\Test\Unit\Model;
 
+use PHPUnit\Framework\MockObject\MockObject;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -13,130 +15,150 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Config\Model\Config
      */
-    protected $_model;
+    private $model;
+
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface|MockObject
+     */
+    private $eventManagerMock;
+
+    /**
+     * @var \Magento\Config\Model\Config\Structure\Reader|MockObject
+     */
+    private $structureReaderMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\DB\TransactionFactory|MockObject
      */
-    protected $_eventManagerMock;
+    private $transFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Config\ReinitableConfigInterface|MockObject
      */
-    protected $_structureReaderMock;
+    private $appConfigMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Config\Model\Config\Loader|MockObject
      */
-    protected $_transFactoryMock;
+    private $configLoaderMock;
 
     /**
-     * @var \Magento\Framework\App\Config\ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Config\ValueFactory|MockObject
      */
-    protected $_appConfigMock;
+    private $dataFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|MockObject
      */
-    protected $_applicationMock;
+    private $storeManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Config\Model\Config\Structure|MockObject
      */
-    protected $_configLoaderMock;
+    private $configStructure;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker|MockObject
      */
-    protected $_dataFactoryMock;
+    private $settingsChecker;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var \Magento\Framework\App\ScopeResolverPool|MockObject
      */
-    protected $_storeManager;
+    private $scopeResolverPool;
 
     /**
-     * @var \Magento\Config\Model\Config\Structure
+     * @var \Magento\Framework\App\ScopeResolverInterface|MockObject
      */
-    protected $_configStructure;
+    private $scopeResolver;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\ScopeInterface|MockObject
      */
-    private $_settingsChecker;
+    private $scope;
 
     protected function setUp()
     {
-        $this->_eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-        $this->_structureReaderMock = $this->createPartialMock(
+        $this->eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
+        $this->structureReaderMock = $this->createPartialMock(
             \Magento\Config\Model\Config\Structure\Reader::class,
             ['getConfiguration']
         );
-        $this->_configStructure = $this->createMock(\Magento\Config\Model\Config\Structure::class);
+        $this->configStructure = $this->createMock(\Magento\Config\Model\Config\Structure::class);
 
-        $this->_structureReaderMock->expects(
+        $this->structureReaderMock->expects(
             $this->any()
         )->method(
             'getConfiguration'
         )->will(
-            $this->returnValue($this->_configStructure)
+            $this->returnValue($this->configStructure)
         );
 
-        $this->_transFactoryMock = $this->createPartialMock(
+        $this->transFactoryMock = $this->createPartialMock(
             \Magento\Framework\DB\TransactionFactory::class,
             ['create', 'addObject']
         );
-        $this->_appConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
-        $this->_configLoaderMock = $this->createPartialMock(
+        $this->appConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
+        $this->configLoaderMock = $this->createPartialMock(
             \Magento\Config\Model\Config\Loader::class,
             ['getConfigByPath']
         );
-        $this->_dataFactoryMock = $this->createMock(\Magento\Framework\App\Config\ValueFactory::class);
+        $this->dataFactoryMock = $this->createMock(\Magento\Framework\App\Config\ValueFactory::class);
 
-        $this->_storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
 
-        $this->_settingsChecker = $this
+        $this->settingsChecker = $this
             ->createMock(\Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker::class);
 
-        $this->_model = new \Magento\Config\Model\Config(
-            $this->_appConfigMock,
-            $this->_eventManagerMock,
-            $this->_configStructure,
-            $this->_transFactoryMock,
-            $this->_configLoaderMock,
-            $this->_dataFactoryMock,
-            $this->_storeManager,
-            $this->_settingsChecker
+        $this->scopeResolverPool = $this->createMock(\Magento\Framework\App\ScopeResolverPool::class);
+        $this->scopeResolver = $this->createMock(\Magento\Framework\App\ScopeResolverInterface::class);
+        $this->scopeResolverPool->method('get')
+            ->willReturn($this->scopeResolver);
+        $this->scope = $this->createMock(\Magento\Framework\App\ScopeInterface::class);
+        $this->scopeResolver->method('getScope')
+            ->willReturn($this->scope);
+
+        $this->model = new \Magento\Config\Model\Config(
+            $this->appConfigMock,
+            $this->eventManagerMock,
+            $this->configStructure,
+            $this->transFactoryMock,
+            $this->configLoaderMock,
+            $this->dataFactoryMock,
+            $this->storeManager,
+            $this->settingsChecker,
+            [],
+            $this->scopeResolverPool
         );
     }
 
     public function testSaveDoesNotDoAnythingIfGroupsAreNotPassed()
     {
-        $this->_configLoaderMock->expects($this->never())->method('getConfigByPath');
-        $this->_model->save();
+        $this->configLoaderMock->expects($this->never())->method('getConfigByPath');
+        $this->model->save();
     }
 
     public function testSaveEmptiesNonSetArguments()
     {
-        $this->_structureReaderMock->expects($this->never())->method('getConfiguration');
-        $this->assertNull($this->_model->getSection());
-        $this->assertNull($this->_model->getWebsite());
-        $this->assertNull($this->_model->getStore());
-        $this->_model->save();
-        $this->assertSame('', $this->_model->getSection());
-        $this->assertSame('', $this->_model->getWebsite());
-        $this->assertSame('', $this->_model->getStore());
+        $this->structureReaderMock->expects($this->never())->method('getConfiguration');
+        $this->assertNull($this->model->getSection());
+        $this->assertNull($this->model->getWebsite());
+        $this->assertNull($this->model->getStore());
+        $this->model->save();
+        $this->assertSame('', $this->model->getSection());
+        $this->assertSame('', $this->model->getWebsite());
+        $this->assertSame('', $this->model->getStore());
     }
 
     public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
     {
         $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
 
-        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+        $this->transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
 
-        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+        $this->configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
 
-        $this->_eventManagerMock->expects(
+        $this->eventManagerMock->expects(
             $this->at(0)
         )->method(
             'dispatch'
@@ -145,7 +167,7 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
             $this->arrayHasKey('website')
         );
 
-        $this->_eventManagerMock->expects(
+        $this->eventManagerMock->expects(
             $this->at(0)
         )->method(
             'dispatch'
@@ -154,20 +176,20 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
             $this->arrayHasKey('store')
         );
 
-        $this->_model->setGroups(['1' => ['data']]);
-        $this->_model->save();
+        $this->model->setGroups(['1' => ['data']]);
+        $this->model->save();
     }
 
     public function testDoNotSaveReadOnlyFields()
     {
         $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
-        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+        $this->transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
 
-        $this->_settingsChecker->expects($this->any())->method('isReadOnly')->will($this->returnValue(true));
-        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+        $this->settingsChecker->expects($this->any())->method('isReadOnly')->will($this->returnValue(true));
+        $this->configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
 
-        $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
-        $this->_model->setSection('section');
+        $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
+        $this->model->setSection('section');
 
         $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
         $group->method('getPath')->willReturn('section/1');
@@ -176,15 +198,15 @@ public function testDoNotSaveReadOnlyFields()
         $field->method('getGroupPath')->willReturn('section/1');
         $field->method('getId')->willReturn('key');
 
-        $this->_configStructure->expects($this->at(0))
+        $this->configStructure->expects($this->at(0))
             ->method('getElement')
             ->with('section/1')
             ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(1))
+        $this->configStructure->expects($this->at(1))
             ->method('getElement')
             ->with('section/1')
             ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(2))
+        $this->configStructure->expects($this->at(2))
             ->method('getElement')
             ->with('section/1/key')
             ->will($this->returnValue($field));
@@ -193,28 +215,28 @@ public function testDoNotSaveReadOnlyFields()
             \Magento\Framework\App\Config\Value::class,
             ['addData']
         );
-        $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
+        $this->dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
 
-        $this->_transFactoryMock->expects($this->never())->method('addObject');
+        $this->transFactoryMock->expects($this->never())->method('addObject');
         $backendModel->expects($this->never())->method('addData');
 
-        $this->_model->save();
+        $this->model->save();
     }
 
     public function testSaveToCheckScopeDataSet()
     {
         $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
-        $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+        $this->transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
 
-        $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+        $this->configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
 
-        $this->_eventManagerMock->expects($this->at(0))
+        $this->eventManagerMock->expects($this->at(0))
             ->method('dispatch')
             ->with(
                 $this->equalTo('admin_system_config_changed_section_section'),
                 $this->arrayHasKey('website')
             );
-        $this->_eventManagerMock->expects($this->at(0))
+        $this->eventManagerMock->expects($this->at(0))
             ->method('dispatch')
             ->with(
                 $this->equalTo('admin_system_config_changed_section_section'),
@@ -228,36 +250,47 @@ public function testSaveToCheckScopeDataSet()
         $field->method('getGroupPath')->willReturn('section/1');
         $field->method('getId')->willReturn('key');
 
-        $this->_configStructure->expects($this->at(0))
+        $this->configStructure->expects($this->at(0))
             ->method('getElement')
             ->with('section/1')
             ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(1))
+        $this->configStructure->expects($this->at(1))
             ->method('getElement')
             ->with('section/1')
             ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(2))
+        $this->configStructure->expects($this->at(2))
             ->method('getElement')
             ->with('section/1/key')
             ->will($this->returnValue($field));
-        $this->_configStructure->expects($this->at(3))
+        $this->configStructure->expects($this->at(3))
             ->method('getElement')
             ->with('section/1')
             ->will($this->returnValue($group));
-        $this->_configStructure->expects($this->at(4))
+        $this->configStructure->expects($this->at(4))
             ->method('getElement')
             ->with('section/1/key')
             ->will($this->returnValue($field));
 
+        $this->scopeResolver->expects($this->atLeastOnce())
+            ->method('getScope')
+            ->with('1')
+            ->willReturn($this->scope);
+        $this->scope->expects($this->atLeastOnce())
+            ->method('getScopeType')
+            ->willReturn('website');
+        $this->scope->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn(1);
+        $this->scope->expects($this->atLeastOnce())
+            ->method('getCode')
+            ->willReturn('website_code');
         $website = $this->createMock(\Magento\Store\Model\Website::class);
-        $website->expects($this->any())->method('getCode')->will($this->returnValue('website_code'));
-        $this->_storeManager->expects($this->any())->method('getWebsite')->will($this->returnValue($website));
-        $this->_storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$website]));
-        $this->_storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
+        $this->storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$website]));
+        $this->storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
 
-        $this->_model->setWebsite('website');
-        $this->_model->setSection('section');
-        $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
+        $this->model->setWebsite('1');
+        $this->model->setSection('section');
+        $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
 
         $backendModel = $this->createPartialMock(
             \Magento\Framework\App\Config\Value::class,
@@ -269,8 +302,8 @@ public function testSaveToCheckScopeDataSet()
                 'field' => 'key',
                 'groups' => [1 => ['fields' => ['key' => ['data']]]],
                 'group_id' => null,
-                'scope' => 'websites',
-                'scope_id' => 0,
+                'scope' => 'website',
+                'scope_id' => 1,
                 'scope_code' => 'website_code',
                 'field_config' => null,
                 'fieldset_data' => ['key' => null],
@@ -280,16 +313,16 @@ public function testSaveToCheckScopeDataSet()
             ->with('section/1/key')
             ->will($this->returnValue($backendModel));
 
-        $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
+        $this->dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
 
-        $this->_model->save();
+        $this->model->save();
     }
 
     public function testSetDataByPath()
     {
         $value = 'value';
         $path = '<section>/<group>/<field>';
-        $this->_model->setDataByPath($path, $value);
+        $this->model->setDataByPath($path, $value);
         $expected = [
             'section' => '<section>',
             'groups' => [
@@ -300,7 +333,7 @@ public function testSetDataByPath()
                 ],
             ],
         ];
-        $this->assertSame($expected, $this->_model->getData());
+        $this->assertSame($expected, $this->model->getData());
     }
 
     /**
@@ -309,7 +342,7 @@ public function testSetDataByPath()
      */
     public function testSetDataByPathEmpty()
     {
-        $this->_model->setDataByPath('', 'value');
+        $this->model->setDataByPath('', 'value');
     }
 
     /**
@@ -324,7 +357,7 @@ public function testSetDataByPathWrongDepth($path, $expectedException)
         $this->expectException('\UnexpectedValueException');
         $this->expectExceptionMessage($expectedException);
         $value = 'value';
-        $this->_model->setDataByPath($path, $value);
+        $this->model->setDataByPath($path, $value);
     }
 
     /**
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
index be005264b7bbf..defe0694d018d 100644
--- a/app/code/Magento/Store/etc/di.xml
+++ b/app/code/Magento/Store/etc/di.xml
@@ -236,6 +236,7 @@
     <type name="Magento\Framework\App\ScopeResolverPool">
         <arguments>
             <argument name="scopeResolvers" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\Framework\App\ScopeResolver</item>
                 <item name="store" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
                 <item name="stores" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
                 <item name="group" xsi:type="object">Magento\Store\Model\Resolver\Group</item>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index ceccee04a8bc4..6cf169c1d2277 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1749,4 +1749,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\ScopeResolverPool">
+        <arguments>
+            <argument name="scopeResolvers" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\Framework\App\ScopeResolver</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/lib/internal/Magento/Framework/App/ScopeDefault.php b/lib/internal/Magento/Framework/App/ScopeDefault.php
index 2ea62387145bf..e62d19f9ffbb4 100644
--- a/lib/internal/Magento/Framework/App/ScopeDefault.php
+++ b/lib/internal/Magento/Framework/App/ScopeDefault.php
@@ -17,7 +17,7 @@ class ScopeDefault implements ScopeInterface
      */
     public function getCode()
     {
-        return 'default';
+        return '';
     }
 
     /**
@@ -27,7 +27,7 @@ public function getCode()
      */
     public function getId()
     {
-        return 1;
+        return 0;
     }
 
     /**

From 6b845bde0e9e06bb98d8401e05e5ba3af6d55aeb Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 20 Dec 2018 17:42:03 +0200
Subject: [PATCH 344/932] MAGETWO-97259: [2.3] If an request includes required
 image attribute, the admin user cannot process save

---
 lib/web/mage/validation.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 67307c24d3de0..c0100a0cf3e91 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1132,10 +1132,10 @@
                     ovId;
 
                 if (!result) {
-                    ovId = $(elm).attr('id') + '_value';
+                    ovId = '#' + $(elm).attr('id') + '_value';
 
-                    if ($('#' + ovId)) {
-                        result = !$.mage.isEmptyNoTrim($('#' + ovId).val());
+                    if ($(ovId)) {
+                        result = !$.mage.isEmptyNoTrim($(ovId).val());
                     }
                 }
 

From c2189c13b6e9307002e6480c12f844a1d87bee5a Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 20 Dec 2018 18:01:22 +0200
Subject: [PATCH 345/932] MAGETWO-97259: [2.3] If an request includes required
 image attribute, the admin user cannot process save

---
 lib/web/mage/validation.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index c0100a0cf3e91..23a6a03e72872 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1132,10 +1132,10 @@
                     ovId;
 
                 if (!result) {
-                    ovId = '#' + $(elm).attr('id') + '_value';
+                    ovId = $('#' + $(elm).attr('id') + '_value');
 
-                    if ($(ovId)) {
-                        result = !$.mage.isEmptyNoTrim($(ovId).val());
+                    if (ovId.length > 0) {
+                        result = !$.mage.isEmptyNoTrim(ovId.val());
                     }
                 }
 

From 9ed9553f12bd1c890cf3cd3b6a36e786fe1b11a5 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Thu, 20 Dec 2018 17:13:44 -0600
Subject: [PATCH 346/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 .../Magento/Customer/Block/Address/Book.php   |  30 ++--
 .../Test/Unit/Block/Address/BookTest.php      | 155 ++++++++++++++++++
 .../frontend/templates/address/book.phtml     |   8 +-
 3 files changed, 174 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 362b87a80f91a..124fb3bbba869 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -249,6 +249,8 @@ public function getDefaultShipping()
     }
 
     /**
+     * Get one string street address from "two fields" array or just returns string if it was passed in parameters
+     *
      * @param $street
      * @return string
      */
@@ -268,6 +270,20 @@ public function getPagerHtml()
         return $this->getChildHtml('pager');
     }
 
+    /**
+     * Get country name by $countryId
+     * Using \Magento\Directory\Model\Country to get country name by $countryId
+     *
+     * @param $countryId
+     * @return string
+     */
+    public function getCountryById($countryId)
+    {
+        /** @var \Magento\Directory\Model\Country $country */
+        $country = $this->countryFactory->create();
+        return $country->loadByCode($countryId)->getName();
+    }
+
     /**
      * Get customer addresses collection.
      * Filters collection by customer id
@@ -289,18 +305,4 @@ private function getAddressesCollection()
 
         return $this->addressesCollection;
     }
-
-    /**
-     * Get country name by $countryId
-     * Using \Magento\Directory\Model\Country to get country name by $countryId
-     *
-     * @param $countryId
-     * @return string
-     */
-    public function getCountryById($countryId) :string
-    {
-        /** @var \Magento\Directory\Model\Country $country */
-        $country = $this->countryFactory->create();
-        return $country->loadByCode($countryId)->getName();
-    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php
new file mode 100644
index 0000000000000..8da1dc9114944
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Test\Unit\Block\Address;
+
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
+
+/**
+ * Unit tests for \Magento\Customer\Block\Address\Book class
+ */
+class BookTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Directory\Model\CountryFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $countryFactory;
+
+    /**
+     * @var \Magento\Customer\Helper\Session\CurrentCustomer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressCollectionFactory;
+
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $currentCustomer;
+
+    /**
+     * @var \Magento\Framework\View\Page\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $pageConfig;
+
+    /**
+     * @var \Magento\Customer\Block\Address\Book
+     */
+    private $bookBlock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->countryFactory = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->currentCustomer = $this->getMockBuilder(\Magento\Customer\Helper\Session\CurrentCustomer::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomer'])
+            ->getMock();
+
+        $this->addressCollectionFactory = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->pageConfig = $this->getMockBuilder(\Magento\Framework\View\Page\Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getTitle'])
+            ->getMock();
+
+        $this->bookBlock = $this->objectManager->getObject(
+            \Magento\Customer\Block\Address\Book::class,
+            [
+                'countryFactory' => $this->countryFactory,
+                'addressesCollectionFactory' => $this->addressCollectionFactory,
+                'currentCustomer' => $this->currentCustomer,
+                'pageConfig' => $this->pageConfig
+            ]
+        );
+    }
+
+    /**
+     * Test for \Magento\Customer\Block\Address\Book::getStreetAddress method
+     */
+    public function testGetStreetAddress()
+    {
+        $street = ['Line 1', 'Line 2'];
+        $expectedAddress = 'Line 1, Line 2';
+        $this->assertEquals($expectedAddress, $this->bookBlock->getStreetAddress($street));
+    }
+
+    /**
+     * Test for \Magento\Customer\Block\Address\Book::getPagerHtml method
+     */
+    public function testGetPagerHtml()
+    {
+        $customerId = 1;
+
+        /** @var \Magento\Framework\View\Element\BlockInterface|\PHPUnit_Framework_MockObject_MockObject $block */
+        $block = $this->getMockBuilder(\Magento\Framework\View\Element\BlockInterface::class)
+            ->setMethods(['setCollection'])
+            ->getMockForAbstractClass();
+        /** @var  $layout \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject */
+        $layout = $this->getMockForAbstractClass(\Magento\Framework\View\LayoutInterface::class);
+        /** @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject $title */
+        $title = $this->getMockBuilder(\Magento\Framework\View\Page\Title::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['set'])
+            ->getMock();
+        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+        /** @var \PHPUnit_Framework_MockObject_MockObject */
+        $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setOrder', 'setCustomerFilter', 'load'])
+            ->getMock();
+
+        $layout->expects($this->atLeastOnce())->method('getChildName')->with('NameInLayout', 'pager')
+            ->willReturn('ChildName');
+        $layout->expects($this->atLeastOnce())->method('renderElement')->with('ChildName', true)
+            ->willReturn('OutputString');
+        $layout->expects($this->atLeastOnce())->method('createBlock')
+            ->with(\Magento\Theme\Block\Html\Pager::class, 'customer.addresses.pager')->willReturn($block);
+        $title->expects($this->atLeastOnce())->method('set')->with(__('Address Book'))->willReturnSelf();
+        $this->pageConfig->expects($this->atLeastOnce())->method('getTitle')->willReturn($title);
+        $customer->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
+        $this->currentCustomer->expects($this->atLeastOnce())->method('getCustomer')->willReturn($customer);
+        $addressCollection->expects($this->atLeastOnce())->method('setOrder')->with('entity_id', 'desc')
+            ->willReturnSelf();
+        $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
+            ->willReturnSelf();
+        $addressCollection->expects($this->atLeastOnce())->method('load');
+        $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
+            ->willReturn($addressCollection);
+        $block->expects($this->atLeastOnce())->method('setCollection')->with($addressCollection)->willReturnSelf();
+        $this->bookBlock->setNameInLayout('NameInLayout');
+        $this->bookBlock->setLayout($layout);
+        $this->assertEquals('OutputString', $this->bookBlock->getPagerHtml());
+    }
+
+    /**
+     * Test for \Magento\Customer\Block\Address\Book::getCountryById method
+     */
+    public function testGetCpuntryByid()
+    {
+        $countryId = 'US';
+        $countryName = 'United States';
+        $country = $this->getMockBuilder(\Magento\Directory\Model\Country::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['loadByCode', 'getName'])
+            ->getMock();
+        $this->countryFactory->expects($this->atLeastOnce())->method('create')->willReturn($country);
+        $country->expects($this->atLeastOnce())->method('loadByCode')->with($countryId)->willReturnSelf();
+        $country->expects($this->atLeastOnce())->method('getName')->willReturn($countryName);
+        $this->assertEquals($countryName, $this->bookBlock->getCountryById($countryId));
+    }
+}
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index 21bb1a3713120..9e256d7d09ff1 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -73,7 +73,6 @@
                     <caption class="table-caption"><?= /* @escapeNotVerified */ __('Additional addresses') ?></caption>
                     <thead>
                     <tr>
-                        <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Address #') ?></th>
                         <th scope="col" class="col firstname"><?= /* @escapeNotVerified */ __('First Name') ?></th>
                         <th scope="col" class="col lastname"><?= /* @escapeNotVerified */ __('Last Name') ?></th>
                         <th scope="col" class="col streetaddress"><?= /* @escapeNotVerified */ __('Street Address') ?></th>
@@ -82,13 +81,12 @@
                         <th scope="col" class="col state"><?= /* @escapeNotVerified */ __('State') ?></th>
                         <th scope="col" class="col zip"><?= /* @escapeNotVerified */ __('Zip/Postal Code') ?></th>
                         <th scope="col" class="col phone"><?= /* @escapeNotVerified */ __('Phone') ?></th>
-                        <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
+                        <th scope="col" class="col actions"> </th>
                     </tr>
                     </thead>
                     <tbody>
                     <?php foreach ($_pAddsses as $address): ?>
                         <tr>
-                            <td data-th="<?= $block->escapeHtml(__('Address #')) ?>" class="col id"><?= /* @escapeNotVerified */ $address->getId() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('First Name')) ?>" class="col firstname"><?= /* @escapeNotVerified */ $address->getFirstname() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Last Name')) ?>" class="col lastname"><?= /* @escapeNotVerified */ $address->getLastname() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->getStreetAddress($address->getStreet()) ?></td>
@@ -98,8 +96,8 @@
                             <td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= /* @escapeNotVerified */ $address->getPostcode() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= /* @escapeNotVerified */ $address->getTelephone() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
-                                <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit Address')) ?></span></a>
-                                <a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete Address')) ?></span></a>
+                                <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
+                                <a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete')) ?></span></a>
                             </td>
                         </tr>
                     <?php endforeach; ?>

From 5bde1d9f441d770328d8cc8391568920550ceb47 Mon Sep 17 00:00:00 2001
From: bradleyfrye <bradleyfrye@gmail.com>
Date: Thu, 20 Dec 2018 17:33:21 -0600
Subject: [PATCH 347/932] Move website_name column into columnSet

One column was outside the columnset in this layout, for some reason.  Moving this so the grid shows the user's website name
---
 .../layout/sales_order_create_customer_block.xml   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
index c321bee460e46..0f5a3559f3008 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
@@ -80,13 +80,13 @@
                             <argument name="align" xsi:type="string">center</argument>
                         </arguments>
                     </block>
-                </block>
-                <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.website_name" as="website_name">
-                    <arguments>
-                        <argument name="header" xsi:type="string" translate="true">Website</argument>
-                        <argument name="index" xsi:type="string">website_name</argument>
-                        <argument name="align" xsi:type="string">center</argument>
-                    </arguments>
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.customer.grid.columnSet.website_name" as="website_name">
+                        <arguments>
+                            <argument name="header" xsi:type="string" translate="true">Website</argument>
+                            <argument name="index" xsi:type="string">website_name</argument>
+                            <argument name="align" xsi:type="string">center</argument>
+                        </arguments>
+                    </block>
                 </block>
             </block>
         </referenceBlock>

From 54561ba1a13d0a0ed60e4d2fb3974b558d901f2b Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Fri, 21 Dec 2018 10:55:23 +0400
Subject: [PATCH 348/932] MAGETWO-96849: [2.3.x] Money are refunded to gift
 card during partial refund when it's not required

- Add automated test script
---
 .../Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml      | 1 +
 .../Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
index 84fcc8fc47dfb..df1a0064d25a8 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
@@ -21,5 +21,6 @@
         <element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="30"/>
         <element name="creditMemoItem" type="text" selector="#sales_order_view_tabs_order_creditmemos"/>
         <element name="viewMemo" type="text" selector="div#sales_order_view_tabs_order_creditmemos_content a.action-menu-item"/>
+        <element name="refundOffline" type="button"  selector=".order-totals-actions button[data-ui-id='order-items-submit-offline']"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
index 578022217f358..6fa5d9a9a3787 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
@@ -18,5 +18,6 @@
         <element name="ship" type="button" selector="#order_ship" timeout="30"/>
         <element name="reorder" type="button" selector="#order_reorder" timeout="30"/>
         <element name="edit" type="button" selector="#order_edit" timeout="30"/>
+        <element name="modalOk" type="button" selector=".action-accept"/>
     </section>
 </sections>

From 148b5056f5c5250a9cebe9bd2d773bbb4ba6b2e3 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Fri, 21 Dec 2018 11:58:37 +0200
Subject: [PATCH 349/932] MAGETWO-97278: Incorrect use of cookies for customer

---
 .../StorefrontCustomerActionGroup.xml         |  18 ++
 .../Section/StorefrontPanelHeaderSection.xml  |   3 +
 .../Persistent/Block/Header/Additional.php    |  55 +++-
 .../Persistent/CustomerData/Persistent.php    |  72 +++++
 .../Magento/Persistent/Model/Observer.php     |   7 +-
 .../Plugin/PersistentCustomerContext.php      |  41 +++
 .../StorefrontCustomerActionGroup.xml         |  22 ++
 .../StorefrontCustomerSignInFormSection.xml   |  14 +
 ...omeMessageAfterCustomerIsLoggedOutTest.xml |  79 ++++++
 .../Test/Unit/Block/Header/AdditionalTest.php | 246 +++---------------
 .../Test/Unit/Model/ObserverTest.php          |  25 +-
 app/code/Magento/Persistent/etc/di.xml        |   3 +
 .../Magento/Persistent/etc/frontend/di.xml    |  14 +
 .../Persistent/etc/frontend/sections.xml      |  13 +
 .../view/frontend/requirejs-config.js         |  14 +
 .../view/frontend/templates/additional.phtml  |  21 ++
 .../web/js/view/additional-welcome.js         |  55 ++++
 .../web/js/view/customer-data-mixin.js        |  51 ++++
 .../Section/AdminCreditMemoTotalSection.xml   |   3 +-
 .../Mftf/Section/AdminInvoiceItemsSection.xml |   3 +-
 .../Mftf/Section/StorefrontHeaderSection.xml  |  13 +
 .../view/frontend/templates/html/header.phtml |   4 +-
 .../Block/Header/AdditionalTest.php           |   4 +-
 .../Magento/Persistent/Model/ObserverTest.php |  32 +--
 24 files changed, 531 insertions(+), 281 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
 create mode 100644 app/code/Magento/Persistent/CustomerData/Persistent.php
 create mode 100644 app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
 create mode 100644 app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
 create mode 100644 app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
 create mode 100644 app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
 create mode 100644 app/code/Magento/Persistent/etc/frontend/sections.xml
 create mode 100644 app/code/Magento/Persistent/view/frontend/requirejs-config.js
 create mode 100644 app/code/Magento/Persistent/view/frontend/templates/additional.phtml
 create mode 100644 app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
 create mode 100644 app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js
 create mode 100644 app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
new file mode 100644
index 0000000000000..fc5c1b881752e
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CustomerLogoutStorefrontByMenuItemsActionGroup">
+        <conditionalClick selector="{{StorefrontPanelHeaderSection.customerWelcome}}"
+                          dependentSelector="{{StorefrontPanelHeaderSection.customerWelcomeMenu}}"
+                          visible="false"
+                          stepKey="clickHeaderCustomerMenuButton" />
+        <click selector="{{StorefrontPanelHeaderSection.customerLogoutLink}}" stepKey="clickSignOutButton" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
index a0c83f5bc491b..1955c6a417ba9 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -12,5 +12,8 @@
         <element name="WelcomeMessage" type="text" selector=".greet.welcome span"/>
         <element name="createAnAccountLink" type="select" selector=".panel.header li:nth-child(3)" timeout="30"/>
         <element name="notYouLink" type="button" selector=".greet.welcome span a"/>
+        <element name="customerWelcome" type="text" selector=".panel.header .customer-welcome"/>
+        <element name="customerWelcomeMenu" type="text" selector=".panel.header .customer-welcome .customer-menu"/>
+        <element name="customerLogoutLink" type="text" selector=".panel.header .customer-welcome .customer-menu .authorization-link a" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Persistent/Block/Header/Additional.php b/app/code/Magento/Persistent/Block/Header/Additional.php
index c740f5a3469fb..f82a0e7250bf9 100644
--- a/app/code/Magento/Persistent/Block/Header/Additional.php
+++ b/app/code/Magento/Persistent/Block/Header/Additional.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Persistent\Block\Header;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Persistent\Helper\Data;
+
 /**
  * Remember Me block
  *
@@ -30,20 +34,37 @@ class Additional extends \Magento\Framework\View\Element\Html\Link
     protected $customerRepository;
 
     /**
-     * Constructor
-     *
+     * @var string
+     */
+    protected $_template = 'Magento_Persistent::additional.phtml';
+
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var Data
+     */
+    private $persistentHelper;
+
+    /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param \Magento\Persistent\Helper\Session $persistentSessionHelper
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param array $data
+     * @param Json|null $jsonSerializer
+     * @param Data|null $persistentHelper
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Customer\Helper\View $customerViewHelper,
         \Magento\Persistent\Helper\Session $persistentSessionHelper,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
-        array $data = []
+        array $data = [],
+        Json $jsonSerializer = null,
+        Data $persistentHelper = null
     ) {
         $this->isScopePrivate = true;
         $this->_customerViewHelper = $customerViewHelper;
@@ -51,6 +72,8 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         parent::__construct($context, $data);
         $this->_isScopePrivate = true;
+        $this->jsonSerializer = $jsonSerializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->persistentHelper = $persistentHelper ?: ObjectManager::getInstance()->get(Data::class);
     }
 
     /**
@@ -64,17 +87,27 @@ public function getHref()
     }
 
     /**
-     * Render additional header html
+     * Get customer id.
      *
-     * @return string
+     * @return int
      */
-    protected function _toHtml()
+    public function getCustomerId(): int
     {
-        if ($this->_persistentSessionHelper->getSession()->getCustomerId()) {
-            return '<span><a ' . $this->getLinkAttributes() . ' >' . __('Not you?')
-            . '</a></span>';
-        }
+        return $this->_persistentSessionHelper->getSession()->getCustomerId();
+    }
 
-        return '';
+    /**
+     * Get persistent config.
+     *
+     * @return string
+     */
+    public function getConfig(): string
+    {
+        return
+            $this->jsonSerializer->serialize(
+                [
+                    'expirationLifetime' => $this->persistentHelper->getLifeTime(),
+                ]
+            );
     }
 }
diff --git a/app/code/Magento/Persistent/CustomerData/Persistent.php b/app/code/Magento/Persistent/CustomerData/Persistent.php
new file mode 100644
index 0000000000000..5800e4e7aeeb5
--- /dev/null
+++ b/app/code/Magento/Persistent/CustomerData/Persistent.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\CustomerData;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Customer\Helper\View;
+use Magento\Persistent\Helper\Session;
+
+/**
+ * Customer persistent section
+ */
+class Persistent implements SectionSourceInterface
+{
+    /**
+     * @var Session
+     */
+    private $persistentSession;
+
+    /**
+     * @var View
+     */
+    private $customerViewHelper;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @param Session $persistentSession
+     * @param View $customerViewHelper
+     * @param CustomerRepositoryInterface $customerRepository
+     */
+    public function __construct(
+        Session $persistentSession,
+        View $customerViewHelper,
+        CustomerRepositoryInterface $customerRepository
+    ) {
+        $this->persistentSession = $persistentSession;
+        $this->customerViewHelper = $customerViewHelper;
+        $this->customerRepository = $customerRepository;
+    }
+
+    /**
+     * Get data.
+     *
+     * @return array
+     */
+    public function getSectionData(): array
+    {
+        if (!$this->persistentSession->isPersistent()) {
+            return [];
+        }
+
+        $customerId = $this->persistentSession->getSession()->getCustomerId();
+        if (!$customerId) {
+            return [];
+        }
+
+        $customer = $this->customerRepository->getById($customerId);
+
+        return [
+            'fullname' => $this->customerViewHelper->getCustomerName($customer),
+        ];
+    }
+}
diff --git a/app/code/Magento/Persistent/Model/Observer.php b/app/code/Magento/Persistent/Model/Observer.php
index 53fe5f95531e1..81c2870071a2e 100644
--- a/app/code/Magento/Persistent/Model/Observer.php
+++ b/app/code/Magento/Persistent/Model/Observer.php
@@ -86,13 +86,8 @@ public function __construct(
      */
     public function emulateWelcomeBlock($block)
     {
-        $customerName = $this->_customerViewHelper->getCustomerName(
-            $this->customerRepository->getById($this->_persistentSession->getSession()->getCustomerId())
-        );
+        $block->setWelcome('&nbsp;');
 
-        $this->_applyAccountLinksPersistentData();
-        $welcomeMessage = __('Welcome, %1!', $customerName);
-        $block->setWelcome($welcomeMessage);
         return $this;
     }
 
diff --git a/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
new file mode 100644
index 0000000000000..4ddb1040e0db6
--- /dev/null
+++ b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Persistent\Model\Plugin;
+
+/**
+ * Plugin for Magento\Framework\App\Http\Context to create new page cache variation for persistent session.
+ */
+class PersistentCustomerContext
+{
+    /**
+     * Persistent session.
+     *
+     * @var \Magento\Persistent\Helper\Session
+     */
+    private $persistentSession;
+
+    /**
+     * @param \Magento\Persistent\Helper\Session $persistentSession
+     */
+    public function __construct(
+        \Magento\Persistent\Helper\Session $persistentSession
+    ) {
+        $this->persistentSession = $persistentSession;
+    }
+
+    /**
+     * Sets appropriate header if customer session is persistent.
+     *
+     * @param \Magento\Framework\App\Http\Context $subject
+     * @return mixed
+     */
+    public function beforeGetVaryString(\Magento\Framework\App\Http\Context $subject)
+    {
+        if ($this->persistentSession->isPersistent()) {
+            $subject->setValue('PERSISTENT', 1, 0);
+        }
+    }
+}
diff --git a/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
new file mode 100644
index 0000000000000..293fa04d80462
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CustomerLoginOnStorefrontWithRememberMeChecked" extends="LoginToStorefrontActionGroup">
+        <checkOption selector="{{StorefrontCustomerSignInFormSection.rememberMe}}"
+                     before="clickSignInAccountButton"
+                     stepKey="checkRememberMe"/>
+    </actionGroup>
+
+    <actionGroup name="CustomerLoginOnStorefrontWithRememberMeUnChecked" extends="LoginToStorefrontActionGroup">
+        <uncheckOption selector="{{StorefrontCustomerSignInFormSection.rememberMe}}"
+                     before="clickSignInAccountButton"
+                     stepKey="unCheckRememberMe"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml b/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
new file mode 100644
index 0000000000000..c2220c33a6052
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Section/StorefrontCustomerSignInFormSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerSignInFormSection">
+        <element name="rememberMe" type="checkbox" selector="[name='persistent_remember_me']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
new file mode 100644
index 0000000000000..7fffc6c2b0d37
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
@@ -0,0 +1,79 @@
+<?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="StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest">
+        <annotations>
+            <features value="Persistent"/>
+            <stories value="MAGETWO-97278 - Incorrect use of cookies for customer"/>
+            <title value="Checking welcome message for persistent customer after logout"/>
+            <description value="Checking welcome message for persistent customer after logout"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-10800"/>
+            <group value="persistent"/>
+            <group value="customer"/>
+        </annotations>
+        <before>
+            <!--Enable Persistence-->
+            <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>
+            <createData entity="PersistentLogoutClearDisable" stepKey="persistentLogoutClearDisable"/>
+
+            <!--Create customers-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomerForPersistent">
+                <field key="firstname">John1</field>
+                <field key="lastname">Doe1</field>
+            </createData>
+        </before>
+        <after>
+            <!--Roll back configuration-->
+            <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
+            <createData entity="PersistentLogoutClearEnabled" stepKey="persistentLogoutClearEnabled"/>
+
+            <!-- Logout customer on Storefront-->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
+            <!--Delete customers-->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCustomerForPersistent" stepKey="deleteCustomerForPersistent"/>
+        </after>
+        <!--Login as a Customer with remember me unchecked-->
+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeUnChecked" stepKey="loginToStorefrontAccountWithRememberMeUnchecked">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!--Check customer name and last name in welcome message-->
+        <seeCurrentUrlMatches regex="~/customer/account/~" stepKey="seeCustomerAccountPageUrl"/>
+        <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!"
+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
+             stepKey="seeLoggedInCustomerWelcomeMessage"/>
+        <!--Logout and check default welcome message-->
+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout"/>
+        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl"/>
+        <see userInput="Default welcome msg!"
+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
+             stepKey="seeDefaultWelcomeMessage"/>
+
+        <!--Login as a Customer with remember me checked-->
+        <actionGroup ref="CustomerLoginOnStorefrontWithRememberMeChecked" stepKey="loginToStorefrontAccountWithRememberMeChecked">
+            <argument name="Customer" value="$$createCustomerForPersistent$$"/>
+        </actionGroup>
+        <!--Check customer name and last name in welcome message-->
+        <seeCurrentUrlMatches regex="~/customer/account/~" stepKey="seeCustomerAccountPageUrl1"/>
+        <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$!"
+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
+             stepKey="seeLoggedInCustomerWelcomeMessage1"/>
+
+        <!--Logout and check persistent customer welcome message-->
+        <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout1"/>
+        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl1"/>
+        <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$! Not you?"
+             selector="{{StorefrontHeaderSection.welcomeMessage}}"
+             stepKey="seePersistentWelcomeMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
index b88b02ab4cfb5..407dad05c3baf 100644
--- a/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Block/Header/AdditionalTest.php
@@ -34,44 +34,14 @@ class AdditionalTest extends \PHPUnit\Framework\TestCase
     protected $contextMock;
 
     /**
-     * @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $eventManagerMock;
+    private $jsonSerializerMock;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Persistent\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $scopeConfigMock;
-
-    /**
-     * @var \Magento\Framework\App\Cache\StateInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $cacheStateMock;
-
-    /**
-     * @var \Magento\Framework\App\CacheInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $cacheMock;
-
-    /**
-     * @var \Magento\Framework\Session\SidResolverInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $sidResolverMock;
-
-    /**
-     * @var \Magento\Framework\Session\SessionManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $sessionMock;
-
-    /**
-     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $escaperMock;
-
-    /**
-     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $urlBuilderMock;
+    private $persistentHelperMock;
 
     /**
      * @var \Magento\Persistent\Block\Header\Additional
@@ -93,17 +63,7 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->contextMock = $this->createPartialMock(\Magento\Framework\View\Element\Template\Context::class, [
-                'getEventManager',
-                'getScopeConfig',
-                'getCacheState',
-                'getCache',
-                'getInlineTranslation',
-                'getSidResolver',
-                'getSession',
-                'getEscaper',
-                'getUrlBuilder'
-            ]);
+        $this->contextMock = $this->createPartialMock(\Magento\Framework\View\Element\Template\Context::class, []);
         $this->customerViewHelperMock = $this->createMock(\Magento\Customer\Helper\View::class);
         $this->persistentSessionHelperMock = $this->createPartialMock(
             \Magento\Persistent\Helper\Session::class,
@@ -119,103 +79,14 @@ protected function setUp()
             ['getById']
         );
 
-        $this->eventManagerMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Event\ManagerInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['dispatch']
-        );
-        $this->scopeConfigMock = $this->getMockForAbstractClass(
-            \Magento\Framework\App\Config\ScopeConfigInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getValue']
-        );
-        $this->cacheStateMock = $this->getMockForAbstractClass(
-            \Magento\Framework\App\Cache\StateInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['isEnabled']
+        $this->jsonSerializerMock = $this->createPartialMock(
+            \Magento\Framework\Serialize\Serializer\Json::class,
+            ['serialize']
         );
-        $this->cacheMock = $this->getMockForAbstractClass(
-            \Magento\Framework\App\CacheInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['load']
+        $this->persistentHelperMock = $this->createPartialMock(
+            \Magento\Persistent\Helper\Data::class,
+            ['getLifeTime']
         );
-        $this->sidResolverMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Session\SidResolverInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getSessionIdQueryParam']
-        );
-        $this->sessionMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Session\SessionManagerInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getSessionId']
-        );
-        $this->escaperMock = $this->getMockForAbstractClass(
-            \Magento\Framework\Escaper::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['escapeHtml']
-        );
-        $this->urlBuilderMock = $this->getMockForAbstractClass(
-            \Magento\Framework\UrlInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getUrl']
-        );
-
-        $this->contextMock->expects($this->once())
-            ->method('getEventManager')
-            ->willReturn($this->eventManagerMock);
-        $this->contextMock->expects($this->once())
-            ->method('getScopeConfig')
-            ->willReturn($this->scopeConfigMock);
-        $this->contextMock->expects($this->once())
-            ->method('getCacheState')
-            ->willReturn($this->cacheStateMock);
-        $this->contextMock->expects($this->once())
-            ->method('getCache')
-            ->willReturn($this->cacheMock);
-        $this->contextMock->expects($this->once())
-            ->method('getSidResolver')
-            ->willReturn($this->sidResolverMock);
-        $this->contextMock->expects($this->once())
-            ->method('getSession')
-            ->willReturn($this->sessionMock);
-        $this->contextMock->expects($this->once())
-            ->method('getEscaper')
-            ->willReturn($this->escaperMock);
-        $this->contextMock->expects($this->once())
-            ->method('getUrlBuilder')
-            ->willReturn($this->urlBuilderMock);
 
         $this->additional = $this->objectManager->getObject(
             \Magento\Persistent\Block\Header\Additional::class,
@@ -224,91 +95,48 @@ protected function setUp()
                 'customerViewHelper' => $this->customerViewHelperMock,
                 'persistentSessionHelper' => $this->persistentSessionHelperMock,
                 'customerRepository' => $this->customerRepositoryMock,
-                'data' => []
+                'data' => [],
+                'jsonSerializer' => $this->jsonSerializerMock,
+                'persistentHelper' => $this->persistentHelperMock,
             ]
         );
     }
 
     /**
-     * Run test toHtml method
-     *
-     * @param bool $customerId
      * @return void
-     *
-     * @dataProvider dataProviderToHtml
      */
-    public function testToHtml($customerId)
+    public function testGetCustomerId(): void
     {
-        $cacheData = false;
-        $idQueryParam = 'id-query-param';
-        $sessionId = 'session-id';
-
-        $this->additional->setData('cache_lifetime', 789);
-        $this->additional->setData('cache_key', 'cache-key');
-
-        $this->eventManagerMock->expects($this->at(0))
-            ->method('dispatch')
-            ->with('view_block_abstract_to_html_before', ['block' => $this->additional]);
-        $this->eventManagerMock->expects($this->at(1))
-            ->method('dispatch')
-            ->with('view_block_abstract_to_html_after');
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with(
-                'advanced/modules_disable_output/Magento_Persistent',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )->willReturn(false);
-
-        // get cache
-        $this->cacheStateMock->expects($this->at(0))
-            ->method('isEnabled')
-            ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
-            ->willReturn(true);
-        // save cache
-        $this->cacheStateMock->expects($this->at(1))
-            ->method('isEnabled')
-            ->with(\Magento\Persistent\Block\Header\Additional::CACHE_GROUP)
-            ->willReturn(false);
-
-        $this->cacheMock->expects($this->once())
-            ->method('load')
-            ->willReturn($cacheData);
-        $this->sidResolverMock->expects($this->never())
-            ->method('getSessionIdQueryParam')
-            ->with($this->sessionMock)
-            ->willReturn($idQueryParam);
-        $this->sessionMock->expects($this->never())
-            ->method('getSessionId')
-            ->willReturn($sessionId);
-
-        // call protected _toHtml method
+        $customerId = 1;
+        /** @var \Magento\Persistent\Model\Session|\PHPUnit_Framework_MockObject_MockObject $sessionMock */
         $sessionMock = $this->createPartialMock(\Magento\Persistent\Model\Session::class, ['getCustomerId']);
-
-        $this->persistentSessionHelperMock->expects($this->atLeastOnce())
-            ->method('getSession')
-            ->willReturn($sessionMock);
-
-        $sessionMock->expects($this->atLeastOnce())
+        $sessionMock->expects($this->once())
             ->method('getCustomerId')
             ->willReturn($customerId);
+        $this->persistentSessionHelperMock->expects($this->once())
+            ->method('getSession')
+            ->willReturn($sessionMock);
 
-        if ($customerId) {
-            $this->assertEquals('<span><a  >Not you?</a></span>', $this->additional->toHtml());
-        } else {
-            $this->assertEquals('', $this->additional->toHtml());
-        }
+        $this->assertEquals($customerId, $this->additional->getCustomerId());
     }
 
     /**
-     * Data provider for dataProviderToHtml method
-     *
-     * @return array
+     * @return void
      */
-    public function dataProviderToHtml()
+    public function testGetConfig(): void
     {
-        return [
-            ['customerId' => 2],
-            ['customerId' => null],
-        ];
+        $lifeTime = 500;
+        $arrayToSerialize = ['expirationLifetime' => $lifeTime];
+        $serializedArray = '{"expirationLifetime":' . $lifeTime . '}';
+
+        $this->persistentHelperMock->expects($this->once())
+            ->method('getLifeTime')
+            ->willReturn($lifeTime);
+        $this->jsonSerializerMock->expects($this->once())
+            ->method('serialize')
+            ->with($arrayToSerialize)
+            ->willReturn($serializedArray);
+
+        $this->assertEquals($serializedArray, $this->additional->getConfig());
     }
 }
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
index 7008a9eb25e5d..6d4db70adc642 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
@@ -80,31 +80,18 @@ protected function setUp()
         );
     }
 
-    public function testEmulateWelcomeBlock()
+    /**
+     * @return void
+     */
+    public function testEmulateWelcomeBlock(): void
     {
-        $customerId = 1;
-        $customerName = 'Test Customer Name';
-        $welcomeMessage =  __('Welcome, %1!', $customerName);
-        $customerMock = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $welcomeMessage =  __('&nbsp;');
         $block = $this->getMockBuilder(\Magento\Framework\View\Element\AbstractBlock::class)
             ->disableOriginalConstructor()
             ->setMethods(['setWelcome'])
             ->getMock();
-        $headerAdditionalBlock = $this->getMockBuilder(\Magento\Framework\View\Element\AbstractBlock::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->persistentSessionMock->expects($this->once())->method('getSession')->willReturn($this->sessionMock);
-        $this->sessionMock->expects($this->once())->method('getCustomerId')->willReturn($customerId);
-        $this->customerRepositoryMock
-            ->expects($this->once())
-            ->method('getById')
-            ->with($customerId)->willReturn($customerMock);
-        $this->customerViewHelperMock->expects($this->once())->method('getCustomerName')->willReturn($customerName);
-        $this->layoutMock->expects($this->once())
-            ->method('getBlock')
-            ->with('header.additional')
-            ->willReturn($headerAdditionalBlock);
         $block->expects($this->once())->method('setWelcome')->with($welcomeMessage);
+
         $this->observer->emulateWelcomeBlock($block);
     }
 }
diff --git a/app/code/Magento/Persistent/etc/di.xml b/app/code/Magento/Persistent/etc/di.xml
index f49d4361acb52..c28426b4f25bf 100644
--- a/app/code/Magento/Persistent/etc/di.xml
+++ b/app/code/Magento/Persistent/etc/di.xml
@@ -12,4 +12,7 @@
     <type name="Magento\Customer\CustomerData\Customer">
         <plugin name="section_data" type="Magento\Persistent\Model\Plugin\CustomerData" />
     </type>
+    <type name="Magento\Framework\App\Http\Context">
+        <plugin name="persistent_page_cache_variation" type="Magento\Persistent\Model\Plugin\PersistentCustomerContext" />
+    </type>
 </config>
diff --git a/app/code/Magento/Persistent/etc/frontend/di.xml b/app/code/Magento/Persistent/etc/frontend/di.xml
index f976f4de79c21..3c33f8a51c418 100644
--- a/app/code/Magento/Persistent/etc/frontend/di.xml
+++ b/app/code/Magento/Persistent/etc/frontend/di.xml
@@ -35,4 +35,18 @@
     <type name="Magento\Checkout\Model\GuestPaymentInformationManagement">
         <plugin name="inject_guest_address_for_nologin" type="Magento\Persistent\Model\Checkout\GuestPaymentInformationManagementPlugin" />
     </type>
+    <type name="Magento\Customer\CustomerData\SectionPoolInterface">
+        <arguments>
+            <argument name="sectionSourceMap" xsi:type="array">
+                <item name="persistent" xsi:type="string">Magento\Persistent\CustomerData\Persistent</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Customer\Block\CustomerData">
+        <arguments>
+            <argument name="expirableSectionNames" xsi:type="array">
+                <item name="persistent" xsi:type="string">persistent</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Persistent/etc/frontend/sections.xml b/app/code/Magento/Persistent/etc/frontend/sections.xml
new file mode 100644
index 0000000000000..16b44c502fc47
--- /dev/null
+++ b/app/code/Magento/Persistent/etc/frontend/sections.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Customer:etc/sections.xsd">
+    <action name="persistent/index/unsetCookie">
+        <section name="persistent"/>
+    </action>
+</config>
diff --git a/app/code/Magento/Persistent/view/frontend/requirejs-config.js b/app/code/Magento/Persistent/view/frontend/requirejs-config.js
new file mode 100644
index 0000000000000..e30e07c454be5
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/requirejs-config.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    config: {
+        mixins: {
+            'Magento_Customer/js/customer-data': {
+                'Magento_Persistent/js/view/customer-data-mixin': true
+            }
+        }
+    }
+};
diff --git a/app/code/Magento/Persistent/view/frontend/templates/additional.phtml b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
new file mode 100644
index 0000000000000..28dce5dc23cc9
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<?php if ($block->getCustomerId()) :?>
+    <span>
+        <a <?= /* @escapeNotVerified */ $block->getLinkAttributes()?>><?= $block->escapeHtml(__('Not you?'));?></a>
+    </span>
+<?php endif;?>
+<script type="application/javascript">
+    window.persistent = <?= /* @noEscape */ $block->getConfig(); ?>;
+</script>
+<script type="text/x-magento-init">
+    {
+        "li.greet.welcome > span.not-logged-in": {
+            "Magento_Persistent/js/view/additional-welcome": {}
+        }
+    }
+</script>
diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
new file mode 100644
index 0000000000000..7ace6e60d1c39
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/translate',
+    'Magento_Customer/js/customer-data'
+], function ($, $t, customerData) {
+    'use strict';
+
+    return {
+        /**
+         * Init.
+         */
+        init: function () {
+            var persistent = customerData.get('persistent');
+
+            if (persistent().fullname === undefined) {
+                customerData.get('persistent').subscribe(this.replacePersistentWelcome);
+            } else {
+                this.replacePersistentWelcome();
+            }
+        },
+
+        /**
+         * Replace welcome message for customer with persistent cookie.
+         */
+        replacePersistentWelcome: function () {
+            var persistent = customerData.get('persistent'),
+                welcomeElems;
+
+            if (persistent().fullname !== undefined) {
+                welcomeElems = $('li.greet.welcome > span.not-logged-in');
+
+                if (welcomeElems.length) {
+                    $(welcomeElems).each(function () {
+                        var html = $t('Welcome, %1!').replace('%1', persistent().fullname);
+
+                        $(this).attr('data-bind', html);
+                        $(this).html(html);
+                    });
+                }
+            }
+        },
+
+        /**
+         * @constructor
+         */
+        'Magento_Persistent/js/view/additional-welcome': function () {
+            this.init();
+        }
+    };
+});
diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js b/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js
new file mode 100644
index 0000000000000..855404c6f6f32
--- /dev/null
+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/customer-data-mixin.js
@@ -0,0 +1,51 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/utils/wrapper'
+], function ($, wrapper) {
+    'use strict';
+
+    var mixin = {
+
+        /**
+         * Check if persistent section is expired due to lifetime.
+         *
+         * @param {Function} originFn - Original method.
+         * @return {Array}
+         */
+        getExpiredSectionNames: function (originFn) {
+            var expiredSections = originFn(),
+                storage = $.initNamespaceStorage('mage-cache-storage').localStorage,
+                currentTimestamp = Math.floor(Date.now() / 1000),
+                persistentIndex = expiredSections.indexOf('persistent'),
+                persistentLifeTime = 0,
+                sectionData;
+
+            if (window.persistent !== undefined && window.persistent.expirationLifetime !== undefined) {
+                persistentLifeTime = window.persistent.expirationLifetime;
+            }
+
+            if (persistentIndex !== -1) {
+                sectionData = storage.get('persistent');
+
+                if (typeof sectionData === 'object' &&
+                    sectionData['data_id'] + persistentLifeTime >= currentTimestamp
+                ) {
+                    expiredSections.splice(persistentIndex, 1);
+                }
+            }
+
+            return expiredSections;
+        }
+    };
+
+    /**
+     * Override default customer-data.getExpiredSectionNames().
+     */
+    return function (target) {
+        return wrapper.extend(target, mixin);
+    };
+});
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
index 84fcc8fc47dfb..6eb7e9e7d16df 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
@@ -19,7 +19,8 @@
         <element name="emailCopy" type="checkbox" selector=".order-totals-actions #send_email"/>
         <element name="refundStoreCredit" type="checkbox" selector=".order-totals-actions .field-refund-store-credit input[type='checkbox']"/>
         <element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="30"/>
+        <element name="submitRefundOfflineEnabled" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button'][class='action-default scalable save submit-button primary']" timeout="30"/>
         <element name="creditMemoItem" type="text" selector="#sales_order_view_tabs_order_creditmemos"/>
         <element name="viewMemo" type="text" selector="div#sales_order_view_tabs_order_creditmemos_content a.action-menu-item"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
index bc0d1cffd5d3e..03087d8949c2f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
@@ -28,5 +28,6 @@
         <element name="discountAmountColumn" type="text" selector=".order-invoice-tables .col-discount .price"/>
         <element name="totalColumn" type="text" selector=".order-invoice-tables .col-total .price"/>
         <element name="updateQty" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button']"/>
+        <element name="updateQtyEnabled" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button'][class='action-default scalable update-button']"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
new file mode 100644
index 0000000000000..a4088c7a4a0b7
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontHeaderSection">
+        <element name="welcomeMessage" type="text" selector=".greet.welcome"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
index 4395cab651de1..1103ae28741c6 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
@@ -15,11 +15,11 @@ $welcomeMessage = $block->getWelcome();
     case 'welcome': ?>
         <li class="greet welcome" data-bind="scope: 'customer'">
             <!-- ko if: customer().fullname  -->
-            <span data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
+            <span class="logged-in" data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().fullname)">
             </span>
             <!-- /ko -->
             <!-- ko ifnot: customer().fullname  -->
-            <span data-bind='html:"<?= $block->escapeHtml($welcomeMessage) ?>"'></span>
+            <span class="not-logged-in" data-bind='html:"<?= $block->escapeHtml($welcomeMessage) ?>"'></span>
             <?= $block->getBlockHtml('header.additional') ?>
             <!-- /ko -->
         </li>
diff --git a/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php b/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
index fba5354b691d6..2e447e7854a7c 100644
--- a/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
@@ -56,8 +56,8 @@ public function testToHtml()
         $this->_customerSession->loginById(1);
         $translation = __('Not you?');
 
-        $this->assertStringMatchesFormat(
-            '%A<span>%A<a%Ahref="' . $this->_block->getHref() . '"%A>' . $translation . '</a>%A</span>%A',
+        $this->assertContains(
+            '<a href="' . $this->_block->getHref() . '">' . $translation . '</a>',
             $this->_block->toHtml()
         );
         $this->_customerSession->logout();
diff --git a/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php
index ecf2cd77a13ff..d0c253fc7a64b 100644
--- a/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Persistent/Model/ObserverTest.php
@@ -9,7 +9,6 @@
 use Magento\Customer\Model\Context;
 
 /**
- * @magentoDataFixture Magento/Persistent/_files/persistent.php
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ObserverTest extends \PHPUnit\Framework\TestCase
@@ -29,11 +28,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $customerRepository;
 
-    /**
-     * @var \Magento\Persistent\Helper\Session
-     */
-    protected $_persistentSessionHelper;
-
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
@@ -44,11 +38,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $_observer;
 
-    /**
-     * @var \Magento\Customer\Model\Session
-     */
-    protected $_customerSession;
-
     /**
      * @var \Magento\Checkout\Model\Session | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -58,8 +47,6 @@ public function setUp()
     {
         $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-        $this->_customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
-
         $this->_customerViewHelper = $this->_objectManager->create(
             \Magento\Customer\Helper\View::class
         );
@@ -75,8 +62,6 @@ public function setUp()
             \Magento\Checkout\Model\Session::class
         )->disableOriginalConstructor()->setMethods([])->getMock();
 
-        $this->_persistentSessionHelper = $this->_objectManager->create(\Magento\Persistent\Helper\Session::class);
-
         $this->_observer = $this->_objectManager->create(
             \Magento\Persistent\Model\Observer::class,
             [
@@ -89,16 +74,11 @@ public function setUp()
     }
 
     /**
-     * @magentoConfigFixture current_store persistent/options/enabled 1
-     * @magentoConfigFixture current_store persistent/options/remember_enabled 1
-     * @magentoConfigFixture current_store persistent/options/remember_default 1
      * @magentoAppArea frontend
      * @magentoAppIsolation enabled
      */
     public function testEmulateWelcomeBlock()
     {
-        $this->_customerSession->loginById(1);
-
         $httpContext = new \Magento\Framework\App\Http\Context();
         $httpContext->setValue(Context::CONTEXT_AUTH, 1, 1);
         $block = $this->_objectManager->create(
@@ -108,15 +88,7 @@ public function testEmulateWelcomeBlock()
             ]
         );
         $this->_observer->emulateWelcomeBlock($block);
-        $customerName = $this->_escaper->escapeHtml(
-            $this->_customerViewHelper->getCustomerName(
-                $this->customerRepository->getById(
-                    $this->_persistentSessionHelper->getSession()->getCustomerId()
-                )
-            )
-        );
-        $translation = __('Welcome, %1!', $customerName)->__toString();
-        $this->assertStringMatchesFormat('%A' . $translation . '%A', $block->getWelcome()->__toString());
-        $this->_customerSession->logout();
+
+        $this->assertEquals('&nbsp;', $block->getWelcome());
     }
 }

From e29c5dda7b4b58384e91752d3e40c578ee0eda7b Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 21 Dec 2018 13:15:10 +0200
Subject: [PATCH 350/932] Fix integration test.

---
 app/code/Magento/Backend/Model/Search/Customer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/Model/Search/Customer.php b/app/code/Magento/Backend/Model/Search/Customer.php
index 35a7359ce9980..e76a1b77ab2d6 100644
--- a/app/code/Magento/Backend/Model/Search/Customer.php
+++ b/app/code/Magento/Backend/Model/Search/Customer.php
@@ -89,7 +89,7 @@ public function load()
 
         $this->searchCriteriaBuilder->setCurrentPage($this->getStart());
         $this->searchCriteriaBuilder->setPageSize($this->getLimit());
-        $searchFields = ['firstname', 'lastname', 'company'];
+        $searchFields = ['firstname', 'lastname', 'billing_company'];
         $filters = [];
         foreach ($searchFields as $field) {
             $filters[] = $this->filterBuilder

From 5ebb2f51373d2303c51059c617cb00ea1489e4f4 Mon Sep 17 00:00:00 2001
From: bshevchenko <1408sheva@gmail.com>
Date: Fri, 21 Dec 2018 13:22:39 +0200
Subject: [PATCH 351/932] MAGETWO-96706: Cart Price Rule with related Banner
 for specific Customer Segment is persisted under long-term cookie

---
 .../Backend/Test/Mftf/Section/AdminMainActionsSection.xml       | 2 +-
 .../VerifySubscribedNewsletterDisplayedActionGroup.xml          | 2 +-
 .../Test/Mftf/Section/StorefrontNewsletterManageSection.xml     | 1 -
 .../SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
index c6d37291e625f..ef2e5f4216889 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -10,7 +10,7 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMainActionsSection">
         <element name="save" type="button" selector="#save" timeout="30"/>
-        <element name="saveAndContinue" type="button" selector="#save_and_continue_edit" timeout="30"/>
+        <element name="saveAndContinue" type="button" selector="button[id*=save_and_continue]" timeout="30"/>
         <element name="delete" type="button" selector="#delete" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
index 8414a1231f922..059f157c407c9 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/VerifySubscribedNewsletterDisplayedActionGroup.xml
@@ -28,6 +28,6 @@
     <!--Check Subscribed Newsletter via StoreFront-->
     <actionGroup name="CheckSubscribedNewsletterActionGroup">
         <amOnPage url="{{StorefrontNewsletterManagePage.url}}" stepKey="goToNewsletterManage"/>
-        <seeElement selector="{{StorefrontNewsletterManageSection.subscriptionChecked}}" stepKey="checkSubscribedNewsletter"/>
+        <seeCheckboxIsChecked selector="{{StorefrontNewsletterManageSection.subscriptionCheckbox}}" stepKey="checkSubscribedNewsletter"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
index 7d4c9e476b777..96a944a4952ac 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/StorefrontNewsletterManageSection.xml
@@ -10,6 +10,5 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontNewsletterManageSection">
         <element name="subscriptionCheckbox" type="checkbox" selector="#subscription" />
-        <element name="subscriptionChecked" type="checkbox" selector="#subscription[checked='checked']" />
     </section>
 </sections>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
index 5e9247825b29a..cc695b347c4fb 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleAddressConditionsData.xml
@@ -16,6 +16,6 @@
         <data key="shippingPostCode">Magento\SalesRule\Model\Rule\Condition\Address|postcode</data>
         <data key="shippingRegion">Magento\SalesRule\Model\Rule\Condition\Address|region</data>
         <data key="shippingState">Magento\SalesRule\Model\Rule\Condition\Address|region_id</data>
-        <data key="ShippingCountry">Magento\SalesRule\Model\Rule\Condition\Address|country_id</data>
+        <data key="shippingCountry">Magento\SalesRule\Model\Rule\Condition\Address|country_id</data>
     </entity>
 </entities>

From e60a01d9bf0c97797e29c049d26eaa35ae516966 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Fri, 21 Dec 2018 17:12:16 +0530
Subject: [PATCH 352/932] fixed issue #19925

Close button overlapping in shipping address label whenever any user adding new shipping address in mobile view in checkout
---
 .../Magento/luma/web/css/source/components/_modals_extend.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
index ae68fc81acd6e..aad5022e96ccd 100644
--- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
+++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
@@ -82,7 +82,8 @@
 
     .modal-slide {
         .action-close {
-            padding: @modal-slide-action-close__padding;
+            padding: 0;
+            margin: 15px;
         }
 
         .page-main-actions {

From 069fa71e96537880312658c91523747405af1e00 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Fri, 21 Dec 2018 13:59:17 +0200
Subject: [PATCH 353/932] MAGETWO-97247: Impossible to enable shared catalog
 through cli command

---
 .../Command/ConfigSet/DefaultProcessor.php    | 16 +----
 app/code/Magento/Config/Model/Config.php      | 48 +++++++++-----
 .../ConfigSet/DefaultProcessorTest.php        | 64 +++++++------------
 3 files changed, 57 insertions(+), 71 deletions(-)

diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index 34b8afb7ef144..86ae1f96749df 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -11,7 +11,6 @@
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\ScopeResolverPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Config\Model\PreparedValueFactory;
 
@@ -47,11 +46,6 @@ class DefaultProcessor implements ConfigSetProcessorInterface
      */
     private $preparedValueFactory;
 
-    /**
-     * @var ScopeResolverPool
-     */
-    private $scopeResolverPool;
-
     /**
      * @var ConfigFactory
      */
@@ -61,21 +55,18 @@ class DefaultProcessor implements ConfigSetProcessorInterface
      * @param PreparedValueFactory $preparedValueFactory The factory for prepared value
      * @param DeploymentConfig $deploymentConfig The deployment configuration reader
      * @param ConfigPathResolver $configPathResolver The resolver for configuration paths according to source type
-     * @param ScopeResolverPool|null $scopeResolverPool
      * @param ConfigFactory|null $configFactory
      */
     public function __construct(
         PreparedValueFactory $preparedValueFactory,
         DeploymentConfig $deploymentConfig,
         ConfigPathResolver $configPathResolver,
-        ScopeResolverPool $scopeResolverPool = null,
         ConfigFactory $configFactory = null
     ) {
         $this->preparedValueFactory = $preparedValueFactory;
         $this->deploymentConfig = $deploymentConfig;
         $this->configPathResolver = $configPathResolver;
 
-        $this->scopeResolverPool = $scopeResolverPool ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
         $this->configFactory = $configFactory ?? ObjectManager::getInstance()->get(ConfigFactory::class);
     }
 
@@ -99,12 +90,9 @@ public function process($path, $value, $scope, $scopeCode)
         }
 
         try {
-            $resolvedScope = $this->scopeResolverPool->get($scope)
-                ->getScope($scopeCode);
             $config = $this->configFactory->create([
-                'scope' => $resolvedScope->getScopeType(),
-                'scope_id' => $resolvedScope->getId(),
-                'scope_code' => $resolvedScope->getCode(),
+                'scope' => $scope,
+                'scope_code' => $scopeCode,
             ]);
             $config->setDataByPath($path, $value);
             $config->save();
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 66b0112f5cef6..8aa7171bd8f72 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -119,6 +119,7 @@ class Config extends \Magento\Framework\DataObject
      * @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
      * @param array $data
      * @param ScopeResolverPool|null $scopeResolverPool
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Config\ReinitableConfigInterface $config,
@@ -529,7 +530,7 @@ public function setDataByPath($path, $value)
     }
 
     /**
-     * Resolve scope data
+     * Set scope data
      *
      * @return void
      */
@@ -545,35 +546,48 @@ private function initScope()
             $this->setStore('');
         }
 
-        if ($this->getScope() && $this->getScopeId() && $this->getScopeCode()) {
+        if ($this->getScope()) {
             $scope = $this->scopeResolverPool->get($this->getScope())
-                ->getScope($this->getScopeId());
+                ->getScope($this->getScopeCode());
             if (StoreScopeInterface::SCOPE_WEBSITE === $scope->getScopeType()) {
                 $this->setWebsite($scope->getId());
             } elseif (StoreScopeInterface::SCOPE_STORE === $scope->getScopeType()) {
                 $this->setStore($scope->getId());
             }
+            $this->setScopeId($scope->getId());
         } else {
-            switch (true) {
-                case $this->getStore():
-                    $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_STORE)
-                        ->getScope($this->getStore());
-                    break;
-                case $this->getWebsite():
-                    $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_WEBSITE)
-                        ->getScope($this->getWebsite());
-                    break;
-                default:
-                    $scope = $this->scopeResolverPool->get(ScopeInterface::SCOPE_DEFAULT)
-                        ->getScope(0);
-                    break;
-            }
+            $scope = $this->resolveScope();
             $this->setScope($scope->getScopeType());
             $this->setScopeId($scope->getId());
             $this->setScopeCode($scope->getCode());
         }
     }
 
+    /**
+     * Resolve scope
+     *
+     * @return ScopeInterface
+     */
+    private function resolveScope(): ScopeInterface
+    {
+        switch (true) {
+            case $this->getStore():
+                $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_STORE)
+                    ->getScope($this->getStore());
+                break;
+            case $this->getWebsite():
+                $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_WEBSITE)
+                    ->getScope($this->getWebsite());
+                break;
+            default:
+                $scope = $this->scopeResolverPool->get(ScopeInterface::SCOPE_DEFAULT)
+                    ->getScope(0);
+                break;
+        }
+
+        return $scope;
+    }
+
     /**
      * Return formatted config data for current section
      *
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
index 984e0fe842687..edb76c067bf35 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
@@ -7,13 +7,14 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\DefaultProcessor;
+use Magento\Config\Model\Config;
+use Magento\Config\Model\Config\Factory as ConfigFactory;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Config\Model\PreparedValueFactory;
 use Magento\Framework\App\Config\Value;
-use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
@@ -55,17 +56,18 @@ class DefaultProcessorTest extends \PHPUnit\Framework\TestCase
      */
     private $resourceModelMock;
 
+    /**
+     * @var ConfigFactory|Mock
+     */
+    private $configFactory;
+
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
-        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->configPathResolverMock = $this->getMockBuilder(ConfigPathResolver::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->configPathResolverMock = $this->createMock(ConfigPathResolver::class);
         $this->resourceModelMock = $this->getMockBuilder(AbstractDb::class)
             ->disableOriginalConstructor()
             ->setMethods(['save'])
@@ -74,14 +76,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getResource'])
             ->getMock();
-        $this->preparedValueFactoryMock = $this->getMockBuilder(PreparedValueFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->preparedValueFactoryMock = $this->createMock(PreparedValueFactory::class);
+        $this->configFactory = $this->createMock(ConfigFactory::class);
 
         $this->model = new DefaultProcessor(
             $this->preparedValueFactoryMock,
             $this->deploymentConfigMock,
-            $this->configPathResolverMock
+            $this->configPathResolverMock,
+            $this->configFactory
         );
     }
 
@@ -98,15 +100,16 @@ public function testProcess($path, $value, $scope, $scopeCode)
     {
         $this->configMockForProcessTest($path, $scope, $scopeCode);
 
-        $this->preparedValueFactoryMock->expects($this->once())
+        $config = $this->createMock(Config::class);
+        $this->configFactory->expects($this->once())
             ->method('create')
-            ->willReturn($this->valueMock);
-        $this->valueMock->expects($this->once())
-            ->method('getResource')
-            ->willReturn($this->resourceModelMock);
-        $this->resourceModelMock->expects($this->once())
+            ->with(['scope' => $scope, 'scope_code' => $scopeCode])
+            ->willReturn($config);
+        $config->expects($this->once())
+            ->method('setDataByPath')
+            ->with($path, $value);
+        $config->expects($this->once())
             ->method('save')
-            ->with($this->valueMock)
             ->willReturnSelf();
 
         $this->model->process($path, $value, $scope, $scopeCode);
@@ -124,28 +127,6 @@ public function processDataProvider()
         ];
     }
 
-    public function testProcessWithWrongValueInstance()
-    {
-        $path = 'test/test/test';
-        $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
-        $scopeCode = null;
-        $value = 'value';
-        $valueInterfaceMock = $this->getMockBuilder(ValueInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->configMockForProcessTest($path, $scope, $scopeCode);
-
-        $this->preparedValueFactoryMock->expects($this->once())
-            ->method('create')
-            ->willReturn($valueInterfaceMock);
-        $this->valueMock->expects($this->never())
-            ->method('getResource');
-        $this->resourceModelMock->expects($this->never())
-            ->method('save');
-
-        $this->model->process($path, $value, $scope, $scopeCode);
-    }
-
     /**
      * @param string $path
      * @param string $scope
@@ -185,6 +166,9 @@ public function testProcessLockedValue()
             ->method('resolve')
             ->willReturn('system/default/test/test/test');
 
+        $this->configFactory->expects($this->never())
+            ->method('create');
+
         $this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
     }
 }

From bf6487e1ec853b6f8e49074c513872cd63e4fab3 Mon Sep 17 00:00:00 2001
From: bshevchenko <1408sheva@gmail.com>
Date: Fri, 21 Dec 2018 14:14:49 +0200
Subject: [PATCH 354/932] MAGETWO-96706: Cart Price Rule with related Banner
 for specific Customer Segment is persisted under long-term cookie

---
 .../Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
index 33bbeff73864f..e5907e1e9c0f5 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleActionGroup.xml
@@ -35,7 +35,7 @@
         <selectOption userInput="{{operatorType}}" selector="{{AdminCartPriceRulesFormSection.conditionsOperator}}" stepKey="setOperatorType"/>
         <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption1"/>
         <fillField userInput="{{value}}" selector="{{AdminCartPriceRulesFormSection.conditionsValue}}" stepKey="fillActionValue"/>
-        <click selector="{{AdminCartPriceRulesFormSection.saveAndContinue}}" stepKey="clickSaveButton"/>
+        <click selector="{{AdminMainActionsSection.saveAndContinue}}" stepKey="clickSaveButton"/>
         <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
     </actionGroup>
 </actionGroups>

From 11f45e261e8352dc8fc052cbca5e8558769853b9 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 21 Dec 2018 15:33:45 +0300
Subject: [PATCH 355/932] MAGETWO-71344: Update product from mini shopping cart
 doesn't reflect in the shopping cart

- Reload shopping cart page after ajax call
---
 app/code/Magento/Checkout/view/frontend/web/js/sidebar.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index 2ebe2fe6b330c..d4ad69f586021 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -216,9 +216,6 @@ define([
                 'item_id': itemId,
                 'item_qty': $('#cart-item-' + itemId + '-qty').val()
             }, elem, this._updateItemQtyAfter);
-            if (window.location.href === this.shoppingCartUrl) {
-                window.location.reload(false);
-            }
         },
 
         /**
@@ -231,6 +228,9 @@ define([
 
             if (!_.isUndefined(productData)) {
                 $(document).trigger('ajax:updateCartItemQty');
+                if (window.location.href === this.shoppingCartUrl) {
+                    window.location.reload(false);
+                }
             }
             this._hideItemButton(elem);
         },

From dac1576106dabd630aea06bd824fe93cac0ebe8b Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Fri, 21 Dec 2018 13:58:36 +0300
Subject: [PATCH 356/932] MAGETWO-95813: Only two bundle options are added to
 the cart

- Fix stabilization.
---
 .../Magento/Bundle/Model/Product/Type.php     | 33 ++++------
 .../Test/Unit/Model/Product/TypeTest.php      | 64 ++++++++++++++-----
 2 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 2eec13d291390..425f04c0ffccb 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -13,6 +13,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
  * Bundle Type Model
@@ -160,6 +161,11 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      */
     private $selectionCollectionFilterApplier;
 
+    /**
+     * @var ArrayUtils
+     */
+    private $arrayUtility;
+
     /**
      * @param \Magento\Catalog\Model\Product\Option $catalogProductOption
      * @param \Magento\Eav\Model\Config $eavConfig
@@ -185,6 +191,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      * @param MetadataPool|null $metadataPool
      * @param SelectionCollectionFilterApplier|null $selectionCollectionFilterApplier
+     * @param ArrayUtils|null $arrayUtility
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -212,7 +219,8 @@ public function __construct(
         \Magento\CatalogInventory\Api\StockStateInterface $stockState,
         Json $serializer = null,
         MetadataPool $metadataPool = null,
-        SelectionCollectionFilterApplier $selectionCollectionFilterApplier = null
+        SelectionCollectionFilterApplier $selectionCollectionFilterApplier = null,
+        ArrayUtils $arrayUtility = null
     ) {
         $this->_catalogProduct = $catalogProduct;
         $this->_catalogData = $catalogData;
@@ -232,6 +240,7 @@ public function __construct(
 
         $this->selectionCollectionFilterApplier = $selectionCollectionFilterApplier
             ?: ObjectManager::getInstance()->get(SelectionCollectionFilterApplier::class);
+        $this->arrayUtility= $arrayUtility ?: ObjectManager::getInstance()->get(ArrayUtils::class);
 
         parent::__construct(
             $catalogProductOption,
@@ -670,7 +679,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                     $options
                 );
 
-                $selectionIds = $this->multiToFlatArray($options);
+                $selectionIds = array_values($this->arrayUtility->flatten($options));
                 // If product has not been configured yet then $selections array should be empty
                 if (!empty($selectionIds)) {
                     $selections = $this->getSelectionsByIds($selectionIds, $product);
@@ -811,26 +820,6 @@ private function recursiveIntval(array $array)
         return $array;
     }
 
-    /**
-     * Convert multi dimensional array to flat
-     *
-     * @param array $array
-     * @return int[]
-     */
-    private function multiToFlatArray(array $array)
-    {
-        $flatArray = [];
-        foreach ($array as $key => $value) {
-            if (is_array($value)) {
-                $flatArray = $flatArray + $this->multiToFlatArray($value);
-            } else {
-                $flatArray[$key] = $value;
-            }
-        }
-
-        return $flatArray;
-    }
-
     /**
      * Retrieve message for specify option(s)
      *
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
index 4bbf5641c55d3..675cb98b28591 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -15,6 +15,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
  * Class TypeTest
@@ -87,6 +88,11 @@ class TypeTest extends \PHPUnit\Framework\TestCase
      */
     private $serializer;
 
+    /**
+     * @var ArrayUtils|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $arrayUtility;
+
     /**
      * @return void
      */
@@ -159,6 +165,11 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->arrayUtility = $this->getMockBuilder(ArrayUtils::class)
+            ->setMethods(['flatten'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->model = $objectHelper->getObject(
             \Magento\Bundle\Model\Product\Type::class,
@@ -175,6 +186,7 @@ protected function setUp()
                 'priceCurrency' => $this->priceCurrency,
                 'serializer' => $this->serializer,
                 'metadataPool' => $this->metadataPool,
+                'arrayUtility' => $this->arrayUtility
             ]
         );
     }
@@ -421,6 +433,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
                     return $resultValue;
                 }
             );
+        $bundleOptions = [3 => 5];
+
         $product->expects($this->any())
             ->method('getId')
             ->willReturn(333);
@@ -438,9 +452,7 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->with($selectionCollection, true, true);
         $productType->expects($this->once())
             ->method('setStoreFilter');
-        $buyRequest->expects($this->once())
-            ->method('getBundleOption')
-            ->willReturn([3 => 5]);
+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
         $selectionCollection->expects($this->any())
             ->method('getItems')
             ->willReturn([$selection]);
@@ -491,6 +503,9 @@ function ($key) use ($optionCollection, $selectionCollection) {
         $option->expects($this->once())
             ->method('getTitle')
             ->willReturn('Title for option');
+
+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
+
         $buyRequest->expects($this->once())
             ->method('getBundleOptionQty')
             ->willReturn([3 => 5]);
@@ -657,6 +672,8 @@ function ($key) use ($optionCollection, $selectionCollection) {
                     return $resultValue;
                 }
             );
+        $bundleOptions = [3 => 5];
+
         $product->expects($this->any())
             ->method('getId')
             ->willReturn(333);
@@ -676,7 +693,10 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('setStoreFilter');
         $buyRequest->expects($this->once())
             ->method('getBundleOption')
-            ->willReturn([3 => 5]);
+            ->willReturn($bundleOptions);
+
+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
+
         $selectionCollection->expects($this->any())
             ->method('getItems')
             ->willReturn([$selection]);
@@ -898,9 +918,10 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->with($selectionCollection, true, true);
         $productType->expects($this->once())
             ->method('setStoreFilter');
-        $buyRequest->expects($this->once())
-            ->method('getBundleOption')
-            ->willReturn([3 => 5]);
+
+        $bundleOptions = [3 => 5];
+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
+
         $selectionCollection->expects($this->any())
             ->method('getItems')
             ->willReturn([$selection]);
@@ -951,6 +972,9 @@ function ($key) use ($optionCollection, $selectionCollection) {
         $option->expects($this->once())
             ->method('getTitle')
             ->willReturn('Title for option');
+
+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
+
         $buyRequest->expects($this->once())
             ->method('getBundleOptionQty')
             ->willReturn([3 => 5]);
@@ -1065,13 +1089,15 @@ function ($key) use ($optionCollection) {
             ->willReturn(333);
         $productType->expects($this->once())
             ->method('setStoreFilter');
-        $buyRequest->expects($this->once())
-            ->method('getBundleOption')
-            ->willReturn([]);
+
+        $bundleOptions = [];
+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
         $buyRequest->expects($this->once())
             ->method('getBundleOptionQty')
             ->willReturn([3 => 5]);
 
+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
+
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product, 'single');
         $this->assertEquals([$product], $result);
     }
@@ -1177,9 +1203,12 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->with($selectionCollection, true, true);
         $productType->expects($this->once())
             ->method('setStoreFilter');
-        $buyRequest->expects($this->once())
-            ->method('getBundleOption')
-            ->willReturn([3 => 5]);
+
+        $bundleOptions = [3 => 5];
+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
+
+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
+
         $selectionCollection->expects($this->at(0))
             ->method('getItems')
             ->willReturn([$selection]);
@@ -1301,9 +1330,12 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->willReturn($option);
         $productType->expects($this->once())
             ->method('setStoreFilter');
-        $buyRequest->expects($this->once())
-            ->method('getBundleOption')
-            ->willReturn([3 => 5]);
+
+        $bundleOptions = [3 => 5];
+        $buyRequest->expects($this->once())->method('getBundleOption')->willReturn($bundleOptions);
+
+        $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
+
         $selectionCollection->expects($this->any())
             ->method('getItems')
             ->willReturn([$selection]);

From 2bc10a2484462d6554dbc07655b68e56ca4f72f2 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 21 Dec 2018 15:58:15 +0200
Subject: [PATCH 357/932] ENGCOM-3491: WebAPI test fix.

---
 .../Service/V1/OrderStatusHistoryAddTest.php  | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
index c5ecead00ce29..9e3bd4ca48478 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
@@ -11,6 +11,7 @@
 
 /**
  * Class OrderCommentAddTest
+ *
  * @package Magento\Sales\Service\V1
  */
 class OrderStatusHistoryAddTest extends WebapiAbstract
@@ -48,7 +49,7 @@ public function testOrderCommentAdd()
             OrderStatusHistoryInterface::CREATED_AT => null,
             OrderStatusHistoryInterface::PARENT_ID => $order->getId(),
             OrderStatusHistoryInterface::ENTITY_NAME => null,
-            OrderStatusHistoryInterface::STATUS => null,
+            OrderStatusHistoryInterface::STATUS => $order->getStatus(),
             OrderStatusHistoryInterface::IS_VISIBLE_ON_FRONT => 1,
         ];
 
@@ -69,25 +70,27 @@ public function testOrderCommentAdd()
 
         //Verification
         $comments = $order->load($order->getId())->getAllStatusHistory();
+        $comment = reset($comments);
 
-        $commentData = reset($comments);
-        foreach ($commentData as $key => $value) {
-            $this->assertEquals(
-                $commentData[OrderStatusHistoryInterface::COMMENT],
-                $statusHistoryComment->getComment()
-            );
-            $this->assertEquals(
-                $commentData[OrderStatusHistoryInterface::PARENT_ID],
-                $statusHistoryComment->getParentId()
-            );
-            $this->assertEquals(
-                $commentData[OrderStatusHistoryInterface::IS_CUSTOMER_NOTIFIED],
-                $statusHistoryComment->getIsCustomerNotified()
-            );
-            $this->assertEquals(
-                $commentData[OrderStatusHistoryInterface::IS_VISIBLE_ON_FRONT],
-                $statusHistoryComment->getIsVisibleOnFront()
-            );
-        }
+        $this->assertEquals(
+            $commentData[OrderStatusHistoryInterface::COMMENT],
+            $comment->getComment()
+        );
+        $this->assertEquals(
+            $commentData[OrderStatusHistoryInterface::PARENT_ID],
+            $comment->getParentId()
+        );
+        $this->assertEquals(
+            $commentData[OrderStatusHistoryInterface::IS_CUSTOMER_NOTIFIED],
+            $comment->getIsCustomerNotified()
+        );
+        $this->assertEquals(
+            $commentData[OrderStatusHistoryInterface::IS_VISIBLE_ON_FRONT],
+            $comment->getIsVisibleOnFront()
+        );
+        $this->assertEquals(
+            $commentData[OrderStatusHistoryInterface::STATUS],
+            $comment->getStatus()
+        );
     }
 }

From 05273e3bedd2007a708156a260dbc1834b0adfc7 Mon Sep 17 00:00:00 2001
From: Aleksey Gorbulin <a.gorbulin@ism-ukraine.com>
Date: Fri, 21 Dec 2018 16:32:43 +0200
Subject: [PATCH 358/932] Refactoring - remove never used classes - use short
 names for classes instead of fully described names in Magento_SalesRule
 module

---
 .../Controller/Adminhtml/Promo/Quote/Generate.php          | 1 -
 app/code/Magento/SalesRule/Model/CouponRepository.php      | 5 ++---
 app/code/Magento/SalesRule/Model/Data/Rule.php             | 3 +--
 .../Model/Plugin/QuoteConfigProductAttributes.php          | 2 --
 .../Magento/SalesRule/Model/ResourceModel/ReadHandler.php  | 1 -
 .../Magento/SalesRule/Model/ResourceModel/SaveHandler.php  | 1 -
 .../SalesRule/Model/Rule/Action/Discount/CartFixed.php     | 1 -
 .../SalesRule/Model/Rule/Metadata/ValueProvider.php        | 1 -
 app/code/Magento/SalesRule/Model/RuleRepository.php        | 5 ++---
 .../Setup/Patch/Data/ConvertSerializedDataToJson.php       | 1 -
 .../Patch/Data/FillSalesRuleProductAttributeTable.php      | 1 -
 .../Setup/Patch/Data/PrepareRuleModelSerializedData.php    | 7 +++----
 .../Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php  | 1 -
 .../Test/Unit/Model/ResourceModel/ReadHandlerTest.php      | 4 ++--
 .../Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php | 7 ++-----
 15 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
index 12d34b8320d07..1a3828ea08c48 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\SalesRule\Model\CouponGenerator;
 
 class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
diff --git a/app/code/Magento/SalesRule/Model/CouponRepository.php b/app/code/Magento/SalesRule/Model/CouponRepository.php
index 99d6727a8be29..8a77c3bb0f935 100644
--- a/app/code/Magento/SalesRule/Model/CouponRepository.php
+++ b/app/code/Magento/SalesRule/Model/CouponRepository.php
@@ -8,7 +8,6 @@
 
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Framework\Api\SortOrder;
 use Magento\SalesRule\Model\ResourceModel\Coupon\Collection;
 
 /**
@@ -197,13 +196,13 @@ public function deleteById($couponId)
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
+     * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @deprecated 100.2.0
      * @return void
      */
     protected function addFilterGroupToCollection(
-        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
+        FilterGroup $filterGroup,
         Collection $collection
     ) {
         $fields = [];
diff --git a/app/code/Magento/SalesRule/Model/Data/Rule.php b/app/code/Magento/SalesRule/Model/Data/Rule.php
index 72465b285032e..e9a70ade04be2 100644
--- a/app/code/Magento/SalesRule/Model/Data/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Data/Rule.php
@@ -16,8 +16,7 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @codeCoverageIgnore
  */
-class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements
-    \Magento\SalesRule\Api\Data\RuleInterface
+class Rule extends \Magento\Framework\Api\AbstractExtensibleObject implements RuleInterface
 {
     const KEY_RULE_ID = 'rule_id';
     const KEY_NAME = 'name';
diff --git a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
index 9705808c88a01..9eb7f21ed1374 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\SalesRule\Model\Plugin;
 
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Model\Session;
 use Magento\SalesRule\Model\ResourceModel\Rule as RuleResource;
 
 class QuoteConfigProductAttributes
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
index 193a949108103..1d76bb11e3ce1 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
index 685de1b581fb4..e59a1217f7d0e 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
index 3cd776fe99f5d..cdf2351ef076b 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\Rule\Action\Discount;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\SalesRule\Model\DeltaPriceRound;
 use Magento\SalesRule\Model\Validator;
diff --git a/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php b/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
index b57daac1f0d58..fdd6c2b169a7d 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\Rule\Metadata;
 
-use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 use Magento\SalesRule\Model\Rule;
 use Magento\Store\Model\System\Store;
 use Magento\Customer\Api\GroupRepositoryInterface;
diff --git a/app/code/Magento/SalesRule/Model/RuleRepository.php b/app/code/Magento/SalesRule/Model/RuleRepository.php
index a2279db85aa1f..ce34e86ba7f6b 100644
--- a/app/code/Magento/SalesRule/Model/RuleRepository.php
+++ b/app/code/Magento/SalesRule/Model/RuleRepository.php
@@ -8,7 +8,6 @@
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\Framework\Api\SortOrder;
 use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 
 /**
@@ -183,13 +182,13 @@ public function deleteById($id)
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
+     * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @deprecated 100.2.0
      * @return void
      */
     protected function addFilterGroupToCollection(
-        \Magento\Framework\Api\Search\FilterGroup $filterGroup,
+        FilterGroup $filterGroup,
         Collection $collection
     ) {
         $fields = [];
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
index 8a8c51e9d349a..ea8a0a551760c 100644
--- a/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -6,7 +6,6 @@
 
 namespace Magento\SalesRule\Setup\Patch\Data;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
index 625d5769fddf5..fe6b1eea7a4d7 100644
--- a/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
@@ -6,7 +6,6 @@
 
 namespace Magento\SalesRule\Setup\Patch\Data;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\State;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
index 2387f5f1ed714..651b2c0e8a9e2 100644
--- a/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
@@ -7,7 +7,6 @@
 namespace Magento\SalesRule\Setup\Patch\Data;
 
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
@@ -18,16 +17,16 @@
 class PrepareRuleModelSerializedData implements DataPatchInterface, PatchVersionInterface
 {
     /**
-     * @var \Magento\Framework\Setup\ModuleDataSetupInterface
+     * @var ModuleDataSetupInterface
      */
     private $moduleDataSetup;
 
     /**
      * PatchInitial constructor.
-     * @param \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+     * @param ModuleDataSetupInterface $moduleDataSetup
      */
     public function __construct(
-        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+        ModuleDataSetupInterface $moduleDataSetup
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
     }
diff --git a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
index 7812444c68694..ae59a1f90b8e3 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Test\Unit\Block\Adminhtml\Promo\Quote\Edit;
 
-use Magento\SalesRule\Model\RegistryConstants;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class DeleteButtonTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
index 0d6c09b7f6141..f7522746b2100 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
@@ -16,7 +16,7 @@
 class ReadHandlerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\ResourceModel\ReadHandler
+     * @var ReadHandler
      */
     protected $model;
 
@@ -49,7 +49,7 @@ protected function setUp()
         $this->metadataPool = $this->createMock($className);
 
         $this->model = $this->objectManager->getObject(
-            \Magento\SalesRule\Model\ResourceModel\ReadHandler::class,
+            ReadHandler::class,
             [
                 'ruleResource' => $this->ruleResource,
                 'metadataPool' => $this->metadataPool,
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
index 528db1ea0b891..65f345cb78d66 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
@@ -13,7 +13,7 @@
 class DateApplierTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier|\PHPUnit_Framework_MockObject_MockObject
+     * @var DateApplier|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $model;
 
@@ -29,10 +29,7 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->model = $this->objectManager->getObject(
-            \Magento\SalesRule\Model\ResourceModel\Rule\DateApplier::class,
-            []
-        );
+        $this->model = $this->objectManager->getObject(DateApplier::class, []);
     }
 
     /**

From 606e31c18652afe2d582a8fb2ccceb1a3c5aacda Mon Sep 17 00:00:00 2001
From: Aleksey Gorbulin <a.gorbulin@ism-ukraine.com>
Date: Fri, 21 Dec 2018 16:57:33 +0200
Subject: [PATCH 359/932] Refactoring-Magento_SalesSequence - remove unused
 classes - enrich/fix PHPDocs

---
 app/code/Magento/SalesRule/Model/Coupon.php           |  6 +++---
 app/code/Magento/SalesSequence/Model/Manager.php      |  4 +++-
 .../SalesSequence/Model/ResourceModel/Meta.php        | 11 +++++++++--
 .../SalesSequence/Model/ResourceModel/Profile.php     |  1 -
 .../Observer/SequenceCreatorObserver.php              |  8 ++++++--
 .../Magento/SalesSequence/Setup/SequenceCreator.php   |  2 ++
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/SalesRule/Model/Coupon.php b/app/code/Magento/SalesRule/Model/Coupon.php
index ee1eaff08303c..3c579e29a4264 100644
--- a/app/code/Magento/SalesRule/Model/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/Coupon.php
@@ -39,10 +39,10 @@ protected function _construct()
     /**
      * Set rule instance
      *
-     * @param \Magento\SalesRule\Model\Rule $rule
+     * @param Rule $rule
      * @return $this
      */
-    public function setRule(\Magento\SalesRule\Model\Rule $rule)
+    public function setRule(Rule $rule)
     {
         $this->setRuleId($rule->getId());
         return $this;
@@ -51,7 +51,7 @@ public function setRule(\Magento\SalesRule\Model\Rule $rule)
     /**
      * Load primary coupon for specified rule
      *
-     * @param \Magento\SalesRule\Model\Rule|int $rule
+     * @param Rule|int $rule
      * @return $this
      */
     public function loadPrimaryByRule($rule)
diff --git a/app/code/Magento/SalesSequence/Model/Manager.php b/app/code/Magento/SalesSequence/Model/Manager.php
index d18a872bf3b62..95c7847bf9769 100644
--- a/app/code/Magento/SalesSequence/Model/Manager.php
+++ b/app/code/Magento/SalesSequence/Model/Manager.php
@@ -41,7 +41,9 @@ public function __construct(
      *
      * @param string $entityType
      * @param int $storeId
-     * @return \Magento\Framework\DB\Sequence\SequenceInterface
+     *
+     * @return \Magento\SalesSequence\Model\Sequence
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getSequence($entityType, $storeId)
     {
diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
index be566b6119bdd..7a4aabea85680 100644
--- a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
@@ -96,7 +96,9 @@ public function loadByEntityTypeAndStore($entityType, $storeId)
      * Using for load sequence profile and setting it into metadata
      *
      * @param \Magento\Framework\Model\AbstractModel $object
-     * @return $this
+     *
+     * @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _afterLoad(\Magento\Framework\Model\AbstractModel $object)
     {
@@ -137,7 +139,12 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
-     * @inheritdoc
+     * Perform actions after object save
+     *
+     * @param \Magento\Framework\Model\AbstractModel $object
+     *
+     * @return $this|\Magento\Framework\Model\ResourceModel\Db\AbstractDb
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
index 368bdf6c26f16..4f1788b0ca353 100644
--- a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesSequence\Model\ResourceModel;
 
-use Magento\SalesSequence\Model\Meta as ModelMeta;
 use Magento\Framework\Model\ResourceModel\Db\Context as DatabaseContext;
 use Magento\SalesSequence\Model\ProfileFactory;
 
diff --git a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
index cc828e7d36a45..22f8095fc319c 100644
--- a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
+++ b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
@@ -49,8 +49,12 @@ public function __construct(
     }
 
     /**
-     * @param EventObserver $observer
-     * @return $this
+     * Observer triggered during adding new store
+     *
+     * @param \Magento\Framework\Event\Observer $observer
+     *
+     * @return $this|void
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     public function execute(EventObserver $observer)
     {
diff --git a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
index b0cbf545957bd..14df80224e2ce 100644
--- a/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
+++ b/app/code/Magento/SalesSequence/Setup/SequenceCreator.php
@@ -49,6 +49,8 @@ public function __construct(
 
     /**
      * Creates sales sequences.
+     *
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     public function create()
     {

From 5b4fdca34a3668d3fda6890651a0c21ec3b08d9a Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 21 Dec 2018 16:57:47 +0200
Subject: [PATCH 360/932] ENGCOM-3720: Static test fix.

---
 app/code/Magento/Sales/Model/Order/CreditmemoFactory.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index 69a0c7ed7471b..73afd0a06f710 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -211,6 +211,8 @@ protected function initData($creditmemo, $data)
     }
 
     /**
+     * Calculate product options.
+     *
      * @param Item $orderItem
      * @param int $parentQty
      * @return int

From bc2001f4844bc1d267a43a01a40433b99b7bb6a4 Mon Sep 17 00:00:00 2001
From: Aleksey Gorbulin <a.gorbulin@ism-ukraine.com>
Date: Fri, 21 Dec 2018 17:02:19 +0200
Subject: [PATCH 361/932] Refactoring-Magento_SalesSequence

---
 app/code/Magento/SalesSequence/Model/Manager.php                | 2 +-
 .../Magento/SalesSequence/Observer/SequenceCreatorObserver.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/SalesSequence/Model/Manager.php b/app/code/Magento/SalesSequence/Model/Manager.php
index 95c7847bf9769..95b26ba425cf6 100644
--- a/app/code/Magento/SalesSequence/Model/Manager.php
+++ b/app/code/Magento/SalesSequence/Model/Manager.php
@@ -42,7 +42,7 @@ public function __construct(
      * @param string $entityType
      * @param int $storeId
      *
-     * @return \Magento\SalesSequence\Model\Sequence
+     * @return \Magento\Framework\DB\Sequence\SequenceInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getSequence($entityType, $storeId)
diff --git a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
index 22f8095fc319c..cf56c96fb1710 100644
--- a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
+++ b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
@@ -51,7 +51,7 @@ public function __construct(
     /**
      * Observer triggered during adding new store
      *
-     * @param \Magento\Framework\Event\Observer $observer
+     * @param EventObserver $observer
      *
      * @return $this|void
      * @throws \Magento\Framework\Exception\AlreadyExistsException

From 63e2850d26c0cf950e614460a3cc6b4552ba0e17 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Fri, 21 Dec 2018 19:12:44 +0200
Subject: [PATCH 362/932] MAGETWO-97247: Impossible to enable shared catalog
 through cli command

---
 app/code/Magento/Config/Model/Config.php      | 85 +++++++++----------
 .../Config/Test/Unit/Model/ConfigTest.php     | 16 +++-
 2 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 8aa7171bd8f72..3ec32c44324cd 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -12,6 +12,7 @@
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverPool;
 use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\ScopeTypeNormalizer;
 
 /**
  * Backend config model
@@ -108,6 +109,11 @@ class Config extends \Magento\Framework\DataObject
      */
     private $scopeResolverPool;
 
+    /**
+     * @var ScopeTypeNormalizer
+     */
+    private $scopeTypeNormalizer;
+
     /**
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -119,6 +125,7 @@ class Config extends \Magento\Framework\DataObject
      * @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
      * @param array $data
      * @param ScopeResolverPool|null $scopeResolverPool
+     * @param ScopeTypeNormalizer|null $scopeTypeNormalizer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -131,7 +138,8 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         SettingChecker $settingChecker = null,
         array $data = [],
-        ScopeResolverPool $scopeResolverPool = null
+        ScopeResolverPool $scopeResolverPool = null,
+        ScopeTypeNormalizer $scopeTypeNormalizer = null
     ) {
         parent::__construct($data);
         $this->_eventManager = $eventManager;
@@ -141,8 +149,12 @@ public function __construct(
         $this->_configLoader = $configLoader;
         $this->_configValueFactory = $configValueFactory;
         $this->_storeManager = $storeManager;
-        $this->settingChecker = $settingChecker ?? ObjectManager::getInstance()->get(SettingChecker::class);
-        $this->scopeResolverPool = $scopeResolverPool ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
+        $this->settingChecker = $settingChecker
+            ?? ObjectManager::getInstance()->get(SettingChecker::class);
+        $this->scopeResolverPool = $scopeResolverPool
+            ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
+        $this->scopeTypeNormalizer = $scopeTypeNormalizer
+            ?? ObjectManager::getInstance()->get(ScopeTypeNormalizer::class);
     }
 
     /**
@@ -539,53 +551,34 @@ private function initScope()
         if ($this->getSection() === null) {
             $this->setSection('');
         }
-        if ($this->getWebsite() === null) {
-            $this->setWebsite('');
-        }
-        if ($this->getStore() === null) {
-            $this->setStore('');
-        }
 
-        if ($this->getScope()) {
-            $scope = $this->scopeResolverPool->get($this->getScope())
-                ->getScope($this->getScopeCode());
-            if (StoreScopeInterface::SCOPE_WEBSITE === $scope->getScopeType()) {
-                $this->setWebsite($scope->getId());
-            } elseif (StoreScopeInterface::SCOPE_STORE === $scope->getScopeType()) {
-                $this->setStore($scope->getId());
+        if (!$this->getScope()) {
+            switch (true) {
+                case $this->getStore():
+                    $this->setScope(StoreScopeInterface::SCOPE_STORES);
+                    $this->setScopeCode($this->getStore());
+                    break;
+                case $this->getWebsite():
+                    $this->setScope(StoreScopeInterface::SCOPE_WEBSITES);
+                    $this->setScopeCode($this->getWebsite());
+                    break;
+                default:
+                    $this->setScope(ScopeInterface::SCOPE_DEFAULT);
+                    $this->setScopeCode('');
+                    break;
             }
-            $this->setScopeId($scope->getId());
-        } else {
-            $scope = $this->resolveScope();
-            $this->setScope($scope->getScopeType());
-            $this->setScopeId($scope->getId());
-            $this->setScopeCode($scope->getCode());
         }
-    }
-
-    /**
-     * Resolve scope
-     *
-     * @return ScopeInterface
-     */
-    private function resolveScope(): ScopeInterface
-    {
-        switch (true) {
-            case $this->getStore():
-                $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_STORE)
-                    ->getScope($this->getStore());
-                break;
-            case $this->getWebsite():
-                $scope = $this->scopeResolverPool->get(StoreScopeInterface::SCOPE_WEBSITE)
-                    ->getScope($this->getWebsite());
-                break;
-            default:
-                $scope = $this->scopeResolverPool->get(ScopeInterface::SCOPE_DEFAULT)
-                    ->getScope(0);
-                break;
+        $scope = $this->scopeResolverPool->get($this->getScope())
+            ->getScope($this->getScopeCode());
+        $this->setScope($this->scopeTypeNormalizer->normalize($scope->getScopeType()));
+        $this->setScopeCode($scope->getCode());
+        $this->setScopeId($scope->getId());
+        if ($this->getWebsite() === null) {
+            $this->setWebsite(StoreScopeInterface::SCOPE_WEBSITES === $this->getScope() ? $scope->getId() : '');
+        }
+        if ($this->getStore() === null) {
+            $this->setStore(StoreScopeInterface::SCOPE_STORES === $this->getScope() ? $scope->getId() : '');
         }
-
-        return $scope;
     }
 
     /**
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index ab0070a3a88e7..bdcb44b756bb2 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -77,6 +77,11 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $scope;
 
+    /**
+     * @var \Magento\Store\Model\ScopeTypeNormalizer|MockObject
+     */
+    private $scopeTypeNormalizer;
+
     protected function setUp()
     {
         $this->eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
@@ -118,6 +123,8 @@ protected function setUp()
         $this->scopeResolver->method('getScope')
             ->willReturn($this->scope);
 
+        $this->scopeTypeNormalizer = $this->createMock(\Magento\Store\Model\ScopeTypeNormalizer::class);
+
         $this->model = new \Magento\Config\Model\Config(
             $this->appConfigMock,
             $this->eventManagerMock,
@@ -128,7 +135,8 @@ protected function setUp()
             $this->storeManager,
             $this->settingsChecker,
             [],
-            $this->scopeResolverPool
+            $this->scopeResolverPool,
+            $this->scopeTypeNormalizer
         );
     }
 
@@ -284,6 +292,10 @@ public function testSaveToCheckScopeDataSet()
         $this->scope->expects($this->atLeastOnce())
             ->method('getCode')
             ->willReturn('website_code');
+        $this->scopeTypeNormalizer->expects($this->atLeastOnce())
+            ->method('normalize')
+            ->with('website')
+            ->willReturn('websites');
         $website = $this->createMock(\Magento\Store\Model\Website::class);
         $this->storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$website]));
         $this->storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
@@ -302,7 +314,7 @@ public function testSaveToCheckScopeDataSet()
                 'field' => 'key',
                 'groups' => [1 => ['fields' => ['key' => ['data']]]],
                 'group_id' => null,
-                'scope' => 'website',
+                'scope' => 'websites',
                 'scope_id' => 1,
                 'scope_code' => 'website_code',
                 'field_config' => null,

From 2b47de7e80cc7eaf3a97b036c0da2304914c2552 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 21 Dec 2018 11:15:22 -0600
Subject: [PATCH 363/932] MC-5648: Catalog product list widget Viewport Issues:
 Add to cart buttons are hidden on mobile & Review Links Clash With Other
 Elements

---
 .../product/widget/content/grid.phtml         | 88 +++++++++----------
 .../web/css/source/_widgets.less              | 35 +++++++-
 .../web/css/source/module/_listings.less      | 68 ++++++++------
 .../web/css/source/module/_listings.less      | 66 +++++++++++---
 4 files changed, 170 insertions(+), 87 deletions(-)

diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 6789ace243b84..fad3ed621cff9 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -20,7 +20,7 @@
     $showWishlist = true;
     $showCompare = true;
     $showCart = true;
-    $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW;
+    $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
     $description = false;
 ?>
     <div class="block widget block-products-list <?= /* @noEscape */ $mode ?>">
@@ -48,57 +48,55 @@
                                         <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
-                                <?php
-                                echo $block->getProductPriceHtml($_item, $type);
-                                ?>
-
                                 <?php if ($templateType): ?>
                                     <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
-
+                                <?php echo $block->getProductPriceHtml($_item, $type); ?>
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
-                                    <div class="product-item-actions">
-                                        <?php if ($showCart): ?>
-                                            <div class="actions-primary">
-                                                <?php if ($_item->isSaleable()): ?>
-                                                    <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)): ?>
-                                                        <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                        </button>
+                                    <div class="product-item-inner">
+                                        <div class="product-item-actions">
+                                            <?php if ($showCart): ?>
+                                                <div class="actions-primary">
+                                                    <?php if ($_item->isSaleable()): ?>
+                                                        <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)): ?>
+                                                            <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php else: ?>
+                                                            <?php
+                                                            $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                            $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                            ?>
+                                                            <button class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                            </button>
+                                                        <?php endif; ?>
                                                     <?php else: ?>
-                                                        <?php
-                                                        $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                        $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                        ?>
-                                                        <button class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
-                                                        </button>
+                                                        <?php if ($_item->getIsSalable()): ?>
+                                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <?php else: ?>
+                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                        <?php endif; ?>
                                                     <?php endif; ?>
-                                                <?php else: ?>
-                                                    <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-                                                    <?php else: ?>
-                                                        <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                </div>
+                                            <?php endif; ?>
+                                            <?php if ($showWishlist || $showCompare): ?>
+                                                <div class="actions-secondary" data-role="add-to-links">
+                                                    <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+                                                        <a href="#"
+                                                           data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                        </a>
+                                                    <?php endif; ?>
+                                                    <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
+                                                        <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
+                                                        <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                        </a>
                                                     <?php endif; ?>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
-                                        <?php if ($showWishlist || $showCompare): ?>
-                                            <div class="actions-secondary" data-role="add-to-links">
-                                                <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                    <a href="#"
-                                                       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-                                                        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                                <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
-                                                    <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
-                                                    </a>
-                                                <?php endif; ?>
-                                            </div>
-                                        <?php endif; ?>
+                                                </div>
+                                            <?php endif; ?>
+                                        </div>
                                     </div>
                                 <?php endif; ?>
                             </div>
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
index 42b1bf2d0cc09..7181606090ccb 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_widgets.less
@@ -23,6 +23,15 @@
     }
 
     .block.widget {
+        .products-grid .product-item {
+            margin-left: 2%;
+            width: calc(~'(100% - 2%)/2');
+
+            &:nth-child(2n + 1) {
+                margin-left: 0;
+            }
+        }
+
         .product-item-info {
             width: auto;
         }
@@ -60,6 +69,15 @@
     .page-layout-3columns .block.widget .products-grid .product-item {
         width: 100%/3;
     }
+
+    .page-layout-1column .block.widget .products-grid .product-item {
+        margin-left: 2%;
+        width: calc(~'(100% - 4%)/3');
+
+        &:nth-child(3n + 1) {
+            margin-left: 0;
+        }
+    }
 }
 
 //
@@ -82,7 +100,16 @@
     }
 
     .page-layout-1column .block.widget .products-grid .product-item {
-        width: 100%/4;
+        margin-left: 2%;
+        width: calc(~'(100% - 6%)/4');
+
+        &:nth-child(3n + 1) {
+            margin-left: 2%;
+        }
+
+        &:nth-child(4n + 1) {
+            margin-left: 0;
+        }
     }
 
     .page-layout-3columns .block.widget .products-grid .product-item {
@@ -96,11 +123,11 @@
     }
 
     .page-layout-1column .block.widget .products-grid .product-item {
-        margin-left: calc(~'(100% - 5 * (100%/6)) / 4');
-        width: 100%/6;
+        margin-left: 2%;
+        width: calc(~'(100% - 8%)/5');
 
         &:nth-child(4n + 1) {
-            margin-left: calc(~'(100% - 5 * (100%/6)) / 4');
+            margin-left: 2%;
         }
 
         &:nth-child(5n + 1) {
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
index 951ca89a07988..d8fce03dc10ab 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
@@ -29,15 +29,23 @@
 
     .product {
         &-items {
+            font-size: 0;
             &:extend(.abs-reset-list all);
         }
 
         &-item {
+            font-size: 1.4rem;
             vertical-align: top;
 
             .products-grid & {
                 display: inline-block;
-                width: 100%/2;
+                margin-left: 2%;
+                padding: 0;
+                width: calc(~'(100% - 2%) / 2');
+            }
+
+            &:nth-child(2n + 1) {
+                margin-left: 0;
             }
 
             &:extend(.abs-add-box-sizing all);
@@ -63,13 +71,22 @@
             }
 
             &-actions {
+                font-size: 0;
 
                 .actions-secondary {
+                    display: inline-block;
+                    font-size: 1.4rem;
+                    vertical-align: middle;
+                    white-space: nowrap;
                     > button.action {
                         .lib-button-reset();
                     }
 
                     > .action {
+                        line-height: 35px;
+                        text-align: center;
+                        width: 35px;
+
                         &:extend(.abs-actions-addto-gridlist all);
                         &:before {
                             margin: 0;
@@ -80,6 +97,10 @@
                         }
                     }
                 }
+
+                .actions-primary {
+                    display: inline-block;
+                }
             }
 
             &-description {
@@ -191,19 +212,6 @@
         }
     }
 
-    .column.main {
-        .product {
-            &-items {
-                margin-left: -@indent__base;
-            }
-
-            &-item {
-                padding-left: @indent__base;
-            }
-        }
-
-    }
-
     .price-container {
         .price {
             .lib-font-size(14);
@@ -302,18 +310,10 @@
                 }
 
                 .actions-primary + .actions-secondary {
-                    display: table-cell;
-                    padding-left: 5px;
-                    white-space: nowrap;
-                    width: 50%;
                     > * {
                         white-space: normal;
                     }
                 }
-
-                .actions-primary {
-                    display: table-cell;
-                }
             }
         }
     }
@@ -329,7 +329,13 @@
     .page-products.page-layout-3columns {
         .products-grid {
             .product-item {
-                width: 100%/3;
+                margin-left: 2%;
+                padding: 0;
+                width: calc(~'(100% - 4%) / 3');
+
+                &:nth-child(3n + 1) {
+                    margin-left: 0;
+                }
             }
         }
     }
@@ -343,7 +349,13 @@
     .page-products {
         .products-grid {
             .product-item {
-                width: 100%/3;
+                margin-left: 2%;
+                padding: 0;
+                width: calc(~'(100% - 4%) / 3');
+
+                &:nth-child(3n + 1) {
+                    margin-left: 0;
+                }
             }
         }
     }
@@ -394,9 +406,13 @@
             }
 
             .product-item {
-                margin-left: calc(~'(100% - 4 * 23.233%) / 3');
+                margin-left: 2%;
                 padding: 0;
-                width: 23.233%;
+                width: calc(~'(100% - 6%) / 4');
+
+                &:nth-child(3n + 1) {
+                    margin-left: 2%;
+                }
 
                 &:nth-child(4n + 1) {
                     margin-left: 0;
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index 6bf766b7400a7..f271f472f2cd8 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -18,7 +18,7 @@
 @product-name-link__text-decoration__visited: @link__hover__text-decoration;
 
 @product-item__hover__background-color: @color-white;
-@product-item__hover__box-shadow: 3px 3px 4px 0 rgba(0, 0, 0, .3);
+@product-item__hover__box-shadow: 3px 4px 4px 0 rgba(0, 0, 0, .3);
 
 @product-price__muted__color: @color-gray40;
 
@@ -34,15 +34,22 @@
 
     .product {
         &-items {
+            font-size: 0;
             &:extend(.abs-reset-list all);
         }
 
         &-item {
+            font-size: 1.4rem;
             vertical-align: top;
 
             .products-grid & {
                 display: inline-block;
-                width: 100%/2;
+                margin-left: 2%;
+                width: calc(~'(100% - 2%)/2');
+            }
+
+            &:nth-child(2n + 1) {
+                margin-left: 0;
             }
 
             &:extend(.abs-add-box-sizing all);
@@ -68,8 +75,13 @@
             }
 
             &-actions {
+                font-size: 0;
 
                 .actions-secondary {
+                    display: inline-block;
+                    font-size: 1.4rem;
+                    vertical-align: middle;
+
                     > button.action {
                         .lib-button-reset();
                     }
@@ -79,12 +91,19 @@
                         &:before {
                             margin: 0;
                         }
+                        line-height: 35px;
+                        text-align: center;
+                        width: 35px;
 
                         span {
                             &:extend(.abs-visually-hidden all);
                         }
                     }
                 }
+
+                .actions-primary {
+                    display: inline-block;
+                }
             }
 
             &-description {
@@ -291,7 +310,7 @@
             border: 1px solid @color-gray-light2;
             border-top: none;
             left: 0;
-            margin: 9px 0 0 -1px;
+            margin: 10px 0 0 -1px;
             padding: 0 9px 9px;
             position: absolute;
             right: -1px;
@@ -307,13 +326,13 @@
         }
 
         .actions-primary + .actions-secondary {
-            display: table-cell;
-            padding-left: 10px;
+            display: inline-block;
             vertical-align: middle;
-            width: 50%;
 
             > .action {
-                margin-right: 10px;
+                line-height: 35px;
+                text-align: center;
+                width: 35px;
 
                 &:last-child {
                     margin-right: 0;
@@ -322,7 +341,7 @@
         }
 
         .actions-primary {
-            display: table-cell;
+            display: inline-block;
         }
     }
 
@@ -374,10 +393,24 @@
     .page-products.page-layout-3columns {
         .products-grid {
             .product-item {
-                width: 100%/3;
+                margin-left: 2%;
+                width: calc(~'(100% - 4%) / 3');
+
+                &:nth-child(3n + 1) {
+                    margin-left: 0;
+                }
             }
         }
     }
+
+    .block.widget .products-grid .product-item,
+    .page-layout-1column .block.widget .products-grid .product-item,
+    .page-layout-3columns .block.widget .products-grid .product-item {
+        .product-item-inner {
+            margin: 9px 0 0 -1px;
+            box-shadow: 3px 6px 4px 0 rgba(0, 0, 0, .3);
+        }
+    }
 }
 
 //
@@ -388,7 +421,12 @@
     .page-products {
         .products-grid {
             .product-item {
-                width: 100%/3;
+                margin-left: 2%;
+                width: calc(~'(100% - 4%) / 3');
+
+                &:nth-child(3n + 1) {
+                    margin-left: 0;
+                }
             }
         }
     }
@@ -441,9 +479,13 @@
             }
 
             .product-item {
-                margin-left: calc(~'(100% - 4 * 24.439%) / 3');
+                margin-left: 2%;
                 padding: 5px;
-                width: 24.439%;
+                width: calc(~'(100% - 6%)/4');
+
+                &:nth-child(3n + 1) {
+                    margin-left: 2%;
+                }
 
                 &:nth-child(4n + 1) {
                     margin-left: 0;

From b4c86f8b37fcf19c5957e629d2bafe96e0f7d32b Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 21 Dec 2018 11:56:06 -0600
Subject: [PATCH 364/932] MC-5319: Create tax rate, zip code range

- Fixed typo in test title annotation
---
 .../Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
index 6d9717318efc8..f75fa716e9d30 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
@@ -11,7 +11,7 @@
     <test name="AdminCreateTaxRateZipCodeRangeTest">
         <annotations>
             <stories value="Create tax rate"/>
-            <title value="Create tax tate, zip code range"/>
+            <title value="Create tax rate, zip code range"/>
             <description value="Test log in to Create Tax Rate and Create Zip Code Range"/>
             <testCaseId value="MC-5319"/>
             <severity value="CRITICAL"/>

From b54ab2dc9cf90c5186765e94e067704fc4b382e7 Mon Sep 17 00:00:00 2001
From: Govind Sharma <govindpokhrelsharma@cedcoss.com>
Date: Sat, 22 Dec 2018 13:59:48 +0530
Subject: [PATCH 365/932] issue resolved:Undefined Variable $itemsOrderItemId

issue resolved:Undefined Variable $itemsOrderItemId
---
 app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
index b4ff445c63f4e..c561a0982dce2 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
@@ -86,7 +86,7 @@ public function getConfigDataJson()
         $itemsName = [];
         $itemsWeight = [];
         $itemsProductId = [];
-
+        $itemsOrderItemId = [];
         if ($shipmentId) {
             $urlParams['shipment_id'] = $shipmentId;
             $createLabelUrl = $this->getUrl('adminhtml/order_shipment/createLabel', $urlParams);

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 366/932] 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 4da5bdeca34306f02ede1e52a44d79a6f2c08c23 Mon Sep 17 00:00:00 2001
From: Rajneesh Gupta <rajneeshgupta@cedcommerce.com>
Date: Mon, 24 Dec 2018 15:25:49 +0530
Subject: [PATCH 367/932] Typo corrected in class name
 UpdateBundleRelatedEntityTytpes -> UpdateBundleRelatedEntityTypes

---
 .../Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
index 44647ea76a1c2..34a4b7270faf2 100644
--- a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
+++ b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
@@ -15,10 +15,10 @@
 use Magento\Eav\Setup\EavSetup;
 
 /**
- * Class UpdateBundleRelatedEntityTytpes
+ * Class UpdateBundleRelatedEntityTypes
  * @package Magento\Bundle\Setup\Patch
  */
-class UpdateBundleRelatedEntityTytpes implements DataPatchInterface, PatchVersionInterface
+class UpdateBundleRelatedEntityTypes implements DataPatchInterface, PatchVersionInterface
 {
     /**
      * @var ModuleDataSetupInterface
@@ -31,7 +31,7 @@ class UpdateBundleRelatedEntityTytpes implements DataPatchInterface, PatchVersio
     private $eavSetupFactory;
 
     /**
-     * UpdateBundleRelatedEntityTytpes constructor.
+     * UpdateBundleRelatedEntityTypes constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param EavSetupFactory $eavSetupFactory
      */

From f4daa73180cc1e05baec99a55f193c3bbbb7f1e8 Mon Sep 17 00:00:00 2001
From: Iurii Ivashchenko <iivashchenko@magento.com>
Date: Wed, 12 Dec 2018 14:45:57 +0200
Subject: [PATCH 368/932] MAGETWO-95935: Allow Validation of customer address
 attributes to include spaces

---
 .../Block/Checkout/AttributeMerger.php        |  23 +-
 .../Block/Checkout/AttributeMergerTest.php    | 121 ++++++++++
 .../Model/Metadata/Form/AbstractData.php      |  10 +-
 .../Model/Metadata/Form/AbstractDataTest.php  |  47 ++--
 .../Listing/Column/ValidationRulesTest.php    |  45 ++--
 .../Listing/Column/ValidationRules.php        |   4 +
 .../Eav/Model/Attribute/Data/AbstractData.php |   7 +-
 .../Attribute/Frontend/AbstractFrontend.php   |   5 +
 .../Unit/Model/Attribute/Data/TextTest.php    | 121 +++++++++-
 .../Frontend/DefaultFrontendTest.php          | 226 ++++++++++--------
 10 files changed, 451 insertions(+), 158 deletions(-)
 create mode 100644 app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php

diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index de996bed02439..50393b7d3ff9a 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -6,10 +6,16 @@
 namespace Magento\Checkout\Block\Checkout;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\Customer\Model\Session;
 use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * Fields attribute merger.
+ */
 class AttributeMerger
 {
     /**
@@ -46,6 +52,7 @@ class AttributeMerger
         'alpha' => 'validate-alpha',
         'numeric' => 'validate-number',
         'alphanumeric' => 'validate-alphanum',
+        'alphanum-with-spaces' => 'validate-alphanum-with-spaces',
         'url' => 'validate-url',
         'email' => 'email2',
         'length' => 'validate-length',
@@ -67,7 +74,7 @@ class AttributeMerger
     private $customerRepository;
 
     /**
-     * @var \Magento\Customer\Api\Data\CustomerInterface
+     * @var CustomerInterface
      */
     private $customer;
 
@@ -309,10 +316,14 @@ protected function getMultilineFieldConfig($attributeCode, array $attributeConfi
     }
 
     /**
+     * Returns default attribute value.
+     *
      * @param string $attributeCode
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
      * @return null|string
      */
-    protected function getDefaultValue($attributeCode)
+    protected function getDefaultValue($attributeCode): ?string
     {
         if ($attributeCode === 'country_id') {
             return $this->directoryHelper->getDefaultCountry();
@@ -346,9 +357,13 @@ protected function getDefaultValue($attributeCode)
     }
 
     /**
-     * @return \Magento\Customer\Api\Data\CustomerInterface|null
+     * Returns logged customer.
+     *
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     * @return CustomerInterface|null
      */
-    protected function getCustomer()
+    protected function getCustomer(): ?CustomerInterface
     {
         if (!$this->customer) {
             if ($this->customerSession->isLoggedIn()) {
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php
new file mode 100644
index 0000000000000..23840da97bd47
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/AttributeMergerTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Test\Unit\Block\Checkout;
+
+use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Helper\Address as AddressHelper;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Checkout\Block\Checkout\AttributeMerger;
+use PHPUnit\Framework\TestCase;
+
+class AttributeMergerTest extends TestCase
+{
+    /**
+     * @var CustomerRepository
+     */
+    private $customerRepository;
+
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * @var AddressHelper
+     */
+    private $addressHelper;
+
+    /**
+     * @var DirectoryHelper
+     */
+    private $directoryHelper;
+
+    /**
+     * @var AttributeMerger
+     */
+    private $attributeMerger;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+
+        $this->customerRepository = $this->createMock(CustomerRepository::class);
+        $this->customerSession = $this->createMock(CustomerSession::class);
+        $this->addressHelper = $this->createMock(AddressHelper::class);
+        $this->directoryHelper = $this->createMock(DirectoryHelper::class);
+
+        $this->attributeMerger = new AttributeMerger(
+            $this->addressHelper,
+            $this->customerSession,
+            $this->customerRepository,
+            $this->directoryHelper
+        );
+    }
+
+    /**
+     * Tests of element attributes merging.
+     *
+     * @param String $validationRule - validation rule.
+     * @param String $expectedValidation - expected mapped validation.
+     * @dataProvider validationRulesDataProvider
+     */
+    public function testMerge(String $validationRule, String $expectedValidation): void
+    {
+        $elements = [
+            'field' => [
+                'visible' => true,
+                'formElement' => 'input',
+                'label' => __('City'),
+                'value' =>  null,
+                'sortOrder' => 1,
+                'validation' => [
+                    'input_validation' => $validationRule
+                ],
+            ]
+        ];
+
+        $actualResult = $this->attributeMerger->merge(
+            $elements,
+            'provider',
+            'dataScope',
+            ['field' =>
+                [
+                    'validation' => ['length' => true]
+                ]
+            ]
+        );
+
+        $expectedResult = [
+            $expectedValidation => true,
+            'length' => true
+        ];
+
+        self::assertEquals($expectedResult, $actualResult['field']['validation']);
+    }
+
+    /**
+     * Provides possible validation types.
+     *
+     * @return array
+     */
+    public function validationRulesDataProvider(): array
+    {
+        return [
+            ['alpha', 'validate-alpha'],
+            ['numeric', 'validate-number'],
+            ['alphanumeric', 'validate-alphanum'],
+            ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
+            ['url', 'validate-url'],
+            ['email', 'email2'],
+            ['length', 'validate-length']
+        ];
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
index 168f00be16e33..8e443e93354b0 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php
@@ -12,6 +12,8 @@
 use Magento\Framework\Validator\EmailAddress;
 
 /**
+ * Form Element Abstract Data Model
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractData
@@ -137,6 +139,7 @@ public function setRequestScope($scope)
 
     /**
      * Set scope visibility
+     *
      * Search value only in scope or search value in scope and global
      *
      * @param boolean $flag
@@ -281,9 +284,14 @@ protected function _validateInputRule($value)
         );
 
         if ($inputValidation !== null) {
+            $allowWhiteSpace = false;
+
             switch ($inputValidation) {
+                case 'alphanum-with-spaces':
+                    $allowWhiteSpace = true;
+                    // Continue to alphanumeric validation
                 case 'alphanumeric':
-                    $validator = new \Zend_Validate_Alnum(true);
+                    $validator = new \Zend_Validate_Alnum($allowWhiteSpace);
                     $validator->setMessage(__('"%1" invalid type entered.', $label), \Zend_Validate_Alnum::INVALID);
                     $validator->setMessage(
                         __('"%1" contains non-alphabetic or non-numeric characters.', $label),
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
index e4dc22ba40e31..9033b3b815478 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
@@ -205,37 +205,34 @@ public function applyOutputFilterDataProvider()
     }
 
     /**
+     * Tests input validation rules.
+     *
      * @param null|string $value
      * @param null|string $label
      * @param null|string $inputValidation
      * @param bool|array  $expectedOutput
      * @dataProvider validateInputRuleDataProvider
      */
-    public function testValidateInputRule($value, $label, $inputValidation, $expectedOutput)
+    public function testValidateInputRule($value, $label, $inputValidation, $expectedOutput): void
     {
         $validationRule = $this->getMockBuilder(\Magento\Customer\Api\Data\ValidationRuleInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getName', 'getValue'])
             ->getMockForAbstractClass();
-        $validationRule->expects($this->any())
-            ->method('getName')
-            ->will($this->returnValue('input_validation'));
-        $validationRule->expects($this->any())
-            ->method('getValue')
-            ->will($this->returnValue($inputValidation));
-
-        $this->_attributeMock->expects($this->any())->method('getStoreLabel')->will($this->returnValue($label));
-        $this->_attributeMock->expects(
-            $this->any()
-        )->method(
-            'getValidationRules'
-        )->will(
-            $this->returnValue(
-                [
-                    $validationRule,
-                ]
-            )
-        );
+
+        $validationRule->method('getName')
+            ->willReturn('input_validation');
+
+        $validationRule->method('getValue')
+            ->willReturn($inputValidation);
+
+        $this->_attributeMock
+            ->method('getStoreLabel')
+            ->willReturn($label);
+
+        $this->_attributeMock
+            ->method('getValidationRules')
+            ->willReturn([$validationRule]);
 
         $this->assertEquals($expectedOutput, $this->_model->validateInputRule($value));
     }
@@ -256,6 +253,16 @@ public function validateInputRuleDataProvider()
                     \Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.'
                 ]
             ],
+            [
+                'abc qaz',
+                'mylabel',
+                'alphanumeric',
+                [
+                    \Zend_Validate_Alnum::NOT_ALNUM => '"mylabel" contains non-alphabetic or non-numeric characters.'
+                ]
+            ],
+            ['abcqaz', 'mylabel', 'alphanumeric', true],
+            ['abc qaz', 'mylabel', 'alphanum-with-spaces', true],
             [
                 '!@#$',
                 'mylabel',
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
index 130b3acd11e76..07b0a76043200 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
@@ -18,12 +18,6 @@ class ValidationRulesTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->validationRules = $this->getMockBuilder(
-            \Magento\Customer\Ui\Component\Listing\Column\ValidationRules::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->validationRule = $this->getMockBuilder(\Magento\Customer\Api\Data\ValidationRuleInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -31,20 +25,26 @@ protected function setUp()
         $this->validationRules = new ValidationRules();
     }
 
-    public function testGetValidationRules()
+    /**
+     * Tests input validation rules
+     *
+     * @param String $validationRule - provided input validation rules
+     * @param String $validationClass - expected input validation class
+     * @dataProvider validationRulesDataProvider
+     */
+    public function testGetValidationRules(String $validationRule, String $validationClass): void
     {
         $expectsRules = [
             'required-entry' => true,
-            'validate-number' => true,
+            $validationClass => true,
         ];
-        $this->validationRule->expects($this->atLeastOnce())
-            ->method('getName')
+        $this->validationRule->method('getName')
             ->willReturn('input_validation');
-        $this->validationRule->expects($this->atLeastOnce())
-            ->method('getValue')
-            ->willReturn('numeric');
 
-        $this->assertEquals(
+        $this->validationRule->method('getValue')
+            ->willReturn($validationRule);
+
+        self::assertEquals(
             $expectsRules,
             $this->validationRules->getValidationRules(
                 true,
@@ -56,6 +56,23 @@ public function testGetValidationRules()
         );
     }
 
+    /**
+     * Provides possible validation rules.
+     *
+     * @return array
+     */
+    public function validationRulesDataProvider(): array
+    {
+        return [
+            ['alpha', 'validate-alpha'],
+            ['numeric', 'validate-number'],
+            ['alphanumeric', 'validate-alphanum'],
+            ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
+            ['url', 'validate-url'],
+            ['email', 'validate-email']
+        ];
+    }
+
     public function testGetValidationRulesWithOnlyRequiredRule()
     {
         $expectsRules = [
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
index b8f83421a6d62..6befec8e942a1 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/ValidationRules.php
@@ -7,6 +7,9 @@
 
 use Magento\Customer\Api\Data\ValidationRuleInterface;
 
+/**
+ * Provides validation classes according to corresponding rules.
+ */
 class ValidationRules
 {
     /**
@@ -16,6 +19,7 @@ class ValidationRules
         'alpha' => 'validate-alpha',
         'numeric' => 'validate-number',
         'alphanumeric' => 'validate-alphanum',
+        'alphanum-with-spaces' => 'validate-alphanum-with-spaces',
         'url' => 'validate-url',
         'email' => 'validate-email',
     ];
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
index 3189041d7f716..240f4f00adff8 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
@@ -143,6 +143,7 @@ public function setRequestScope($scope)
 
     /**
      * Set scope visibility
+     *
      * Search value only in scope or search value in scope and global
      *
      * @param bool $flag
@@ -311,9 +312,13 @@ protected function _validateInputRule($value)
 
         if (!empty($validateRules['input_validation'])) {
             $label = $this->getAttribute()->getStoreLabel();
+            $allowWhiteSpace = false;
             switch ($validateRules['input_validation']) {
+                case 'alphanum-with-spaces':
+                    $allowWhiteSpace = true;
+                    // Continue to alphanumeric validation
                 case 'alphanumeric':
-                    $validator = new \Zend_Validate_Alnum(true);
+                    $validator = new \Zend_Validate_Alnum($allowWhiteSpace);
                     $validator->setMessage(__('"%1" invalid type entered.', $label), \Zend_Validate_Alnum::INVALID);
                     $validator->setMessage(
                         __('"%1" contains non-alphabetic or non-numeric characters.', $label),
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index 3d4c9e89a035f..2c7ea1ab9268e 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -20,6 +20,8 @@
 use Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory;
 
 /**
+ * EAV entity attribute form renderer.
+ *
  * @api
  * @since 100.0.2
  */
@@ -234,6 +236,9 @@ protected function _getInputValidateClass()
                 case 'alphanumeric':
                     $class = 'validate-alphanum';
                     break;
+                case 'alphanum-with-spaces':
+                    $class = 'validate-alphanum-with-spaces';
+                    break;
                 case 'numeric':
                     $class = 'validate-digits';
                     break;
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
index bbbe712b2bb42..331d1e6216ae5 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
@@ -6,12 +6,15 @@
 
 namespace Magento\Eav\Test\Unit\Model\Attribute\Data;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\StringUtils;
+
 class TextTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Eav\Model\Attribute\Data\Text
      */
-    protected $_model;
+    private $model;
 
     /**
      * {@inheritDoc}
@@ -21,10 +24,10 @@ protected function setUp()
         $locale = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
         $localeResolver = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
         $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $helper = $this->createMock(\Magento\Framework\Stdlib\StringUtils::class);
+        $helper = new StringUtils;
 
-        $this->_model = new \Magento\Eav\Model\Attribute\Data\Text($locale, $logger, $localeResolver, $helper);
-        $this->_model->setAttribute(
+        $this->model = new \Magento\Eav\Model\Attribute\Data\Text($locale, $logger, $localeResolver, $helper);
+        $this->model->setAttribute(
             $this->createAttribute(
                 [
                     'store_label' => 'Test',
@@ -41,7 +44,7 @@ protected function setUp()
      */
     protected function tearDown()
     {
-        $this->_model = null;
+        $this->model = null;
     }
 
     /**
@@ -51,7 +54,7 @@ public function testValidateValueString(): void
     {
         $inputValue = '0';
         $expectedResult = true;
-        $this->assertEquals($expectedResult, $this->_model->validateValue($inputValue));
+        self::assertEquals($expectedResult, $this->model->validateValue($inputValue));
     }
 
     /**
@@ -61,8 +64,8 @@ public function testValidateValueInteger(): void
     {
         $inputValue = 0;
         $expectedResult = ['"Test" is a required value.'];
-        $result = $this->_model->validateValue($inputValue);
-        $this->assertEquals($expectedResult, [(string)$result[0]]);
+        $result = $this->model->validateValue($inputValue);
+        self::assertEquals($expectedResult, [(string)$result[0]]);
     }
 
     /**
@@ -79,12 +82,106 @@ public function testWithoutLengthValidation(): void
         ];
 
         $defaultAttributeData['validate_rules']['min_text_length'] = 2;
-        $this->_model->setAttribute($this->createAttribute($defaultAttributeData));
-        $this->assertEquals($expectedResult, $this->_model->validateValue('t'));
+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
+        self::assertEquals($expectedResult, $this->model->validateValue('t'));
 
         $defaultAttributeData['validate_rules']['max_text_length'] = 3;
-        $this->_model->setAttribute($this->createAttribute($defaultAttributeData));
-        $this->assertEquals($expectedResult, $this->_model->validateValue('test'));
+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
+        self::assertEquals($expectedResult, $this->model->validateValue('test'));
+    }
+
+    /**
+     * Test of alphanumeric validation.
+     *
+     * @param {String} $value - provided value
+     * @param {Boolean|Array} $expectedResult - validation result
+     * @return void
+     * @throws LocalizedException
+     * @dataProvider alphanumDataProvider
+     */
+    public function testAlphanumericValidation($value, $expectedResult): void
+    {
+        $defaultAttributeData = [
+            'store_label' => 'Test',
+            'attribute_code' => 'test',
+            'is_required' => 1,
+            'validate_rules' => [
+                'min_text_length' => 0,
+                'max_text_length' => 10,
+                'input_validation' => 'alphanumeric'
+            ],
+        ];
+
+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
+        self::assertEquals($expectedResult, $this->model->validateValue($value));
+    }
+
+    /**
+     * Provides possible input values.
+     *
+     * @return array
+     */
+    public function alphanumDataProvider(): array
+    {
+        return [
+            ['QazWsx', true],
+            ['QazWsx123', true],
+            ['QazWsx 123',
+                [\Zend_Validate_Alnum::NOT_ALNUM => '"Test" contains non-alphabetic or non-numeric characters.']
+            ],
+            ['QazWsx_123',
+                [\Zend_Validate_Alnum::NOT_ALNUM => '"Test" contains non-alphabetic or non-numeric characters.']
+            ],
+            ['QazWsx12345', [
+                __('"%1" length must be equal or less than %2 characters.', 'Test', 10)]
+            ],
+        ];
+    }
+
+    /**
+     * Test of alphanumeric validation with spaces.
+     *
+     * @param {String} $value - provided value
+     * @param {Boolean|Array} $expectedResult - validation result
+     * @return void
+     * @throws LocalizedException
+     * @dataProvider alphanumWithSpacesDataProvider
+     */
+    public function testAlphanumericValidationWithSpaces($value, $expectedResult): void
+    {
+        $defaultAttributeData = [
+            'store_label' => 'Test',
+            'attribute_code' => 'test',
+            'is_required' => 1,
+            'validate_rules' => [
+                'min_text_length' => 0,
+                'max_text_length' => 10,
+                'input_validation' => 'alphanum-with-spaces'
+            ],
+        ];
+
+        $this->model->setAttribute($this->createAttribute($defaultAttributeData));
+        self::assertEquals($expectedResult, $this->model->validateValue($value));
+    }
+
+    /**
+     * Provides possible input values.
+     *
+     * @return array
+     */
+    public function alphanumWithSpacesDataProvider(): array
+    {
+        return [
+            ['QazWsx', true],
+            ['QazWsx123', true],
+            ['QazWsx 123', true],
+            ['QazWsx_123',
+                [\Zend_Validate_Alnum::NOT_ALNUM => '"Test" contains non-alphabetic or non-numeric characters.']
+            ],
+            ['QazWsx12345', [
+                __('"%1" length must be equal or less than %2 characters.', 'Test', 10)]
+            ],
+        ];
     }
 
     /**
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
index a61c9ef447458..add200c1c0759 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Eav\Test\Unit\Model\Entity\Attribute\Frontend;
 
 use Magento\Eav\Model\Entity\Attribute\Frontend\DefaultFrontend;
@@ -13,43 +15,44 @@
 use Magento\Framework\App\CacheInterface;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var DefaultFrontend
      */
-    protected $model;
+    private $model;
 
     /**
-     * @var BooleanFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var BooleanFactory | MockObject
      */
-    protected $booleanFactory;
+    private $booleanFactory;
 
     /**
-     * @var Serializer|\PHPUnit_Framework_MockObject_MockObject
+     * @var Serializer| MockObject
      */
-    private $serializerMock;
+    private $serializer;
 
     /**
-     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface | MockObject
      */
-    private $storeManagerMock;
+    private $storeManager;
 
     /**
-     * @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreInterface | MockObject
      */
-    private $storeMock;
+    private $store;
 
     /**
-     * @var CacheInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CacheInterface | MockObject
      */
-    private $cacheMock;
+    private $cache;
 
     /**
-     * @var AbstractAttribute|\PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractAttribute | MockObject
      */
-    private $attributeMock;
+    private $attribute;
 
     /**
      * @var array
@@ -57,10 +60,13 @@ class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
     private $cacheTags;
 
     /**
-     * @var AbstractSource|\PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractSource | MockObject
      */
-    private $sourceMock;
+    private $source;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->cacheTags = ['tag1', 'tag2'];
@@ -68,111 +74,108 @@ protected function setUp()
         $this->booleanFactory = $this->getMockBuilder(BooleanFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->serializerMock = $this->getMockBuilder(Serializer::class)
+        $this->serializer = $this->getMockBuilder(Serializer::class)
             ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
             ->getMockForAbstractClass();
-        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
+        $this->store = $this->getMockBuilder(StoreInterface::class)
             ->getMockForAbstractClass();
-        $this->cacheMock = $this->getMockBuilder(CacheInterface::class)
+        $this->cache = $this->getMockBuilder(CacheInterface::class)
             ->getMockForAbstractClass();
-        $this->attributeMock = $this->getMockBuilder(AbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getAttributeCode', 'getSource'])
-            ->getMockForAbstractClass();
-        $this->sourceMock = $this->getMockBuilder(AbstractSource::class)
+        $this->attribute = $this->createAttribute();
+        $this->source = $this->getMockBuilder(AbstractSource::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAllOptions'])
             ->getMockForAbstractClass();
 
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->model = $objectManager->getObject(
-            DefaultFrontend::class,
-            [
-                '_attrBooleanFactory' => $this->booleanFactory,
-                'cache' => $this->cacheMock,
-                'storeManager' => $this->storeManagerMock,
-                'serializer' => $this->serializerMock,
-                '_attribute' => $this->attributeMock,
-                'cacheTags' => $this->cacheTags
-            ]
+        $this->model = new DefaultFrontend(
+            $this->booleanFactory,
+            $this->cache,
+            null,
+            $this->cacheTags,
+            $this->storeManager,
+            $this->serializer
         );
+
+        $this->model->setAttribute($this->attribute);
     }
 
     public function testGetClassEmpty()
     {
-        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getIsRequired',
-                'getFrontendClass',
-                'getValidateRules',
-            ])
-            ->getMock();
-        $attributeMock->expects($this->once())
-            ->method('getIsRequired')
+        /** @var AbstractAttribute | MockObject $attribute */
+        $attribute = $this->createAttribute();
+        $attribute->method('getIsRequired')
             ->willReturn(false);
-        $attributeMock->expects($this->once())
-            ->method('getFrontendClass')
+        $attribute->method('getFrontendClass')
             ->willReturn('');
-        $attributeMock->expects($this->exactly(2))
+        $attribute->expects($this->exactly(2))
             ->method('getValidateRules')
             ->willReturn('');
 
-        $this->model->setAttribute($attributeMock);
-        $this->assertEmpty($this->model->getClass());
+        $this->model->setAttribute($attribute);
+
+        self::assertEmpty($this->model->getClass());
     }
 
-    public function testGetClass()
+    /**
+     * Validates generated html classes.
+     *
+     * @param String $validationRule
+     * @param String $expectedClass
+     * @return void
+     * @dataProvider validationRulesDataProvider
+     */
+    public function testGetClass(String $validationRule, String $expectedClass): void
     {
-        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getIsRequired',
-                'getFrontendClass',
-                'getValidateRules',
-            ])
-            ->getMock();
-        $attributeMock->expects($this->once())
-            ->method('getIsRequired')
+        /** @var AbstractAttribute | MockObject $attribute */
+        $attribute = $this->createAttribute();
+        $attribute->method('getIsRequired')
             ->willReturn(true);
-        $attributeMock->expects($this->once())
-            ->method('getFrontendClass')
+        $attribute->method('getFrontendClass')
             ->willReturn('');
-        $attributeMock->expects($this->exactly(3))
+        $attribute->expects($this->exactly(3))
             ->method('getValidateRules')
             ->willReturn([
-                'input_validation' => 'alphanumeric',
+                'input_validation' => $validationRule,
                 'min_text_length' => 1,
                 'max_text_length' => 2,
             ]);
 
-        $this->model->setAttribute($attributeMock);
+        $this->model->setAttribute($attribute);
         $result = $this->model->getClass();
 
-        $this->assertContains('validate-alphanum', $result);
-        $this->assertContains('minimum-length-1', $result);
-        $this->assertContains('maximum-length-2', $result);
-        $this->assertContains('validate-length', $result);
+        self::assertContains($expectedClass, $result);
+        self::assertContains('minimum-length-1', $result);
+        self::assertContains('maximum-length-2', $result);
+        self::assertContains('validate-length', $result);
+    }
+
+    /**
+     * Provides possible validation types.
+     *
+     * @return array
+     */
+    public function validationRulesDataProvider(): array
+    {
+        return [
+            ['alphanumeric', 'validate-alphanum'],
+            ['alphanum-with-spaces', 'validate-alphanum-with-spaces'],
+            ['alpha', 'validate-alpha'],
+            ['numeric', 'validate-digits'],
+            ['url', 'validate-url'],
+            ['email', 'validate-email'],
+            ['length', 'validate-length']
+        ];
     }
 
     public function testGetClassLength()
     {
-        $attributeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'getIsRequired',
-                'getFrontendClass',
-                'getValidateRules',
-            ])
-            ->getMock();
-        $attributeMock->expects($this->once())
-            ->method('getIsRequired')
+        $attribute = $this->createAttribute();
+        $attribute->method('getIsRequired')
             ->willReturn(true);
-        $attributeMock->expects($this->once())
-            ->method('getFrontendClass')
+        $attribute->method('getFrontendClass')
             ->willReturn('');
-        $attributeMock->expects($this->exactly(3))
+        $attribute->expects($this->exactly(3))
             ->method('getValidateRules')
             ->willReturn([
                 'input_validation' => 'length',
@@ -180,12 +183,31 @@ public function testGetClassLength()
                 'max_text_length' => 2,
             ]);
 
-        $this->model->setAttribute($attributeMock);
+        $this->model->setAttribute($attribute);
         $result = $this->model->getClass();
 
-        $this->assertContains('minimum-length-1', $result);
-        $this->assertContains('maximum-length-2', $result);
-        $this->assertContains('validate-length', $result);
+        self::assertContains('minimum-length-1', $result);
+        self::assertContains('maximum-length-2', $result);
+        self::assertContains('validate-length', $result);
+    }
+
+    /**
+     * Entity attribute factory.
+     *
+     * @return AbstractAttribute | MockObject
+     */
+    private function createAttribute()
+    {
+        return $this->getMockBuilder(AbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getIsRequired',
+                'getFrontendClass',
+                'getValidateRules',
+                'getAttributeCode',
+                'getSource'
+            ])
+            ->getMockForAbstractClass();
     }
 
     public function testGetSelectOptions()
@@ -196,33 +218,25 @@ public function testGetSelectOptions()
         $options = ['option1', 'option2'];
         $serializedOptions = "{['option1', 'option2']}";
 
-        $this->storeManagerMock->expects($this->once())
-            ->method('getStore')
-            ->willReturn($this->storeMock);
-        $this->storeMock->expects($this->once())
-            ->method('getId')
+        $this->storeManager->method('getStore')
+            ->willReturn($this->store);
+        $this->store->method('getId')
             ->willReturn($storeId);
-        $this->attributeMock->expects($this->once())
-            ->method('getAttributeCode')
+        $this->attribute->method('getAttributeCode')
             ->willReturn($attributeCode);
-        $this->cacheMock->expects($this->once())
-            ->method('load')
+        $this->cache->method('load')
             ->with($cacheKey)
             ->willReturn(false);
-        $this->attributeMock->expects($this->once())
-            ->method('getSource')
-            ->willReturn($this->sourceMock);
-        $this->sourceMock->expects($this->once())
-            ->method('getAllOptions')
+        $this->attribute->method('getSource')
+            ->willReturn($this->source);
+        $this->source->method('getAllOptions')
             ->willReturn($options);
-        $this->serializerMock->expects($this->once())
-            ->method('serialize')
+        $this->serializer->method('serialize')
             ->with($options)
             ->willReturn($serializedOptions);
-        $this->cacheMock->expects($this->once())
-            ->method('save')
+        $this->cache->method('save')
             ->with($serializedOptions, $cacheKey, $this->cacheTags);
 
-        $this->assertSame($options, $this->model->getSelectOptions());
+        self::assertSame($options, $this->model->getSelectOptions());
     }
 }

From 28f5f93076e24a7f77aa8770b19a131e43e29aa9 Mon Sep 17 00:00:00 2001
From: Rajneesh Gupta <rajneeshgupta@cedcommerce.com>
Date: Mon, 24 Dec 2018 15:52:41 +0530
Subject: [PATCH 369/932] Rename UpdateBundleRelatedEntityTytpes.php to
 UpdateBundleRelatedEntityTypes.php

---
 ...RelatedEntityTytpes.php => UpdateBundleRelatedEntityTypes.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/code/Magento/Bundle/Setup/Patch/Data/{UpdateBundleRelatedEntityTytpes.php => UpdateBundleRelatedEntityTypes.php} (100%)

diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php
similarity index 100%
rename from app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php
rename to app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php

From 7c5bea3783ea15d81dc5e3e4e64ab23dd5c3dff9 Mon Sep 17 00:00:00 2001
From: Stepan Furman <furman.stepan@gmail.com>
Date: Mon, 24 Dec 2018 15:25:18 +0200
Subject: [PATCH 370/932] GraphQL-248: Test coverage

---
 .../GraphQl/Customer/CreateCustomerTest.php   | 169 +++++++++++++++++-
 1 file changed, 168 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
index 80a24eacb5f2c..7342800379d13 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -35,7 +35,7 @@ protected function setUp()
     /**
      * @throws \Exception
      */
-    public function testCreateCustomerAccount()
+    public function testCreateCustomerAccountWithPassword()
     {
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
@@ -70,4 +70,171 @@ public function testCreateCustomerAccount()
         $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
         $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
     }
+
+    /**
+     * @throws \Exception
+     */
+    public function testCreateCustomerAccountWithoutPassword()
+    {
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $newEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+
+        $query = <<<QUERY
+mutation {
+    createCustomer(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            email: "{$newEmail}"
+          	is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        $this->assertEquals($newFirstname, $response['createCustomer']['customer']['firstname']);
+        $this->assertEquals($newLastname, $response['createCustomer']['customer']['lastname']);
+        $this->assertEquals($newEmail, $response['createCustomer']['customer']['email']);
+        $this->assertEquals(true, $response['createCustomer']['customer']['is_subscribed']);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage "input" value should be specified
+     */
+    public function testCreateCustomerIfInputDataIsEmpty()
+    {
+        $query = <<<QUERY
+mutation {
+    createCustomer(
+        input: {
+        
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage The customer email is missing. Enter and try again.
+     */
+    public function testCreateCustomerIfEmailMissed()
+    {
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $currentPassword = 'test123#';
+
+        $query = <<<QUERY
+mutation {
+    createCustomer(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            password: "{$currentPassword}"
+          	is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage "Email" is not a valid email address.
+     */
+    public function testCreateCustomerIfEmailIsNotValid()
+    {
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $currentPassword = 'test123#';
+        $newEmail = 'email';
+
+        $query = <<<QUERY
+mutation {
+    createCustomer(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            email: "{$newEmail}"
+            password: "{$currentPassword}"
+          	is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage Field "test123" is not defined by type CustomerInput.
+     */
+    public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
+    {
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $currentPassword = 'test123#';
+        $newEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+
+        $query = <<<QUERY
+mutation {
+    createCustomer(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            test123: "123test123"
+            email: "{$newEmail}"
+            password: "{$currentPassword}"
+          	is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
 }

From 95d19002939bc6d6fb7cf4dd376ed5b372168d71 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Mon, 24 Dec 2018 17:27:37 +0400
Subject: [PATCH 371/932] MAGETWO-71344: Update product from mini shopping cart
 doesn't reflect in the shopping cart

- Add automated test script
---
 ...ateShoppingCartWhileUpdateMinicartTest.xml | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
new file mode 100644
index 0000000000000..b4a3ab4621776
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
@@ -0,0 +1,56 @@
+<?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="StoreFrontUpdateShoppingCartWhileUpdateMinicartTest">
+        <annotations>
+            <features value="Checkout"/>
+            <title value="Check updating shopping cart while updating items from minicart"/>
+            <description value="Check updating shopping cart while updating items from minicart"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-97280"/>
+            <useCaseId value="MAGETWO-71344"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <!--Create product-->
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+        </before>
+
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct" />
+        </after>
+
+        <!--Add product to cart-->
+        <amOnPage url="$$createProduct.name$$.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Shopping cart and check Qty-->
+        <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCart"/>
+        <grabValueFrom selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" stepKey="grabQtyShoppingCart"/>
+        <assertEquals expected="1" actual="$grabQtyShoppingCart" stepKey="assertQtyShoppingCart"/>
+
+        <!--Open minicart and change Qty-->
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="openMiniCart"/>
+        <waitForElementVisible selector="{{StorefrontMinicartSection.quantity}}" stepKey="waitForElementQty"/>
+        <pressKey selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::BACKSPACE]" stepKey="deleteFiled"/>
+        <fillField selector="{{StorefrontMinicartSection.itemQuantity($$createProduct.name$$)}}"  userInput="5" stepKey="changeQty"/>
+        <click selector="{{StorefrontMinicartSection.itemQuantityUpdate($$createProduct.name$$)}}" stepKey="updateQty"/>
+        <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
+
+       <!--Check Qty in shopping cart after updating-->
+        <grabValueFrom selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" stepKey="grabQtyShoppingCart1"/>
+        <assertEquals expected="5" actual="$grabQtyShoppingCart1" stepKey="assertQtyShoppingCart1"/>
+    </test>
+</tests>

From 61120df0704530e1f49b4e839e307455bce3c55f Mon Sep 17 00:00:00 2001
From: Oksana_Kremen <Oksana_Kremen@epam.com>
Date: Mon, 24 Dec 2018 15:49:19 +0200
Subject: [PATCH 372/932] MAGETWO-91750: Multiselect attribute values is not
 searchable under Quick Search when more than one value is selected

- Added possibility to retrieve multiselect option values for catalog fulltext search reindexation
---
 .../Magento/CatalogSearch/Model/ResourceModel/Engine.php     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
index 49caede8c4ac2..93ae2c94e2105 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php
@@ -110,7 +110,9 @@ public function processAttributeValue($attribute, $value)
             && in_array($attribute->getFrontendInput(), ['text', 'textarea'])
         ) {
             $result = $value;
-        } elseif ($this->isTermFilterableAttribute($attribute)) {
+        } elseif ($this->isTermFilterableAttribute($attribute)
+            || ($attribute->getIsSearchable() && in_array($attribute->getFrontendInput(), ['select', 'multiselect']))
+        ) {
             $result = '';
         }
 
@@ -119,6 +121,7 @@ public function processAttributeValue($attribute, $value)
 
     /**
      * Prepare index array as a string glued by separator
+     *
      * Support 2 level array gluing
      *
      * @param array $index

From 7882b71c5d13804d331665cea0eba78c7abd8e66 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Mon, 24 Dec 2018 19:29:54 +0200
Subject: [PATCH 373/932] MAGETWO-97247: Impossible to enable shared catalog
 through cli command

---
 app/code/Magento/Config/Model/Config.php      | 68 ++++++++++++++-----
 .../Config/Structure/Element/FieldPlugin.php  |  2 +-
 2 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 3ec32c44324cd..b1074e92cc949 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -552,27 +552,11 @@ private function initScope()
             $this->setSection('');
         }
 
-        if (!$this->getScope()) {
-            switch (true) {
-                case $this->getStore():
-                    $this->setScope(StoreScopeInterface::SCOPE_STORES);
-                    $this->setScopeCode($this->getStore());
-                    break;
-                case $this->getWebsite():
-                    $this->setScope(StoreScopeInterface::SCOPE_WEBSITES);
-                    $this->setScopeCode($this->getWebsite());
-                    break;
-                default:
-                    $this->setScope(ScopeInterface::SCOPE_DEFAULT);
-                    $this->setScopeCode('');
-                    break;
-            }
-        }
-        $scope = $this->scopeResolverPool->get($this->getScope())
-            ->getScope($this->getScopeCode());
+        $scope = $this->retrieveScope();
         $this->setScope($this->scopeTypeNormalizer->normalize($scope->getScopeType()));
         $this->setScopeCode($scope->getCode());
         $this->setScopeId($scope->getId());
+
         if ($this->getWebsite() === null) {
             $this->setWebsite(StoreScopeInterface::SCOPE_WEBSITES === $this->getScope() ? $scope->getId() : '');
         }
@@ -581,6 +565,54 @@ private function initScope()
         }
     }
 
+    /**
+     * Retrieve scope from initial data
+     *
+     * @return ScopeInterface
+     */
+    private function retrieveScope(): ScopeInterface
+    {
+        $scopeType = $this->getScope();
+        if (!$scopeType) {
+            switch (true) {
+                case $this->getStore():
+                    $scopeType = StoreScopeInterface::SCOPE_STORES;
+                    $scopeIdentifier = $this->getStore();
+                    break;
+                case $this->getWebsite():
+                    $scopeType = StoreScopeInterface::SCOPE_WEBSITES;
+                    $scopeIdentifier = $this->getWebsite();
+                    break;
+                default:
+                    $scopeType = ScopeInterface::SCOPE_DEFAULT;
+                    $scopeIdentifier = null;
+                    break;
+            }
+        } else {
+            switch (true) {
+                case $this->getScopeId() !== null:
+                    $scopeIdentifier = $this->getScopeId();
+                    break;
+                case $this->getScopeCode() !== null:
+                    $scopeIdentifier = $this->getScopeCode();
+                    break;
+                case $this->getStore() !== null:
+                    $scopeIdentifier = $this->getStore();
+                    break;
+                case $this->getWebsite() !== null:
+                    $scopeIdentifier = $this->getWebsite();
+                    break;
+                default:
+                    $scopeIdentifier = null;
+                    break;
+            }
+        }
+        $scope = $this->scopeResolverPool->get($scopeType)
+            ->getScope($scopeIdentifier);
+
+        return $scope;
+    }
+
     /**
      * Return formatted config data for current section
      *
diff --git a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
index c2056aea08c00..1ba8225f3f596 100644
--- a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
+++ b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
@@ -36,7 +36,7 @@ public function __construct(RequestInterface $request)
      */
     public function afterGetConfigPath(FieldConfigStructure $subject, $result)
     {
-        if (!$result && $this->request->getParam('section') == 'payment') {
+        if (!$result && strpos($subject->getPath(), 'payment_') === 0) {
             $result = preg_replace(
                 '@^(' . implode('|', ConfigStructurePlugin::getPaypalConfigCountries(true)) . ')/@',
                 'payment/',

From b618757229157d977e0acf584ea036040ba5e225 Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Tue, 25 Dec 2018 10:52:55 +0530
Subject: [PATCH 374/932] Fixed 19800 Contact us : design improvement

---
 .../Magento/Contact/view/frontend/web/css/source/_module.less    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
index d9314523bd2f7..881cad2874bdf 100644
--- a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
+++ b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
@@ -1,4 +1,3 @@
-// /**
 //  * Copyright © Magento, Inc. All rights reserved.
 //  * See COPYING.txt for license details.
 //  */

From a438bba6ba3c89f8493f5d03ee2d9601dba9c297 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 25 Dec 2018 22:16:41 +0300
Subject: [PATCH 375/932] MAGETWO-50668: Event clean_cache_by_tags didn't clean
 all tags pointed in getIdentity

- Remove todo.
---
 .../Magento/CatalogRule/Model/Indexer/AbstractIndexer.php  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
index 5d93e6f216866..6b7c12dfdf463 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
@@ -10,6 +10,9 @@
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Indexer\CacheContext;
 
+/**
+ * Abstract class for CatalogRule indexers.
+ */
 abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInterface, IdentityInterface
 {
     /**
@@ -66,7 +69,6 @@ public function executeFull()
     {
         $this->indexBuilder->reindexFull();
         $this->_eventManager->dispatch('clean_cache_by_tags', ['object' => $this]);
-        //TODO: remove after fix fpc. MAGETWO-50668
         $this->getCacheManager()->clean($this->getIdentities());
     }
 
@@ -137,8 +139,9 @@ public function executeRow($id)
     abstract protected function doExecuteRow($id);
 
     /**
-     * @return \Magento\Framework\App\CacheInterface|mixed
+     * Get cache manager
      *
+     * @return \Magento\Framework\App\CacheInterface|mixed
      * @deprecated 100.0.7
      */
     private function getCacheManager()

From b89cefbc0e224ff1706accdd6f0ed9ab5016053c Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Tue, 25 Dec 2018 22:30:23 +0200
Subject: [PATCH 376/932] MAGETWO-97234: URL redirect (301) loosing current
 currency and displays default one

---
 app/code/Magento/Store/etc/frontend/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/etc/frontend/di.xml b/app/code/Magento/Store/etc/frontend/di.xml
index c39d5df863939..917aedad3d960 100644
--- a/app/code/Magento/Store/etc/frontend/di.xml
+++ b/app/code/Magento/Store/etc/frontend/di.xml
@@ -9,7 +9,7 @@
     <type name="Magento\Framework\App\FrontController">
         <plugin name="requestPreprocessor" type="Magento\Store\App\FrontController\Plugin\RequestPreprocessor" sortOrder="50"/>
     </type>
-    <type name="Magento\Framework\App\Action\Action">
+    <type name="Magento\Framework\App\Action\AbstractAction">
         <plugin name="contextPlugin" type="Magento\Store\App\Action\Plugin\Context" sortOrder="10"/>
     </type>
     <type name="Magento\Framework\App\RouterList" shared="true">

From fd10ab514c038ea8162a4437de79f2b0d07852a6 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Tue, 25 Dec 2018 23:35:05 +0200
Subject: [PATCH 377/932] MAGETWO-97247: Impossible to enable shared catalog
 through cli command

---
 .../Config/Structure/Element/FieldPlugin.php  | 14 -----------
 .../Structure/Element/FieldPluginTest.php     | 24 ++++---------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
index 1ba8225f3f596..5d5db0128b1eb 100644
--- a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
+++ b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Paypal\Model\Config\Structure\Element;
 
-use Magento\Framework\App\RequestInterface;
 use Magento\Config\Model\Config\Structure\Element\Field as FieldConfigStructure;
 use Magento\Paypal\Model\Config\StructurePlugin as ConfigStructurePlugin;
 
@@ -14,19 +13,6 @@
  */
 class FieldPlugin
 {
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * @param RequestInterface $request
-     */
-    public function __construct(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
     /**
      * Get original configPath (not changed by PayPal configuration inheritance)
      *
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
index 8615b91383aaa..f0dda20b71c76 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Paypal\Model\Config\Structure\Element\FieldPlugin as FieldConfigStructurePlugin;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\App\RequestInterface;
 use Magento\Config\Model\Config\Structure\Element\Field as FieldConfigStructureMock;
 
 class FieldPluginTest extends \PHPUnit\Framework\TestCase
@@ -22,11 +21,6 @@ class FieldPluginTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManagerHelper;
 
-    /**
-     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $requestMock;
-
     /**
      * @var FieldConfigStructureMock|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -34,16 +28,13 @@ class FieldPluginTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
-            ->getMockForAbstractClass();
         $this->subjectMock = $this->getMockBuilder(FieldConfigStructureMock::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->plugin = $this->objectManagerHelper->getObject(
-            FieldConfigStructurePlugin::class,
-            ['request' => $this->requestMock]
+            FieldConfigStructurePlugin::class
         );
     }
 
@@ -56,10 +47,9 @@ public function testAroundGetConfigPathHasResult()
 
     public function testAroundGetConfigPathNonPaymentSection()
     {
-        $this->requestMock->expects(static::once())
-            ->method('getParam')
-            ->with('section')
-            ->willReturn('non-payment');
+        $this->subjectMock->expects($this->once())
+            ->method('getPath')
+            ->willReturn('non-payment/group/field');
 
         $this->assertNull($this->plugin->afterGetConfigPath($this->subjectMock, null));
     }
@@ -72,11 +62,7 @@ public function testAroundGetConfigPathNonPaymentSection()
      */
     public function testAroundGetConfigPath($subjectPath, $expectedConfigPath)
     {
-        $this->requestMock->expects(static::once())
-            ->method('getParam')
-            ->with('section')
-            ->willReturn('payment');
-        $this->subjectMock->expects(static::once())
+        $this->subjectMock->expects($this->exactly(2))
             ->method('getPath')
             ->willReturn($subjectPath);
 

From c8fa36fec9f4a5af14117f3f6ce5df3382d394f6 Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Wed, 26 Dec 2018 10:50:55 +0530
Subject: [PATCH 378/932] Fixed 19800 Contact us : design improvement

---
 .../view/frontend/web/css/source/_module.less | 65 ++++++++-----------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
index 881cad2874bdf..160eb73c570eb 100644
--- a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
+++ b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
@@ -1,49 +1,40 @@
 //  * Copyright © Magento, Inc. All rights reserved.
 //  * See COPYING.txt for license details.
-//  */
-
-
-
-//
 //  Common
 //  _____________________________________________
-
 & when (@media-common = true) {
-    .contact-index-index {
-        .column:not(.sidebar-main){
-            .form.contact {
-                width: 50%;
-                float: none;
-            }
-        }
-        .column:not(.sidebar-additional) {
-            .form.contact {
-                width: 50%;
-                float: none;
-            }
-        }
-    }
-
+	.contact-index-index {
+		.column:not(.sidebar-main){
+			.form.contact {
+				width: 50%;
+				float: none;
+			}
+		}
+		.column:not(.sidebar-additional) {
+			.form.contact {
+				width: 50%;
+				float: none;
+			}
+		}
+	}
 }
-
 //
 //  Mobile
 //  _____________________________________________
-
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-    .contact-index-index {
-        .column:not(.sidebar-main){
-            .form.contact {
-                width: 100%;
-                float: none;
-            }
-        }
-        .column:not(.sidebar-additional) {
-            .form.contact {
-                width: 100%;
-                float: none;
-            }
-        }
-    }
+	.contact-index-index {
+		.column:not(.sidebar-main){
+			.form.contact {
+				width: 100%;
+				float: none;
+			}
+		}
+		.column:not(.sidebar-additional) {
+			.form.contact {
+				width: 100%;
+				float: none;
+			}
+		}
+	}
 }
 

From abfa040f4255dd91b7c01f4b9f07b8bedde6417c Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Wed, 26 Dec 2018 14:45:29 +0530
Subject: [PATCH 379/932] Fixed 19800 Contact us : design improvement

---
 .../view/frontend/web/css/source/_module.less        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
index 160eb73c570eb..6d1d77444cc33 100644
--- a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
+++ b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
@@ -1,7 +1,6 @@
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  Common
-//  _____________________________________________
+/** Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  Common */
 & when (@media-common = true) {
 	.contact-index-index {
 		.column:not(.sidebar-main){
@@ -18,9 +17,8 @@
 		}
 	}
 }
-//
-//  Mobile
-//  _____________________________________________
+
+//	Mobile 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
 	.contact-index-index {
 		.column:not(.sidebar-main){

From 2e08f60e1bd43ccf45a89364e76092cbc6d6da4e Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Wed, 26 Dec 2018 15:32:05 +0530
Subject: [PATCH 380/932] Fixed 19800 Contact us : design improvement

---
 .../Magento/Contact/view/frontend/web/css/source/_module.less  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
index 6d1d77444cc33..6c8c387100f4a 100644
--- a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
+++ b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
@@ -1,6 +1,7 @@
 /** Copyright © Magento, Inc. All rights reserved.
   * See COPYING.txt for license details.
-  Common */
+  Common 
+*/
 & when (@media-common = true) {
 	.contact-index-index {
 		.column:not(.sidebar-main){

From 58017248eca2aef9924d4f61873f4f3ade5614c6 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Wed, 26 Dec 2018 14:10:12 +0400
Subject: [PATCH 381/932] MAGETWO-96842: [2.3.x] [Magento Cloud] [QUANS] Tiered
 block displayed on configurable products without any tiered pricing

- Add automated test script
---
 ...eForProductOptionsWithoutTierPriceTest.xml | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
new file mode 100644
index 0000000000000..3086f4398e08d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
@@ -0,0 +1,94 @@
+<?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="AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Check that 'trie price' block not available for simple product from options without 'trie price'"/>
+            <description value="Check that 'trie price' block not available for simple product from options without 'trie price'"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97050"/>
+            <useCaseId value="MAGETWO-96842"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
+            <!--Create category-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+
+            <!-- Create the configurable product based on the data in the /data folder -->
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Make the configurable product have two options, that are children of the default attribute set -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Create the 2 children that will be a part of the configurable product -->
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+
+            <!-- Assign the two products to the configurable product -->
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+        </before>
+        <after>
+            <!--Delete created data-->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <!--Go to storefront product page an check price box css-->
+        <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontLoad"/>
+        <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="$$getConfigAttributeOption1.value$$" stepKey="selectOption"/>
+        <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="class" stepKey="grabGrabPriceClass"/>
+        <assertNotContains actual="$grabGrabPriceClass" expected=".price-box .price-tier_price" expectedType="string"  stepKey="assertNotEquals"/>
+    </test>
+</tests>

From cce9e41b960e7cbb1812a0f02d7c666b83528f7e Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 26 Dec 2018 12:22:22 +0200
Subject: [PATCH 382/932] ENGCOM-3742: Static test fix.

---
 .../Patch/Data/UpdateBundleRelatedEntityTypes.php  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php
index 34a4b7270faf2..701def7fc13d8 100644
--- a/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php
+++ b/app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTypes.php
@@ -6,16 +6,16 @@
 
 namespace Magento\Bundle\Setup\Patch\Data;
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Setup\EavSetup;
 use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
-use Magento\Eav\Setup\EavSetup;
 
 /**
  * Class UpdateBundleRelatedEntityTypes
+ *
  * @package Magento\Bundle\Setup\Patch
  */
 class UpdateBundleRelatedEntityTypes implements DataPatchInterface, PatchVersionInterface
@@ -44,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -177,7 +177,7 @@ private function upgradeShipmentType(EavSetup $eavSetup)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -187,7 +187,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -195,7 +195,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

From bd6534406fb28a1c6dadd0e506d49438d7b521b7 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 26 Dec 2018 13:01:44 +0200
Subject: [PATCH 383/932] ENGCOM-3731: Static test fix.

---
 .../Magento/luma/web/css/source/components/_modals_extend.less  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
index aad5022e96ccd..3814341efd05a 100644
--- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
+++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
@@ -82,8 +82,8 @@
 
     .modal-slide {
         .action-close {
-            padding: 0;
             margin: 15px;
+            padding: 0;
         }
 
         .page-main-actions {

From bccc949cb08491a15ed0392ea29c7f34b577b215 Mon Sep 17 00:00:00 2001
From: 4lexvav <4lexvav@gmail.com>
Date: Wed, 26 Dec 2018 13:20:43 +0200
Subject: [PATCH 384/932] Set correct email message encoding

---
 app/code/Magento/Email/Model/Transport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Email/Model/Transport.php b/app/code/Magento/Email/Model/Transport.php
index 28d2d171eecf4..90a4e6571c9b6 100644
--- a/app/code/Magento/Email/Model/Transport.php
+++ b/app/code/Magento/Email/Model/Transport.php
@@ -87,7 +87,7 @@ public function __construct(
     public function sendMessage()
     {
         try {
-            $zendMessage = Message::fromString($this->message->getRawMessage());
+            $zendMessage = Message::fromString($this->message->getRawMessage())->setEncoding('utf-8');
             if (2 === $this->isSetReturnPath && $this->returnPathValue) {
                 $zendMessage->setSender($this->returnPathValue);
             } elseif (1 === $this->isSetReturnPath && $zendMessage->getFrom()->count()) {

From b7721970aadcabdf7607ea5637c035f8ab45b58e Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Wed, 26 Dec 2018 14:06:57 +0200
Subject: [PATCH 385/932] MAGETWO-97247: Impossible to enable shared catalog
 through cli command

---
 .../Config/Backend/Currency/AbstractCurrency.php    | 13 ++++++++-----
 .../Config/Console/Command/ConfigSetCommandTest.php |  7 +++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
index 4ae66bfd9692b..25303093ace5d 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
@@ -14,6 +14,8 @@
 namespace Magento\Config\Model\Config\Backend\Currency;
 
 /**
+ * Base currency class
+ *
  * @api
  * @since 100.0.2
  */
@@ -26,18 +28,19 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
      */
     protected function _getAllowedCurrencies()
     {
-        if (!$this->isFormData() || $this->getData('groups/options/fields/allow/inherit')) {
-            return explode(
+        $allowValue = $this->getData('groups/options/fields/allow/value');
+        $allowedCurrencies = $allowValue === null || $this->getData('groups/options/fields/allow/inherit')
+            ? explode(
                 ',',
                 (string)$this->_config->getValue(
                     \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
                     $this->getScope(),
                     $this->getScopeId()
                 )
-            );
-        }
+            )
+            : (array) $allowValue;
 
-        return (array)$this->getData('groups/options/fields/allow/value');
+        return $allowedCurrencies;
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
index f68f3cf37b079..73f1dd9e7b711 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigSetCommandTest.php
@@ -28,7 +28,7 @@
 /**
  * Tests the different flows of config:set command.
  *
- * {@inheritdoc}
+ * @inheritdoc
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @magentoDbIsolation enabled
  */
@@ -292,8 +292,7 @@ public function runExtendedDataProvider()
      * @param string $scope
      * @param $scopeCode string|null
      * @dataProvider configSetValidationErrorDataProvider
-     *
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testConfigSetValidationError(
         $path,
@@ -307,6 +306,7 @@ public function testConfigSetValidationError(
 
     /**
      * Data provider for testConfigSetValidationError
+     *
      * @return array
      */
     public function configSetValidationErrorDataProvider()
@@ -399,7 +399,6 @@ public function testConfigSetCurrency()
      * Saving values with successful validation
      *
      * @dataProvider configSetValidDataProvider
-     *
      * @magentoDbIsolation enabled
      */
     public function testConfigSetValid()

From 6e47e583e2e46daaca7b1210648da36a6c1d2270 Mon Sep 17 00:00:00 2001
From: suryakant <suryakant.makwana@krishtechnolabs.com>
Date: Wed, 26 Dec 2018 18:08:50 +0530
Subject: [PATCH 386/932] Fixed 19800 Contact us : design improvement

---
 .../Contact/view/frontend/web/css/source/_module.less       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
index 6c8c387100f4a..e907c61b39e7b 100644
--- a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
+++ b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
@@ -1,6 +1,6 @@
-/** Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  Common 
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
 */
 & when (@media-common = true) {
 	.contact-index-index {

From 4adf300b1d9f43b2dd40d2e28d6aac4336e2a97a Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 26 Dec 2018 14:52:35 +0200
Subject: [PATCH 387/932] ENGCOM-3676: Static test fix.

---
 app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php      | 3 +++
 app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php     | 4 +++-
 app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php | 4 +++-
 app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php      | 4 +++-
 app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php     | 4 +++-
 app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php       | 4 +++-
 app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php      | 4 +++-
 app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php | 1 -
 app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php  | 3 +++
 app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php       | 4 +++-
 .../Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php  | 4 +++-
 11 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
index 99cd283061ec9..655b3eb5b91b8 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\Action\HttpGetActionInterface;
 
+/**
+ * Edit CMS block action.
+ */
 class Edit extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
index 576c8244005ba..b7504a5c2b226 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,6 +7,9 @@
 
 use Magento\Framework\App\Action\HttpGetActionInterface;
 
+/**
+ * Index action.
+ */
 class Index extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
index 52473b5b9e529..5983594f876a2 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,6 +7,9 @@
 
 use Magento\Framework\App\Action\HttpGetActionInterface;
 
+/**
+ * Create CMS block action.
+ */
 class NewAction extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
index 57e7867cc3fcf..0c6c6470398c1 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -15,6 +14,9 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
 
+/**
+ * Save CMS block action.
+ */
 class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
index e921d867d21f0..15bb40930536f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,6 +7,9 @@
 
 use Magento\Framework\App\Action\HttpPostActionInterface;
 
+/**
+ * Delete CMS page action.
+ */
 class Delete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
index 4f70746b9dee7..f50fb2b19c00f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,6 +8,9 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Backend\App\Action;
 
+/**
+ * Edit CMS page action.
+ */
 class Edit extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
index cd2cc1bd7f87f..04557ddaeec78 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,6 +9,9 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
+/**
+ * Index action.
+ */
 class Index extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
index 96109f96412fb..e2cb8d984e01d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
@@ -11,7 +11,6 @@
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
 
-
 /**
  * Class MassEnable
  */
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
index 113a3ebcc1c19..6a4f4951cef02 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\App\Action\HttpGetActionInterface;
 
+/**
+ * Create CMS page action.
+ */
 class NewAction extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index b159c5110e350..37cb45753174f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -12,6 +11,9 @@
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * Save CMS page action.
+ */
 class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
index b915e592af485..340f4b24dd16e 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,6 +9,9 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 
+/**
+ * Chooser Source action.
+ */
 class Chooser extends Action implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**

From f49c56952484d268b5b9cc4fa12d994e5dac8b43 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 26 Dec 2018 15:52:17 +0200
Subject: [PATCH 388/932] ENGCOM-3653: Static test fix.

---
 .../backend/web/css/source/actions/_actions-multiselect.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
index 6a6112fea188a..4c364bed688bc 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-multiselect.less
@@ -199,8 +199,8 @@
 
 .admin__action-multiselect-empty-area {
     color: @color-gray65-almost;
-    padding-top: 20px;
     padding-bottom: 20px;
+    padding-top: 20px;
     text-align: center;
     vertical-align: middle;
 }

From 8048516db1ef7ea0fd046f2cfe4d04cbc72afdd0 Mon Sep 17 00:00:00 2001
From: NazarKlovanych <nazarn96@gmail.com>
Date: Wed, 26 Dec 2018 15:57:44 +0200
Subject: [PATCH 389/932] Fix issue 19887 creating new shipment: getting all
 trackers.

---
 .../Sales/view/frontend/templates/email/shipment/track.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index 9f7146ab084df..46566c2773f45 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -19,7 +19,7 @@
         </tr>
     </thead>
     <tbody>
-    <?php foreach ($_shipment->getAllTracks() as $_item): ?>
+    <?php foreach ($_order->getTracksCollection($_shipment->getId()) as $_item): ?>
         <tr>
             <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
             <td><?= $block->escapeHtml($_item->getNumber()) ?></td>

From 9cf1e3ee05ddcf9f182fe1a16ab0e19e95bd70ec Mon Sep 17 00:00:00 2001
From: NazarKlovanych <nazarn96@gmail.com>
Date: Wed, 26 Dec 2018 16:26:02 +0200
Subject: [PATCH 390/932] Refactoring

---
 .../templates/email/shipment/track.phtml      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index 46566c2773f45..f1cd5f2b99865 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -9,22 +9,23 @@
 ?>
 <?php $_shipment = $block->getShipment() ?>
 <?php $_order = $block->getOrder() ?>
-<?php if ($_shipment && $_order && $_shipment->getAllTracks()): ?>
-<br />
-<table class="shipment-track">
-    <thead>
+<?php $trackCollection = $_order->getTracksCollection($_shipment->getId()) ?>
+<?php if ($_shipment && $_order && $trackCollection): ?>
+    <br />
+    <table class="shipment-track">
+        <thead>
         <tr>
             <th><?= /* @escapeNotVerified */  __('Shipped By') ?></th>
             <th><?= /* @escapeNotVerified */  __('Tracking Number') ?></th>
         </tr>
-    </thead>
-    <tbody>
-    <?php foreach ($_order->getTracksCollection($_shipment->getId()) as $_item): ?>
-        <tr>
-            <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
-            <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
-        </tr>
-    <?php endforeach ?>
-    </tbody>
-</table>
+        </thead>
+        <tbody>
+        <?php foreach ($trackCollection as $_item): ?>
+            <tr>
+                <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
+                <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
+            </tr>
+        <?php endforeach ?>
+        </tbody>
+    </table>
 <?php endif; ?>

From 706f7163af4c7c168e89538fffbb56b8da8597de Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 26 Dec 2018 17:15:40 +0200
Subject: [PATCH 391/932] ENGCOM-3652: Static test fix.

---
 .../Magento/Indexer/Model/Message/Invalid.php |  3 +++
 .../Payment/Model/Method/AbstractMethod.php   | 23 +++++++++++--------
 .../Quote/Api/CartRepositoryInterface.php     |  1 -
 .../Annotation/AnnotationFormatValidator.php  |  4 ++--
 .../Sniffs/Arrays/ShortArraySyntaxSniff.php   |  9 +++++---
 .../Sniffs/EchoTags/ShortEchoSyntaxSniff.php  |  7 ++++--
 .../Magento/Sniffs/Files/LineLengthSniff.php  |  2 +-
 .../LanguageConstructsSniff.php               |  4 ++--
 .../Sniffs/Less/BracesFormattingSniff.php     |  4 ++--
 .../Magento/Sniffs/Less/ClassNamingSniff.php  |  5 ++--
 .../Magento/Sniffs/Less/ColonSpacingSniff.php |  5 ++--
 .../Sniffs/Less/ColourDefinitionSniff.php     |  5 ++--
 .../Less/CombinatorIndentationSniff.php       |  5 ++--
 .../Sniffs/Less/CommentLevelsSniff.php        |  5 ++--
 .../Sniffs/Less/ImportantPropertySniff.php    |  5 ++--
 .../Magento/Sniffs/Less/IndentationSniff.php  |  4 ++--
 .../Sniffs/Less/PropertiesLineBreakSniff.php  |  5 ++--
 .../Sniffs/Less/PropertiesSortingSniff.php    |  5 ++--
 .../Magento/Sniffs/Less/QuotesSniff.php       |  5 ++--
 .../Sniffs/Less/SelectorDelimiterSniff.php    |  7 +++---
 .../Sniffs/Less/SemicolonSpacingSniff.php     |  9 +++++---
 .../Sniffs/Less/TokenizerSymbolsInterface.php |  1 -
 .../Less/TypeSelectorConcatenationSniff.php   |  5 ++--
 .../Sniffs/Less/TypeSelectorsSniff.php        |  5 ++--
 .../Magento/Sniffs/Less/VariablesSniff.php    |  5 ++--
 .../Magento/Sniffs/Less/ZeroUnitsSniff.php    |  5 ++--
 .../NamingConventions/InterfaceNameSniff.php  |  7 ++++--
 .../NamingConventions/ReservedWordsSniff.php  |  7 ++++--
 .../Sniffs/Security/ExecutableRegExSniff.php  |  4 ++--
 .../Sniffs/Strings/StringPositionSniff.php    |  4 ++--
 .../Sniffs/Translation/ConstantUsageSniff.php | 10 +++++---
 .../Whitespace/EmptyLineMissedSniff.php       |  6 +++--
 .../Whitespace/MultipleEmptyLinesSniff.php    |  4 ++--
 .../Setup/Controller/LandingInstaller.php     |  2 ++
 .../Setup/Controller/LandingUpdater.php       |  4 +++-
 .../src/Magento/Setup/Model/SystemPackage.php |  6 +++++
 36 files changed, 110 insertions(+), 87 deletions(-)

diff --git a/app/code/Magento/Indexer/Model/Message/Invalid.php b/app/code/Magento/Indexer/Model/Message/Invalid.php
index 8daef14297c64..79f9fcef9641e 100644
--- a/app/code/Magento/Indexer/Model/Message/Invalid.php
+++ b/app/code/Magento/Indexer/Model/Message/Invalid.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Indexer\Model\Message;
 
+/**
+ * Message about invalid indexers.
+ */
 class Invalid implements \Magento\Framework\Notification\MessageInterface
 {
     /**
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index c01a93db538df..c0ccf887b18d7 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -258,7 +258,7 @@ protected function initializeData($data = [])
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      * @deprecated 100.2.0
      */
     public function setStore($storeId)
@@ -267,7 +267,7 @@ public function setStore($storeId)
     }
 
     /**
-     * {inheritdoc}
+     * @inheritdoc
      * @deprecated 100.2.0
      */
     public function getStore()
@@ -360,7 +360,8 @@ public function canRefundPartialPerInvoice()
     }
 
     /**
-     * Check void availability
+     * Check void availability.
+     *
      * @return bool
      * @internal param \Magento\Framework\DataObject $payment
      * @api
@@ -372,8 +373,9 @@ public function canVoid()
     }
 
     /**
-     * Using internal pages for input payment data
-     * Can be used in admin
+     * Using internal pages for input payment data.
+     *
+     * Can be used in admin.
      *
      * @return bool
      * @deprecated 100.2.0
@@ -715,7 +717,8 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
     }
 
     /**
-     * Whether this method can accept or deny payment
+     * Whether this method can accept or deny payment.
+     *
      * @return bool
      * @api
      * @deprecated 100.2.0
@@ -867,8 +870,7 @@ public function isActive($storeId = null)
     }
 
     /**
-     * Method that will be executed instead of authorize or capture
-     * if flag isInitializeNeeded set to true
+     * Method that will be executed instead of authorize or capture if flag isInitializeNeeded set to true.
      *
      * @param string $paymentAction
      * @param object $stateObject
@@ -884,8 +886,9 @@ public function initialize($paymentAction, $stateObject)
     }
 
     /**
-     * Get config payment action url
-     * Used to universalize payment actions when processing payment place
+     * Get config payment action url.
+     *
+     * Used to universalize payment actions when processing payment place.
      *
      * @return string
      * @api
diff --git a/app/code/Magento/Quote/Api/CartRepositoryInterface.php b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
index c8e874e0fcc21..ee122d1b02ffd 100644
--- a/app/code/Magento/Quote/Api/CartRepositoryInterface.php
+++ b/app/code/Magento/Quote/Api/CartRepositoryInterface.php
@@ -28,7 +28,6 @@ public function get($cartId);
      * included.  See https://devdocs.magento.com/codelinks/attributes.html#CartRepositoryInterface to determine
      * which call to use to get detailed information about all attributes for an object.
      *
-     *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Quote\Api\Data\CartSearchResultsInterface
      */
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
index 899a65c375321..49acd039a0960 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Annotation/AnnotationFormatValidator.php
@@ -168,8 +168,8 @@ private function validateLongDescriptionFormat(
     ) : void {
         $tokens = $phpcsFile->getTokens();
         $longPtr = $phpcsFile->findNext($emptyTypeTokens, $shortPtrEnd + 1, $commentEndPtr - 1, true);
-        if (strtolower($tokens[$longPtr]['content']) === '{@inheritdoc}') {
-            $error = '{@inheritdoc} imports only short description, annotation must have long description';
+        if (strtolower($tokens[$longPtr]['content']) === '@inheritdoc') {
+            $error = '@inheritdoc imports only short description, annotation must have long description';
             $phpcsFile->addFixableError($error, $longPtr, 'MethodAnnotation');
         }
         if ($longPtr !== false && $tokens[$longPtr]['code'] === T_DOC_COMMENT_STRING) {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
index 9013f12b6b46b..5ce1ac333cc11 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
@@ -5,13 +5,16 @@
  */
 namespace Magento\Sniffs\Arrays;
 
-use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
+/**
+ * Validate short array syntax is used.
+ */
 class ShortArraySyntaxSniff implements Sniff
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -19,7 +22,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $sourceFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
index 694905cb37add..9d0d58950c4f8 100644
--- a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
@@ -9,10 +9,13 @@
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Util\Tokens;
 
+/**
+ * Validate short echo syntax is used.
+ */
 class ShortEchoSyntaxSniff implements Sniff
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -20,7 +23,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php b/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
index 2abcf0531b009..528baeedf0476 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
@@ -20,7 +20,7 @@ class LineLengthSniff extends FilesLineLengthSniff
     protected $previousLineContent = '';
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function checkLineLength($phpcsFile, $stackPtr, $lineContent)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php b/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php
index a3a49adf62a62..575b39542311a 100644
--- a/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/LanguageConstructs/LanguageConstructsSniff.php
@@ -48,7 +48,7 @@ class LanguageConstructsSniff implements Sniff
     protected $directOutput = 'DirectOutput';
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -60,7 +60,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
index 14f37603cd362..61e2e69eeb86f 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
@@ -27,7 +27,7 @@ class BracesFormattingSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -35,7 +35,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
index e49249361fa43..8c55edc13afc2 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
@@ -18,7 +18,6 @@
  * - words should be separated with dash '-';
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#standard-classes
- *
  */
 class ClassNamingSniff implements Sniff
 {
@@ -35,7 +34,7 @@ class ClassNamingSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -43,7 +42,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
index 867809fbbff71..b5f61a6432731 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
@@ -15,7 +15,6 @@
  * Ensure that single quotes are used
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-colon-indents
- *
  */
 class ColonSpacingSniff implements Sniff
 {
@@ -27,7 +26,7 @@ class ColonSpacingSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -35,7 +34,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
index 08a7feeaf3270..83e3da698f08f 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
@@ -14,7 +14,6 @@
  * Ensure that hexadecimal values are used for variables not for properties
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#hexadecimal-notation
- *
  */
 class ColourDefinitionSniff implements Sniff
 {
@@ -26,7 +25,7 @@ class ColourDefinitionSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -34,7 +33,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
index 9ff1949316b89..a8ce4cfe547a1 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
@@ -14,7 +14,6 @@
  * Ensure that spaces are used before and after combinators
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#combinator-indents
- *
  */
 class CombinatorIndentationSniff implements Sniff
 {
@@ -26,7 +25,7 @@ class CombinatorIndentationSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -34,7 +33,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
index 0085a1cd40f0f..41c970d4cb496 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
@@ -16,7 +16,6 @@
  * Inline comments should have one space after "//".
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#comments
- *
  */
 class CommentLevelsSniff implements Sniff
 {
@@ -42,7 +41,7 @@ class CommentLevelsSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -50,7 +49,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
index b65ab10b8a629..db03440699f41 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
@@ -14,7 +14,6 @@
  * Ensure that single quotes are used
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#important-property
- *
  */
 class ImportantPropertySniff implements Sniff
 {
@@ -26,7 +25,7 @@ class ImportantPropertySniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -34,7 +33,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
index 283c9a43e313d..f0f994131e635 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
@@ -46,7 +46,7 @@ class IndentationSniff implements Sniff
     private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -54,7 +54,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
index 84ae1b5dec303..e9bd1f7942ed4 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
@@ -14,7 +14,6 @@
  * Start each property declaration in a new line
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-line-break
- *
  */
 class PropertiesLineBreakSniff implements Sniff
 {
@@ -26,7 +25,7 @@ class PropertiesLineBreakSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -34,7 +33,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
index 6fdcd8ded29b4..a39974f2b3861 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
@@ -14,7 +14,6 @@
  * Ensure that properties are sorted alphabetically
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#sorting
- *
  */
 class PropertiesSortingSniff implements Sniff
 {
@@ -43,7 +42,7 @@ class PropertiesSortingSniff implements Sniff
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -57,7 +56,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
index 2b2b4a6edad45..8127d26770410 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
@@ -14,7 +14,6 @@
  * Ensure that single quotes are used
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#quotes
- *
  */
 class QuotesSniff implements Sniff
 {
@@ -26,7 +25,7 @@ class QuotesSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -34,7 +33,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
index f48bafd329cad..99b91b63d88fc 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
@@ -15,7 +15,6 @@
  * No spaces should be before or after delimiters.
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selector-delimiters
- *
  */
 class SelectorDelimiterSniff implements Sniff
 {
@@ -27,7 +26,7 @@ class SelectorDelimiterSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -35,7 +34,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
@@ -50,6 +49,8 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
+     * Parenthesis validation.
+     *
      * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
index 8bccb26ae6100..de30d9cdbf497 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
@@ -14,7 +14,6 @@
  * Property should have a semicolon at the end of line
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#end-of-the-property-line
- *
  */
 class SemicolonSpacingSniff implements Sniff
 {
@@ -44,7 +43,7 @@ class SemicolonSpacingSniff implements Sniff
     private $styleCodesToSkip = [T_ASPERAND, T_COLON, T_OPEN_PARENTHESIS, T_CLOSE_PARENTHESIS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -52,7 +51,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
@@ -72,6 +71,8 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
+     * Semicolon validation.
+     *
      * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
@@ -90,6 +91,8 @@ private function validateSemicolon(File $phpcsFile, $stackPtr, array $tokens, $s
     }
 
     /**
+     * Spaces validation.
+     *
      * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TokenizerSymbolsInterface.php b/dev/tests/static/framework/Magento/Sniffs/Less/TokenizerSymbolsInterface.php
index 9da92913b402f..db6a2fe116924 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/TokenizerSymbolsInterface.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TokenizerSymbolsInterface.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface TokenizerSymbolsInterface
- *
  */
 interface TokenizerSymbolsInterface
 {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
index dc2e5ed39b71c..16ebb71c7281a 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
@@ -14,7 +14,6 @@
  * Ensure that selector in one line, concatenation is not used
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#formatting-1
- *
  */
 class TypeSelectorConcatenationSniff implements Sniff
 {
@@ -34,7 +33,7 @@ class TypeSelectorConcatenationSniff implements Sniff
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -42,7 +41,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
index 288a9a8b5f346..3cd0f5d1679be 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
@@ -19,7 +19,6 @@
  * - Write selector in one line, do not use concatenation
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selectors-naming
- *
  */
 class TypeSelectorsSniff implements Sniff
 {
@@ -56,7 +55,7 @@ class TypeSelectorsSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -64,7 +63,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
index 060deb998aabb..433c256c5bdad 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
@@ -18,7 +18,6 @@
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#local-variables
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#naming
- *
  */
 class VariablesSniff implements Sniff
 {
@@ -30,7 +29,7 @@ class VariablesSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -38,7 +37,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
index dc334d718e697..a19a0a8eb7016 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
@@ -16,7 +16,6 @@
  *
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#and-units
  * @link https://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#floating-values
- *
  */
 class ZeroUnitsSniff implements Sniff
 {
@@ -43,7 +42,7 @@ class ZeroUnitsSniff implements Sniff
     public $supportedTokenizers = [TokenizerSymbolsInterface::TOKENIZER_CSS];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -51,7 +50,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
index 1618beb665d4b..6a7a0d2b1432c 100644
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
@@ -8,12 +8,15 @@
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
+/**
+ * Validates that interface name ends with "Interface" suffix.
+ */
 class InterfaceNameSniff implements Sniff
 {
     const INTERFACE_SUFFIX = 'Interface';
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -21,7 +24,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $sourceFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
index e3cfdf532438c..b81c250338e1d 100644
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
@@ -8,6 +8,9 @@
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
 
+/**
+ * Validates that class name is not reserved word.
+ */
 class ReservedWordsSniff implements Sniff
 {
     /**
@@ -35,7 +38,7 @@ class ReservedWordsSniff implements Sniff
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -94,7 +97,7 @@ protected function validateClass(File $sourceFile, $stackPtr)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $sourceFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php b/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php
index 0482f574f28ce..54cf1d462c300 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Security/ExecutableRegExSniff.php
@@ -52,7 +52,7 @@ class ExecutableRegExSniff implements Sniff
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -60,7 +60,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php b/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php
index d98a55a6f3ee8..aea1ddc1efa91 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Strings/StringPositionSniff.php
@@ -106,7 +106,7 @@ class StringPositionSniff implements Sniff
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -114,7 +114,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
index b1e358e404829..50fddb240b30b 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Translation;
 
-use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
 
 /**
  * Make sure that constants are not used as the first argument of translation function.
@@ -21,7 +21,7 @@ class ConstantUsageSniff implements Sniff
     protected $previousLineContent = '';
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -31,7 +31,11 @@ public function register()
     /**
      * Copied from \Generic_Sniffs_Files_LineLengthSniff, minor changes made
      *
-     * {@inheritDoc}
+     * {@inheritdoc}
+     *
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile
+     * @param int $stackPtr
+     * @return void|int
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php b/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
index de3cfc50bbb56..8e34727533bdd 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
@@ -14,7 +14,7 @@
 class EmptyLineMissedSniff implements Sniff
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -22,7 +22,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
@@ -37,6 +37,8 @@ public function process(File $phpcsFile, $stackPtr)
     }
 
     /**
+     * Execute empty line missed check.
+     *
      * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
diff --git a/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
index f276426efad6f..c862b019ae10d 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
@@ -14,7 +14,7 @@
 class MultipleEmptyLinesSniff implements Sniff
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function register()
     {
@@ -22,7 +22,7 @@ public function register()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/setup/src/Magento/Setup/Controller/LandingInstaller.php b/setup/src/Magento/Setup/Controller/LandingInstaller.php
index 51d3fd648af4b..49125c47fad9d 100644
--- a/setup/src/Magento/Setup/Controller/LandingInstaller.php
+++ b/setup/src/Magento/Setup/Controller/LandingInstaller.php
@@ -27,6 +27,8 @@ public function __construct(\Magento\Framework\App\ProductMetadata $productMetad
     }
 
     /**
+     * Setup index action.
+     *
      * @return array|ViewModel
      */
     public function indexAction()
diff --git a/setup/src/Magento/Setup/Controller/LandingUpdater.php b/setup/src/Magento/Setup/Controller/LandingUpdater.php
index fca323fefe663..6ae97eec42d23 100644
--- a/setup/src/Magento/Setup/Controller/LandingUpdater.php
+++ b/setup/src/Magento/Setup/Controller/LandingUpdater.php
@@ -27,6 +27,8 @@ public function __construct(\Magento\Framework\App\ProductMetadata $productMetad
     }
 
     /**
+     * Updater index action.
+     *
      * @return array|ViewModel
      */
     public function indexAction()
@@ -35,7 +37,7 @@ public function indexAction()
             . "Click 'Agree and Update Magento' or read ";
         $docRef = "https://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html";
         $agreeButtonText = "Agree and Update Magento";
-        $view = new ViewModel;
+        $view = new ViewModel();
         $view->setTerminal(true);
         $view->setTemplate('/magento/setup/landing.phtml');
         $view->setVariable('version', $this->productMetadata->getVersion());
diff --git a/setup/src/Magento/Setup/Model/SystemPackage.php b/setup/src/Magento/Setup/Model/SystemPackage.php
index ab59fdc849dd7..bc5f55c0b128b 100755
--- a/setup/src/Magento/Setup/Model/SystemPackage.php
+++ b/setup/src/Magento/Setup/Model/SystemPackage.php
@@ -154,6 +154,8 @@ public function getSystemPackageVersions($systemPackageInfo)
     }
 
     /**
+     * Get installed system packages.
+     *
      * @return array
      * @throws \Exception
      * @throws \RuntimeException
@@ -187,6 +189,8 @@ public function getInstalledSystemPackages()
     }
 
     /**
+     * Sort versions.
+     *
      * @param array $enterpriseVersions
      * @return array
      */
@@ -241,6 +245,8 @@ private function formatPackages($packages)
     }
 
     /**
+     * Filter enterprise versions.
+     *
      * @param string $currentCE
      * @param array $enterpriseVersions
      * @param string $maxVersion

From b40ca8a889db99d8a8adbdb564097c4adc673194 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 18 Dec 2018 15:54:28 +0300
Subject: [PATCH 392/932] MAGETWO-60910: Session initialized during reindex
 from CLI and result fatal error

- Don't start session if cli used.
---
 .../integration/etc/di/preferences/ce.php     |   1 +
 .../Session/SessionStartChecker.php           |  25 +++++
 .../Framework/Session/SessionManager.php      | 101 ++++++++++--------
 .../Framework/Session/SessionStartChecker.php |  38 +++++++
 4 files changed, 122 insertions(+), 43 deletions(-)
 create mode 100644 dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.php
 create mode 100644 lib/internal/Magento/Framework/Session/SessionStartChecker.php

diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index b871fe1905910..f14fad963c625 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -27,4 +27,5 @@
     \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class,
     \Magento\Framework\App\ResourceConnection\ConfigInterface::class =>
         \Magento\Framework\App\ResourceConnection\Config::class,
+    \Magento\Framework\Session\SessionStartChecker::class => \Magento\TestFramework\Session\SessionStartChecker::class
 ];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.php b/dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.php
new file mode 100644
index 0000000000000..136b0565a729a
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Session/SessionStartChecker.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Session;
+
+/**
+ * Class to check if session can be started or not. Dummy for integration tests.
+ */
+class SessionStartChecker extends \Magento\Framework\Session\SessionStartChecker
+{
+    /**
+     * Can session be started or not.
+     *
+     * @return bool
+     */
+    public function check() : bool
+    {
+        return true;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index b53c83acb48cf..6000a16db7be7 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -36,7 +36,7 @@ class SessionManager implements SessionManagerInterface
     /**
      * Validator
      *
-     * @var \Magento\Framework\Session\ValidatorInterface
+     * @var ValidatorInterface
      */
     protected $validator;
 
@@ -50,28 +50,28 @@ class SessionManager implements SessionManagerInterface
     /**
      * SID resolver
      *
-     * @var \Magento\Framework\Session\SidResolverInterface
+     * @var SidResolverInterface
      */
     protected $sidResolver;
 
     /**
      * Session config
      *
-     * @var \Magento\Framework\Session\Config\ConfigInterface
+     * @var Config\ConfigInterface
      */
     protected $sessionConfig;
 
     /**
      * Save handler
      *
-     * @var \Magento\Framework\Session\SaveHandlerInterface
+     * @var SaveHandlerInterface
      */
     protected $saveHandler;
 
     /**
      * Storage
      *
-     * @var \Magento\Framework\Session\StorageInterface
+     * @var StorageInterface
      */
     protected $storage;
 
@@ -92,6 +92,11 @@ class SessionManager implements SessionManagerInterface
      */
     private $appState;
 
+    /**
+     * @var SessionStartChecker
+     */
+    private $sessionStartChecker;
+
     /**
      * @param \Magento\Framework\App\Request\Http $request
      * @param SidResolverInterface $sidResolver
@@ -102,7 +107,10 @@ class SessionManager implements SessionManagerInterface
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param \Magento\Framework\App\State $appState
+     * @param SessionStartChecker|null $sessionStartChecker
      * @throws \Magento\Framework\Exception\SessionException
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
@@ -113,7 +121,8 @@ public function __construct(
         StorageInterface $storage,
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
-        \Magento\Framework\App\State $appState
+        \Magento\Framework\App\State $appState,
+        SessionStartChecker $sessionStartChecker = null
     ) {
         $this->request = $request;
         $this->sidResolver = $sidResolver;
@@ -124,11 +133,15 @@ public function __construct(
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
         $this->appState = $appState;
+        $this->sessionStartChecker = $sessionStartChecker ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            SessionStartChecker::class
+        );
         $this->start();
     }
 
     /**
-     * This method needs to support sessions with APC enabled
+     * This method needs to support sessions with APC enabled.
+     *
      * @return void
      */
     public function writeClose()
@@ -163,47 +176,49 @@ public function __call($method, $args)
      */
     public function start()
     {
-        if (!$this->isSessionExists()) {
-            \Magento\Framework\Profiler::start('session_start');
-
-            try {
-                $this->appState->getAreaCode();
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                throw new \Magento\Framework\Exception\SessionException(
-                    new \Magento\Framework\Phrase(
-                        'Area code not set: Area code must be set before starting a session.'
-                    ),
-                    $e
-                );
-            }
+        if ($this->sessionStartChecker->check()) {
+            if (!$this->isSessionExists()) {
+                \Magento\Framework\Profiler::start('session_start');
+
+                try {
+                    $this->appState->getAreaCode();
+                } catch (\Magento\Framework\Exception\LocalizedException $e) {
+                    throw new \Magento\Framework\Exception\SessionException(
+                        new \Magento\Framework\Phrase(
+                            'Area code not set: Area code must be set before starting a session.'
+                        ),
+                        $e
+                    );
+                }
 
-            // Need to apply the config options so they can be ready by session_start
-            $this->initIniOptions();
-            $this->registerSaveHandler();
-            if (isset($_SESSION['new_session_id'])) {
-                // Not fully expired yet. Could be lost cookie by unstable network.
-                session_commit();
-                session_id($_SESSION['new_session_id']);
-            }
-            $sid = $this->sidResolver->getSid($this);
-            // potential custom logic for session id (ex. switching between hosts)
-            $this->setSessionId($sid);
-            session_start();
-            if (isset($_SESSION['destroyed'])
-                && $_SESSION['destroyed'] < time() - $this->sessionConfig->getCookieLifetime()
-            ) {
-                $this->destroy(['clear_storage' => true]);
-            }
+                // Need to apply the config options so they can be ready by session_start
+                $this->initIniOptions();
+                $this->registerSaveHandler();
+                if (isset($_SESSION['new_session_id'])) {
+                    // Not fully expired yet. Could be lost cookie by unstable network.
+                    session_commit();
+                    session_id($_SESSION['new_session_id']);
+                }
+                $sid = $this->sidResolver->getSid($this);
+                // potential custom logic for session id (ex. switching between hosts)
+                $this->setSessionId($sid);
+                session_start();
+                if (isset($_SESSION['destroyed'])
+                    && $_SESSION['destroyed'] < time() - $this->sessionConfig->getCookieLifetime()
+                ) {
+                    $this->destroy(['clear_storage' => true]);
+                }
 
-            $this->validator->validate($this);
-            $this->renewCookie($sid);
+                $this->validator->validate($this);
+                $this->renewCookie($sid);
 
-            register_shutdown_function([$this, 'writeClose']);
+                register_shutdown_function([$this, 'writeClose']);
 
-            $this->_addHost();
-            \Magento\Framework\Profiler::stop('session_start');
+                $this->_addHost();
+                \Magento\Framework\Profiler::stop('session_start');
+            }
+            $this->storage->init(isset($_SESSION) ? $_SESSION : []);
         }
-        $this->storage->init(isset($_SESSION) ? $_SESSION : []);
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Session/SessionStartChecker.php b/lib/internal/Magento/Framework/Session/SessionStartChecker.php
new file mode 100644
index 0000000000000..9cc32268d574a
--- /dev/null
+++ b/lib/internal/Magento/Framework/Session/SessionStartChecker.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Session;
+
+/**
+ * Class to check if session can be started or not.
+ */
+class SessionStartChecker
+{
+    /**
+     * @var bool
+     */
+    private $checkSapi;
+
+    /**
+     * @param bool $checkSapi
+     */
+    public function __construct(bool $checkSapi = true)
+    {
+        $this->checkSapi = $checkSapi;
+    }
+
+    /**
+     * Can session be started or not.
+     *
+     * @return bool
+     */
+    public function check() : bool
+    {
+        return !($this->checkSapi && PHP_SAPI === 'cli');
+    }
+}

From d9620c6418f3bdf832fd6cf1841fc5a62d05aa77 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Thu, 27 Dec 2018 13:40:39 +0530
Subject: [PATCH 393/932] Issue fixed #19985 Send email confirmation popup
 close button area overlapping to content

Issue fixed #19985 Send email confirmation popup close button area overlapping to content
---
 .../backend/web/css/source/components/_modals_extend.less   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
index 95d7f8f65fdc1..863777f18c73c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -146,13 +146,13 @@
     }
 
     .action-close {
-        padding: @modal-popup__padding;
+        padding: 1rem;
 
         &:active,
         &:focus {
             background: transparent;
-            padding-right: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
-            padding-top: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
+            padding-right: 1rem;
+            padding-top: 1rem;
         }
     }
 }

From 34cb323ca88e4ee8b8b1b228c51a9a9560e8d667 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Thu, 27 Dec 2018 12:09:08 +0200
Subject: [PATCH 394/932] MAGETWO-97350: [FT] [MFTF]
 StorefrontGuestCheckoutDisabledProductTest fails because of bad design

---
 .../Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index 8d16d35ab0dde..817da18f5f2b7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -243,6 +243,7 @@
         <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
         <click selector="{{AdminProductGridSection.bulkActionOption('Change status')}}" stepKey="clickChangeStatusAction"/>
         <click selector="{{AdminProductGridSection.changeStatus('status')}}" stepKey="clickChangeStatusDisabled" parameterized="true"/>
+        <waitForPageLoad stepKey="waitForStatusToBeChanged"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) have been updated." stepKey="seeSuccessMessage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForMaskToDisappear"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>

From 5532227d7418d2536c55da8b84fff16c5730af1c Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Thu, 27 Dec 2018 13:01:34 +0200
Subject: [PATCH 395/932] MAGETWO-97315: [B2B] Configurable Product Price is
 absent on Storefront

---
 .../Pricing/Renderer/SalableResolver.php      | 21 ++---
 .../Pricing/Renderer/SalableResolverTest.php  | 82 +++++++++++++++++++
 2 files changed, 91 insertions(+), 12 deletions(-)
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php

diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php b/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
index df8782ae422b4..c828c0929b40c 100644
--- a/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer;
 
-use Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProviderInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as TypeConfigurable;
 
 /**
  * A plugin for a salable resolver.
@@ -13,17 +13,16 @@
 class SalableResolver
 {
     /**
-     * @var LowestPriceOptionsProviderInterface
+     * @var TypeConfigurable
      */
-    private $lowestPriceOptionsProvider;
+    private $typeConfigurable;
 
     /**
-     * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
+     * @param TypeConfigurable $typeConfigurable
      */
-    public function __construct(
-        LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
-    ) {
-        $this->lowestPriceOptionsProvider = $lowestPriceOptionsProvider;
+    public function __construct(TypeConfigurable $typeConfigurable)
+    {
+        $this->typeConfigurable = $typeConfigurable;
     }
 
     /**
@@ -32,9 +31,7 @@ public function __construct(
      * @param \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver $subject
      * @param bool $result
      * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
-     *
      * @return bool
-     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterIsSalable(
@@ -42,8 +39,8 @@ public function afterIsSalable(
         $result,
         \Magento\Framework\Pricing\SaleableInterface $salableItem
     ) {
-        if ($salableItem->getTypeId() == 'configurable' && $result) {
-            $result = $salableItem->isSalable();
+        if ($salableItem->getTypeId() === TypeConfigurable::TYPE_CODE && $result) {
+            $result = $this->typeConfigurable->isSalable($salableItem);
         }
 
         return $result;
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php
new file mode 100644
index 0000000000000..7ec2ce370ac5d
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolverTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Test\Unit\Plugin\Catalog\Model\Product\Pricing\Renderer;
+
+use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as TypeConfigurable;
+use Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer\SalableResolver as SalableResolverPlugin;
+use Magento\Framework\Pricing\SaleableInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class SalableResolverTest extends TestCase
+{
+    /**
+     * @var TypeConfigurable|MockObject
+     */
+    private $typeConfigurable;
+
+    /**
+     * @var SalableResolverPlugin
+     */
+    private $salableResolver;
+
+    protected function setUp()
+    {
+        $this->typeConfigurable = $this->createMock(TypeConfigurable::class);
+        $this->salableResolver = new SalableResolverPlugin($this->typeConfigurable);
+    }
+
+    /**
+     * @param SaleableInterface|MockObject $salableItem
+     * @param bool $isSalable
+     * @param bool $typeIsSalable
+     * @param bool $expectedResult
+     * @return void
+     * @dataProvider afterIsSalableDataProvider
+     */
+    public function testAfterIsSalable($salableItem, bool $isSalable, bool $typeIsSalable, bool $expectedResult): void
+    {
+        $salableResolver = $this->createMock(SalableResolver::class);
+
+        $this->typeConfigurable->method('isSalable')
+            ->willReturn($typeIsSalable);
+
+        $result = $this->salableResolver->afterIsSalable($salableResolver, $isSalable, $salableItem);
+        $this->assertEquals($expectedResult, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function afterIsSalableDataProvider(): array
+    {
+        $simpleSalableItem = $this->createMock(SaleableInterface::class);
+        $simpleSalableItem->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn('simple');
+
+        $configurableSalableItem = $this->createMock(SaleableInterface::class);
+        $configurableSalableItem->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn('configurable');
+
+        return [
+            [
+                $simpleSalableItem,
+                true,
+                false,
+                true,
+            ],
+            [
+                $configurableSalableItem,
+                true,
+                false,
+                false,
+            ],
+        ];
+    }
+}

From 4ed79dc73482011e1a9023c9e33a7866b56a05c9 Mon Sep 17 00:00:00 2001
From: kunj1988 <joshi_kunj@yahoo.com>
Date: Thu, 27 Dec 2018 18:34:40 +0530
Subject: [PATCH 396/932] #19974 Resolved varibale in doc type

---
 .../Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
index 4d2878b0b1e84..6fcce20eb3152 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
@@ -29,7 +29,7 @@ class DataBuilder
      * Add Item Data
      *
      * @param string $label
-     * @param string $label
+     * @param string $value
      * @param int $count
      * @return void
      */

From 84ebb0f368d902332162f31ac1459a083be30d72 Mon Sep 17 00:00:00 2001
From: Iurii Ivashchenko <iivashchenko@magento.com>
Date: Thu, 27 Dec 2018 15:35:33 +0200
Subject: [PATCH 397/932] MAGETWO-95935: Allow Validation of customer address
 attributes to include spaces

---
 .../Test/Unit/Model/Metadata/Form/AbstractDataTest.php      | 6 ++----
 .../Model/Entity/Attribute/Frontend/DefaultFrontendTest.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
index 9033b3b815478..5b4b50ca82117 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/AbstractDataTest.php
@@ -226,12 +226,10 @@ public function testValidateInputRule($value, $label, $inputValidation, $expecte
         $validationRule->method('getValue')
             ->willReturn($inputValidation);
 
-        $this->_attributeMock
-            ->method('getStoreLabel')
+        $this->_attributeMock->method('getStoreLabel')
             ->willReturn($label);
 
-        $this->_attributeMock
-            ->method('getValidationRules')
+        $this->_attributeMock->method('getValidationRules')
             ->willReturn([$validationRule]);
 
         $this->assertEquals($expectedOutput, $this->_model->validateInputRule($value));
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
index add200c1c0759..fd4f7472b2fa4 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
@@ -15,7 +15,7 @@
 use Magento\Framework\App\CacheInterface;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
 {

From 1f3c5dc1d4b5eb6e56d40b55f5313d2efc8b721e Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Thu, 27 Dec 2018 15:38:26 +0200
Subject: [PATCH 398/932] MAGETWO-96908: [2.3] Wrong attribute value in flat
 table

---
 .../Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index a3322b3231755..2252b3e3d5506 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -349,6 +349,7 @@ protected function _updateTemporaryTableByStoreValues(
                 //Update not simple attributes (eg. dropdown)
                 $columnName = $attributeCode . $valueFieldSuffix;
                 if (isset($flatColumns[$columnName])) {
+                    $columnValue = $this->_connection->getIfNullSql('ts.value', 't0.value');
                     $select = $this->_connection->select();
                     $select->joinLeft(
                         ['t0' => $this->_productIndexerHelper->getTable('eav_attribute_option_value')],
@@ -359,8 +360,8 @@ protected function _updateTemporaryTableByStoreValues(
                         'ts.option_id = et.' . $attributeCode . ' AND ts.store_id = ' . $storeId,
                         []
                     )->columns(
-                        [$columnName => $this->_connection->getIfNullSql('ts.value', 't0.value')]
-                    )->where($columnName . ' IS NOT NULL');
+                        [$columnName => $columnValue]
+                    )->where($columnValue . ' IS NOT NULL');
                     if (!empty($changedIds)) {
                         $select->where($this->_connection->quoteInto('et.entity_id IN (?)', $changedIds));
                     }

From 7329633242e8ffc523f36a5721a01c4486d42069 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Thu, 27 Dec 2018 17:45:01 +0400
Subject: [PATCH 399/932] MAGETWO-96411: [2.3.x] Default addresses not selected
 when checking out from cart

- Add automated test
---
 ...DifferentBillingAndShippingAddressTest.xml | 124 ------------------
 1 file changed, 124 deletions(-)
 delete mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminDifferentBillingAndShippingAddressTest.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminDifferentBillingAndShippingAddressTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminDifferentBillingAndShippingAddressTest.xml
deleted file mode 100644
index 37ab0302e6fd2..0000000000000
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminDifferentBillingAndShippingAddressTest.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * 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="AdminDifferentBillingAndShippingAddressTest">
-        <annotations>
-            <features value="Sales"/>
-            <title value="Check that Billing and Shipping addresses pre-selected for customer with existing order in the cart"/>
-            <description value="Check Billing Address and Shipping Address"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-96725"/>
-            <useCaseId value="MAGETWO-96411"/>
-            <group value="sales"/>
-        </annotations>
-        <before>
-            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-            <createData entity="SimpleProduct" stepKey="createProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-        </before>
-        <after>
-            <!--Clear customer page filter-->
-            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-            <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
-            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearGridFilter"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-
-        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openCustomerEditPage">
-            <argument name="customer" value="$$createCustomer$$" />
-        </actionGroup>
-        <click stepKey="goToAddresses" selector="{{NewCustomerPageSection.addresses}}"/>
-        <waitForAjaxLoad stepKey="waitForAddresses" time="5"/>
-        <!--Uncheck Default Shipping Address checkbox-->
-        <click stepKey="thickShippingAddress" selector="{{NewCustomerPageSection.defaultShippingAddress}}"/>
-        <waitForElementVisible selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="waitForElement"/>
-        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="clickSave"/>
-        <conditionalClick selector="{{AdminCustomerMainActionsSection.saveButton}}"
-                          dependentSelector="{{AdminCustomerMainActionsSection.saveButton}}" visible="true" stepKey="clickSave2"/>
-        <waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
-
-        <!--Create new order with existing customer-->
-        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="goToCreateOrderPage">
-            <argument name="customer" value="$$createCustomer$$"/>
-        </actionGroup>
-        <!--Add product to order-->
-        <actionGroup ref="addSimpleProductToOrder" stepKey="addProductToOrder">
-            <argument name="product" value="$$createProduct$$"/>
-        </actionGroup>
-
-        <!--Uncheck Same As Billing Address Checkbox-->
-        <click selector="{{AdminOrderFormShippingAddressSection.SameAsBilling}}" stepKey="uncheckSameAsBillingAddressCheckbox"/>
-        <waitForAjaxLoad stepKey="waitForAjax" after="uncheckSameAsBillingAddressCheckbox"/>
-        <selectOption selector="{{AdminOrderFormShippingAddressSection.SelectFromExistingCustomerAddress}}"
-                      stepKey="selectAddNewCustomer" userInput="Add New Address" after="waitForAjax"/>
-        <waitForAjaxLoad stepKey="waitForAjaxLoad" after="selectAddNewCustomer"/>
-
-        <!--Fill customer Shipping address information-->
-        <fillField selector="{{AdminOrderFormShippingAddressSection.FirstName}}" userInput="{{UK_Not_Default_Address.firstname}}" stepKey="fillFirstName"/>
-        <fillField selector="{{AdminOrderFormShippingAddressSection.LastName}}" userInput="{{UK_Not_Default_Address.lastname}}" stepKey="fillLastName" after="fillFirstName"/>
-        <fillField selector="{{AdminOrderFormShippingAddressSection.StreetLine1}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="fillStreetLine1" after="fillLastName"/>
-        <fillField selector="{{AdminOrderFormShippingAddressSection.City}}" userInput="{{UK_Not_Default_Address.city}}" stepKey="fillCity" after="fillStreetLine1"/>
-        <selectOption selector="{{AdminOrderFormShippingAddressSection.Country}}" userInput="United Kingdom" stepKey="fillCountry" after="fillCity"/>
-        <fillField selector="{{AdminOrderFormShippingAddressSection.Province}}" userInput="London" stepKey="fillProvince" after="fillCountry"/>
-        <fillField selector="{{AdminOrderFormShippingAddressSection.PostalCode}}" userInput="{{UK_Not_Default_Address.postcode}}" stepKey="fillPostalCode" after="fillProvince"/>
-        <fillField selector="{{AdminOrderFormShippingAddressSection.Phone}}" userInput="{{UK_Not_Default_Address.telephone}}" stepKey="fillPhoneNumber" after="fillPostalCode"/>
-
-        <click stepKey="checkSaveBillingAddressCheckbox" selector="{{AdminOrderFormBillingAddressSection.SaveAddress}}" after="fillPhoneNumber"/>
-        <click stepKey="checkSaveShippingAddressCheckbox" selector="{{AdminOrderFormShippingAddressSection.SaveAddress}}" after="checkSaveBillingAddressCheckbox"/>
-
-        <!-- Select shipping -->
-        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="checkSaveShippingAddressCheckbox"/>
-
-        <!--Submit Order and verify that Order created successfully-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-        <waitForPageLoad stepKey="waitForOrderToProcess"/>
-        <seeElement selector="{{AdminMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
-
-        <!--Open customer for edit-->
-        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openCustomerEdit">
-            <argument name="customer" value="$$createCustomer$$" />
-        </actionGroup>
-
-        <!--Click on *Manage Shopping Cart*-->
-        <click selector="{{AdminCustomerMainActionsSection.manageShoppingCart}}" stepKey="clickManageShoppingCartButton"/>
-        <waitForPageLoad stepKey="waitForPageLoaded"/>
-
-        <!--Add Product To Shopping Cart-->
-        <actionGroup ref="AdminAddProductToShoppingCartActionGroup" stepKey="addProductToShoppingCart">
-            <argument name="productName" value="$$createProduct.name$$" />
-        </actionGroup>
-
-        <!--Click on *Create Order*-->
-        <waitForElementVisible selector="{{AdminCustomerShoppingCartSection.createOrderButton}}" stepKey="waitToShoppingCartPageOpened"/>
-        <click selector="{{AdminCustomerShoppingCartSection.createOrderButton}}" stepKey="clickCreateOrderButton"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-
-        <!--Check Billing Address and Shipping Address should be pre-selected/fill out-->
-        <waitForElementVisible stepKey="waitElementsBecomeVisible" selector="{{AdminOrderFormShippingAddressSection.FirstName}}"/>
-        <scrollTo selector="{{AdminOrderFormShippingAddressSection.FirstName}}" stepKey="scrollToMiddleOfPage"/>
-        <grabValueFrom selector="{{AdminOrderFormShippingAddressSection.FirstName}}" stepKey="grabTextShippingFirstNameValue"/>
-        <grabValueFrom selector="{{AdminOrderFormShippingAddressSection.LastName}}" stepKey="grabTextShippingLastNameValue"/>
-        <grabValueFrom selector="{{AdminOrderFormShippingAddressSection.StreetLine1}}" stepKey="grabShippingStreetLineValue"/>
-        <grabValueFrom selector="{{AdminOrderFormShippingAddressSection.City}}" stepKey="grabShippingCityValue"/>
-        <grabValueFrom selector="{{AdminOrderFormBillingAddressSection.Country}}" stepKey="grabBillingCountryValue"/>
-
-        <assertNotEmpty actual="$grabTextShippingFirstNameValue" stepKey="assertTextShippingFirstNameIsNotEmpty" after="grabTextShippingFirstNameValue"/>
-        <assertNotEmpty actual="$grabTextShippingLastNameValue" stepKey="assertTextShippingLastNameIsNotEmpty" after="grabTextShippingLastNameValue"/>
-        <assertNotEmpty actual="$grabShippingStreetLineValue" stepKey="assertShippingStreetLineIsNotEmpty" after="grabShippingStreetLineValue"/>
-        <assertNotEmpty actual="$grabShippingCityValue" stepKey="assertShippingCityIsNotEmpty" after="grabShippingCityValue"/>
-        <assertNotEmpty actual="$grabBillingCountryValue" stepKey="assertBillingCountryIsNotEmpty" after="grabBillingCountryValue"/>
-    </test>
-</tests>

From 8f4942aa1e400cc4047b7a0de5e806b6dd7ee366 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Thu, 27 Dec 2018 19:59:14 +0530
Subject: [PATCH 400/932] Issue fixed #19985 Send email confirmation popup
 close button area overlapping

Issue fixed #19985 Send email confirmation popup close button area overlapping
---
 .../backend/web/css/source/components/_modals_extend.less   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
index 863777f18c73c..efc747e4d714a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -146,13 +146,13 @@
     }
 
     .action-close {
-        padding: 1rem;
+        padding: @modal-popup__padding - 2;
 
         &:active,
         &:focus {
             background: transparent;
-            padding-right: 1rem;
-            padding-top: 1rem;
+            padding-right: @modal-popup__padding - 2;
+            padding-top: @modal-popup__padding - 2;
         }
     }
 }

From ff5d282a209b4b97dacd57f52a4777644ff8bc82 Mon Sep 17 00:00:00 2001
From: Andrii Meysar <andrii.meysar@transoftgroup.com>
Date: Thu, 27 Dec 2018 22:32:50 +0200
Subject: [PATCH 401/932] MAGETWO-97349: [FT] [MFTF]
 AdminFilteringCategoryProductsUsingScopeSelectorTest fails because of bad
 design

---
 .../ActionGroup/AdminProductActionGroup.xml   |  1 +
 ...CategoryProductsUsingScopeSelectorTest.xml | 70 ++++++-------------
 .../Store/Test/Mftf/Data/StoreData.xml        |  9 +++
 .../Store/Test/Mftf/Data/StoreGroupData.xml   | 16 +++++
 .../Mftf/Section/AdminMainActionsSection.xml  |  2 +-
 5 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 2b5fbfbe6a79b..ae222c8454303 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -70,6 +70,7 @@
 
     <!--Save product and see success message-->
     <actionGroup name="saveProductForm">
+        <scrollToTopOfPage stepKey="scrollToTop"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
index efceff6ffb177..e0e214342ad72 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
@@ -19,19 +19,19 @@
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <!--Create website, Sore adn Store View-->
-            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateWebsite">
-                <argument name="newWebsiteName" value="secondWebsite"/>
-                <argument name="websiteCode" value="second_website"/>
+            <!--Create website, Store and Store View-->
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite">
+                <argument name="newWebsiteName" value="{{secondCustomWebsite.name}}"/>
+                <argument name="websiteCode" value="{{secondCustomWebsite.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="adminCreateStore">
-                <argument name="website" value="secondWebsite"/>
-                <argument name="storeGroupName" value="secondStore"/>
-                <argument name="storeGroupCode" value="second_store"/>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStoreGroup">
+                <argument name="website" value="{{secondCustomWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+                <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="adminCreateStoreView">
-                <argument name="StoreGroup" value="customStoreTierPrice"/>
-                <argument name="customStore" value="customStoreView"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
+                <argument name="StoreGroup" value="SecondStoreGroupUnique"/>
+                <argument name="customStore" value="SecondStoreUnique"/>
             </actionGroup>
 
             <!--Create Simple Product and Category -->
@@ -60,9 +60,7 @@
             <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenWebsiteSection"/>
             <waitForPageLoad stepKey="waitForToOpenedWebsiteSection"/>
             <uncheckOption selector="{{ProductInWebsitesSection.website('Main Website')}}" stepKey="uncheckWebsite"/>
-            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-            <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."
-                 stepKey="seeSuccessMessage"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
 
             <!-- Set filter to product name and product2 in website 2 only -->
             <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct2">
@@ -72,12 +70,10 @@
                 <argument name="product" value="$$createProduct2$$"/>
             </actionGroup>
             <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites">
-                <argument name="website" value="secondWebsite"/>
+                <argument name="website" value="{{secondCustomWebsite.name}}"/>
             </actionGroup>
             <uncheckOption selector="{{ProductInWebsitesSection.website('Main Website')}}" stepKey="uncheckWebsite1"/>
-            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct1"/>
-            <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."
-                 stepKey="seeSuccessMessage1"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct2"/>
 
             <!-- Set filter to product name and product12 assigned to both websites 1 and 2 -->
             <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct12">
@@ -87,15 +83,13 @@
                 <argument name="product" value="$$createProduct12$$"/>
             </actionGroup>
             <actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites1">
-                <argument name="website" value="secondWebsite"/>
+                <argument name="website" value="{{secondCustomWebsite.name}}"/>
             </actionGroup>
-            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct2"/>
-            <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."
-                 stepKey="seeSuccessMessage2"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct3"/>
         </before>
         <after>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-                <argument name="websiteName" value="secondWebsite"/>
+                <argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
             </actionGroup>
             <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
             <deleteData createDataKey="createProduct0" stepKey="deleteProduct"/>
@@ -107,7 +101,6 @@
         </after>
         <!-- Step 1-2: Open Category page and Set scope selector to All Store Views-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
-        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
                stepKey="clickCategoryName"/>
         <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection"/>
@@ -126,17 +119,9 @@
 
         <!-- Step 3: Set scope selector to Website1( Storeview for the Website 1) -->
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
-        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}"
-               stepKey="clickStoresList"/>
-        <waitForPageLoad stepKey="waitForCategoryPageLoad1"/>
-        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption('Default Store View')}}"
-               stepKey="clickStoreView"/>
-        <waitForElementVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
-                               stepKey="waitForPopup1"/>
-        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}" stepKey="clickActionAccept"/>
-        <waitForElementNotVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
-                                  stepKey="waitForNotVisibleModalAccept"/>
-        <waitForPageLoad stepKey="waitForCategoryPageLoad2"/>
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="swichToDefaultStoreView">
+            <argument name="storeView" value="_defaultStore.name"/>
+        </actionGroup>
         <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
                       stepKey="grabTextFromCategory1"/>
         <assertRegExp expected="/\(2\)$/" expectedType="string" actual="$grabTextFromCategory1" actualType="variable"
@@ -154,18 +139,9 @@
 
         <!-- Step 4: Set scope selector to Website2 ( StoreView for Website 2) -->
         <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
-        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}"
-               stepKey="clickStoresList1"/>
-        <waitForPageLoad stepKey="waitForCategoryPageLoad3"/>
-        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewOption('secondStoreView')}}"
-               stepKey="clickStoreView1"/>
-        <waitForElementVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
-                               stepKey="waitForPopup2"/>
-        <click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
-               stepKey="clickActionAccept1"/>
-        <waitForElementNotVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
-                                  stepKey="waitForNotVisibleModalAccept1"/>
-        <waitForPageLoad stepKey="waitForCategoryPageLoad4"/>
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="swichToSecondStoreView">
+            <argument name="storeView" value="SecondStoreUnique.name"/>
+        </actionGroup>
         <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection2"/>
         <grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
                       stepKey="grabTextFromCategory2"/>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index 9fae618020ff3..78766005f7ad9 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -65,4 +65,13 @@
         <data key="name" unique="suffix">StoreView</data>
         <data key="code" unique="suffix">StoreViewCode</data>
     </entity>
+    <entity name="SecondStoreUnique" type="store">
+        <data key="name" unique="suffix">Second Store View </data>
+        <data key="code" unique="suffix">second_store_view_</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">SecondStoreGroup</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
index e575ca3317ab6..2127b5f3c8b21 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreGroupData.xml
@@ -21,6 +21,22 @@
         <data key="store_action">add</data>
         <data key="store_type">group</data>
     </entity>
+    <entity name="SecondStoreGroup" type="group">
+        <data key="group_id">null</data>
+        <data key="name">Second Store</data>
+        <data key="code">second_store</data>
+        <var key="root_category_id" entityKey="id" entityType="category"/>
+        <data key="store_action">add</data>
+        <data key="store_type">group</data>
+    </entity>
+    <entity name="SecondStoreGroupUnique" type="group">
+        <data key="group_id">null</data>
+        <data key="name" unique="suffix">Second Store </data>
+        <data key="code" unique="suffix">second_store_</data>
+        <var key="root_category_id" entityKey="id" entityType="category"/>
+        <data key="store_action">add</data>
+        <data key="store_type">group</data>
+    </entity>
     <entity name="staticStoreGroup" type="group">
         <data key="name">NewStore</data>
         <data key="code" unique="suffix">Base12</data>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
index fda182246db4a..0d469a8776422 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -11,6 +11,6 @@
     <section name="AdminMainActionsSection">
         <element name="storeSwitcher" type="text" selector=".store-switcher"/>
         <element name="storeViewDropdown" type="button" selector="#store-change-button"/>
-        <element name="storeViewByName" type="button" selector="//*[@class='store-switcher-store-view  ']/a[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
+        <element name="storeViewByName" type="button" selector="//*[contains(@class,'store-switcher-store-view')]/*[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
     </section>
 </sections>

From c608b021a28d6bd18c4d6b505f893abca5a20745 Mon Sep 17 00:00:00 2001
From: Oleksii Gorbulin <a.gorbulin@ism-ukraine.com>
Date: Thu, 27 Dec 2018 23:54:55 +0200
Subject: [PATCH 402/932] 
 19482-Increase-product-quantity-with-disabled-Manage-Stock-when-place-order-is-failed
 Magento2:#19482 Increase product quantity with disabled Manage Stock when
 place order is failed

---
 .../CatalogInventory/Model/StockManagement.php       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
index b3939f2e5149b..e2989e25fcac1 100644
--- a/app/code/Magento/CatalogInventory/Model/StockManagement.php
+++ b/app/code/Magento/CatalogInventory/Model/StockManagement.php
@@ -150,7 +150,17 @@ public function revertProductsSale($items, $websiteId = null)
         //if (!$websiteId) {
         $websiteId = $this->stockConfiguration->getDefaultScopeId();
         //}
-        $this->qtyCounter->correctItemsQty($items, $websiteId, '+');
+        $revertItems = [];
+        foreach ($items as $productId => $qty) {
+            $stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
+            $canSubtractQty = $stockItem->getItemId() && $this->canSubtractQty($stockItem);
+            if (!$canSubtractQty || !$this->stockConfiguration->isQty($stockItem->getTypeId())) {
+                continue;
+            }
+            $revertItems[$productId] = $qty;
+        }
+        $this->qtyCounter->correctItemsQty($revertItems, $websiteId, '+');
+
         return true;
     }
 

From 1a5a6be6d85599431ad55901417d44e75cf42907 Mon Sep 17 00:00:00 2001
From: Oleksii Gorbulin <a.gorbulin@ism-ukraine.com>
Date: Fri, 28 Dec 2018 00:43:40 +0200
Subject: [PATCH 403/932] 
 19482-Increase-product-quantity-with-disabled-Manage-Stock-when-place-order-is-failed
 Increase product quantity with disabled Manage Stock when place order is
 failed #19482

---
 .../Magento/CatalogInventory/Model/StockManagement.php     | 7 ++++---
 .../Observer/RevertQuoteInventoryObserver.php              | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
index e2989e25fcac1..28ec2977358b1 100644
--- a/app/code/Magento/CatalogInventory/Model/StockManagement.php
+++ b/app/code/Magento/CatalogInventory/Model/StockManagement.php
@@ -142,8 +142,9 @@ public function registerProductsSale($items, $websiteId = null)
 
     /**
      * @param string[] $items
-     * @param int $websiteId
-     * @return bool
+     * @param int|null $websiteId
+     *
+     * @return array|bool
      */
     public function revertProductsSale($items, $websiteId = null)
     {
@@ -161,7 +162,7 @@ public function revertProductsSale($items, $websiteId = null)
         }
         $this->qtyCounter->correctItemsQty($revertItems, $websiteId, '+');
 
-        return true;
+        return $revertItems;
     }
 
     /**
diff --git a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
index 93a50cc9a7a4d..ab21f32b3f62c 100644
--- a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
@@ -64,8 +64,8 @@ public function execute(EventObserver $observer)
     {
         $quote = $observer->getEvent()->getQuote();
         $items = $this->productQty->getProductQty($quote->getAllItems());
-        $this->stockManagement->revertProductsSale($items, $quote->getStore()->getWebsiteId());
-        $productIds = array_keys($items);
+        $revertedItems = $this->stockManagement->revertProductsSale($items, $quote->getStore()->getWebsiteId());
+        $productIds = array_keys($revertedItems);
         if (!empty($productIds)) {
             $this->stockIndexerProcessor->reindexList($productIds);
             $this->priceIndexer->reindexList($productIds);

From 4d51378ba64fdc8cc4f9d21b4f7bfde77c0faf14 Mon Sep 17 00:00:00 2001
From: Oksana_Kremen <Oksana_Kremen@epam.com>
Date: Fri, 28 Dec 2018 09:39:51 +0200
Subject: [PATCH 404/932] MAGETWO-91750: Multiselect attribute values is not
 searchable under Quick Search when more than one value is selected

- Integration test fix
---
 .../Indexer/Fulltext/Action/FullTest.php      | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
index 59ad91ae7b076..56c5db5572a31 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
@@ -14,6 +14,9 @@
 use Magento\Catalog\Model\Product;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * Class for testing fulltext index rebuild
+ */
 class FullTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -21,6 +24,9 @@ class FullTest extends \PHPUnit\Framework\TestCase
      */
     protected $actionFull;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->actionFull = Bootstrap::getObjectManager()->create(
@@ -29,6 +35,8 @@ protected function setUp()
     }
 
     /**
+     * Testing fulltext index rebuild
+     *
      * @magentoDataFixture Magento/CatalogSearch/_files/products_for_index.php
      * @magentoDataFixture Magento/CatalogSearch/_files/product_configurable_not_available.php
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
@@ -39,7 +47,6 @@ public function testGetIndexData()
         $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
         $allowedStatuses = Bootstrap::getObjectManager()->get(Status::class)->getVisibleStatusIds();
         $allowedVisibility = Bootstrap::getObjectManager()->get(Engine::class)->getAllowedVisibility();
-
         $result = iterator_to_array($this->actionFull->rebuildStoreIndex(Store::DISTRO_STORE_ID));
         $this->assertNotEmpty($result);
 
@@ -58,7 +65,10 @@ public function testGetIndexData()
     }
 
     /**
+     * Prepare and return expected index data
+     *
      * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function getExpectedIndexData()
     {
@@ -68,32 +78,48 @@ private function getExpectedIndexData()
         $nameId = $attributeRepository->get(ProductInterface::NAME)->getAttributeId();
         /** @see dev/tests/integration/testsuite/Magento/Framework/Search/_files/configurable_attribute.php */
         $configurableId = $attributeRepository->get('test_configurable')->getAttributeId();
+        $statusId = $attributeRepository->get(ProductInterface::STATUS)->getAttributeId();
+        $taxClassId = $attributeRepository
+            ->get(\Magento\Customer\Api\Data\GroupInterface::TAX_CLASS_ID)
+            ->getAttributeId();
         return [
             'configurable' => [
                 $skuId => 'configurable',
                 $configurableId => 'Option 1 | Option 2',
                 $nameId => 'Configurable Product | Configurable OptionOption 1 | Configurable OptionOption 2',
+                $taxClassId => 'Taxable Goods | Taxable Goods | Taxable Goods',
+                $statusId => 'Enabled | Enabled | Enabled'
             ],
             'index_enabled' => [
                 $skuId => 'index_enabled',
                 $nameId => 'index enabled',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled'
             ],
             'index_visible_search' => [
                 $skuId => 'index_visible_search',
                 $nameId => 'index visible search',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled'
             ],
             'index_visible_category' => [
                 $skuId => 'index_visible_category',
                 $nameId => 'index visible category',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled'
             ],
             'index_visible_both' => [
                 $skuId => 'index_visible_both',
                 $nameId => 'index visible both',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled'
             ]
         ];
     }
 
     /**
+     * Testing fulltext index rebuild with configurations
+     *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      */
     public function testRebuildStoreIndexConfigurable()
@@ -114,6 +140,8 @@ public function testRebuildStoreIndexConfigurable()
     }
 
     /**
+     * Get product Id by its SKU
+     *
      * @param string $sku
      * @return int
      */

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 405/932] 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 49b8e66d904c344cc6047c4189c6028cf3201d48 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 28 Dec 2018 10:43:02 +0200
Subject: [PATCH 406/932] ENGCOM-3596: Static test fix.

---
 .../luma/Magento_GiftMessage/web/css/source/_module.less        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
index 4b73b73405486..41e6da39e1ef1 100644
--- a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
@@ -60,8 +60,8 @@
     }
 
     .gift-summary {
-        position: relative;
         margin-top: @indent__s;
+        position: relative;
 
         .actions-toolbar {
             > .secondary {

From 18cc46d5f1770b5b84b341165bfd2bcde2ec9169 Mon Sep 17 00:00:00 2001
From: dimonovp <dimonovp@gmail.com>
Date: Fri, 28 Dec 2018 11:09:49 +0200
Subject: [PATCH 407/932] MAGETWO-96244: Verify that Gift Wrapping can be
 applied on Order Level and Ordered Items for Additional Website

---
 .../Mftf/Data/WebUrlOptionsConfigData.xml     | 24 +++++++++++++++++++
 .../Metadata/web_url_options_config-meta.xml  | 22 +++++++++++++++++
 .../AdminSwitchWebsiteActionGroup.xml         | 21 ++++++++++++++++
 .../Mftf/Section/AdminMainActionsSection.xml  |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml

diff --git a/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml
new file mode 100644
index 0000000000000..eda0eb904be86
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="DefaultWebUrlOptionsConfig" type="web_url_use_store">
+        <requiredEntity type="url_use_store_value">DefaultConfigWebUrlOptions</requiredEntity>
+    </entity>
+    <entity name="DefaultConfigWebUrlOptions" type="url_use_store_value">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="EnableWebUrlOptionsConfig" type="web_url_use_store">
+        <requiredEntity type="url_use_store_value">WebUrlOptionsYes</requiredEntity>
+    </entity>
+    <entity name="WebUrlOptionsYes" type="url_use_store_value">
+        <data key="value">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml
new file mode 100644
index 0000000000000..fc14ba7bbaba3
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="WebUrlOptionsConfig" dataType="web_url_use_store" type="create" auth="adminFormKey" url="/admin/system_config/save/section/web/"
+               method="POST" successRegex="/messages-message-success/" returnRegex="">
+        <object key="groups" dataType="web_url_use_store">
+            <object key="url" dataType="web_url_use_store">
+                 <object key="fields" dataType="web_url_use_store">
+                    <object key="use_store" dataType="url_use_store_value">
+                        <field key="value">string</field>
+                    </object>
+                 </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
new file mode 100644
index 0000000000000..cfb2c7e6347c3
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchWebsiteActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSwitchWebsiteActionGroup">
+        <arguments>
+            <argument name="website"/>
+        </arguments>
+        <click selector="{{AdminMainActionsSection.storeViewDropdown}}" stepKey="clickWebsiteSwitchDropdown"/>
+        <waitForElementVisible selector="{{AdminMainActionsSection.websiteByName('Main Website')}}" stepKey="waitForWebsiteAreVisible"/>
+        <click selector="{{AdminMainActionsSection.websiteByName(website.name)}}" stepKey="clickWebsiteByName"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitingForInformationModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmStoreSwitch"/>
+        <see userInput="{{website.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewWebsiteName"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
index fda182246db4a..1a95d88d454e4 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -12,5 +12,6 @@
         <element name="storeSwitcher" type="text" selector=".store-switcher"/>
         <element name="storeViewDropdown" type="button" selector="#store-change-button"/>
         <element name="storeViewByName" type="button" selector="//*[@class='store-switcher-store-view  ']/a[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
+        <element name="websiteByName" type="button" selector="//*[@class='store-switcher-website  ']/a[contains(text(), '{{websiteName}}')]" timeout="30" parameterized="true"/>
     </section>
 </sections>

From 4f03bfe8e245ec8210908366cc1fbd76276de7eb Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 28 Dec 2018 12:40:42 +0300
Subject: [PATCH 408/932] MAGETWO-95809: Item row total display incorrect value
 in API response

- Change response for including tax.
---
 .../Order/Item/Renderer/DefaultRenderer.php     | 17 +++++++++++++++++
 .../Model/Order/Webapi/ChangeOutputArray.php    | 13 ++++++++++++-
 .../Sales/Service/V1/OrderItemGetTest.php       |  2 ++
 .../Sales/_files/order_with_discount.php        |  4 +++-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
index 0946492711748..82974fdf6cc80 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -262,6 +262,23 @@ public function getTotalAmount($item)
         return $totalAmount;
     }
 
+    /**
+     * Return the base total amount minus discount.
+     *
+     * @param OrderItem|InvoiceItem|CreditmemoItem $item
+     * @return mixed
+     */
+    public function getBaseTotalAmount($item)
+    {
+        $baseTotalAmount = $item->getBaseRowTotal()
+            + $item->getBaseTaxAmount()
+            + $item->getBaseDiscountTaxCompensationAmount()
+            + $item->getBaseWeeeTaxAppliedAmount()
+            - $item->getBaseDiscountAmount();
+
+        return $baseTotalAmount;
+    }
+
     /**
      * Return HTML for item total after discount
      *
diff --git a/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php b/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php
index 57566bfd789e7..a1015c102b3af 100644
--- a/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php
+++ b/app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php
@@ -9,6 +9,7 @@
 
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn;
+use Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer;
 
 /**
  * Class for changing row total in response.
@@ -20,13 +21,21 @@ class ChangeOutputArray
      */
     private $priceRenderer;
 
+    /**
+     * @var DefaultRenderer
+     */
+    private $defaultRenderer;
+
     /**
      * @param DefaultColumn $priceRenderer
+     * @param DefaultRenderer $defaultRenderer
      */
     public function __construct(
-        DefaultColumn $priceRenderer
+        DefaultColumn $priceRenderer,
+        DefaultRenderer $defaultRenderer
     ) {
         $this->priceRenderer = $priceRenderer;
+        $this->defaultRenderer = $defaultRenderer;
     }
 
     /**
@@ -42,6 +51,8 @@ public function execute(
     ): array {
         $result[OrderItemInterface::ROW_TOTAL] = $this->priceRenderer->getTotalAmount($dataObject);
         $result[OrderItemInterface::BASE_ROW_TOTAL] = $this->priceRenderer->getBaseTotalAmount($dataObject);
+        $result[OrderItemInterface::ROW_TOTAL_INCL_TAX] = $this->defaultRenderer->getTotalAmount($dataObject);
+        $result[OrderItemInterface::BASE_ROW_TOTAL_INCL_TAX] = $this->defaultRenderer->getBaseTotalAmount($dataObject);
 
         return $result;
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
index 592bdf3d584a9..9ba648c73276b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderItemGetTest.php
@@ -106,5 +106,7 @@ public function testGetOrderWithDiscount()
         $this->assertTrue(is_array($response));
         $this->assertEquals(8.00, $response['row_total']);
         $this->assertEquals(8.00, $response['base_row_total']);
+        $this->assertEquals(9.00, $response['row_total_incl_tax']);
+        $this->assertEquals(9.00, $response['base_row_total_incl_tax']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
index a83b01589ea9c..29a7aa4d90334 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_discount.php
@@ -47,7 +47,9 @@
     ->setProductType('simple')
     ->setDiscountAmount(2)
     ->setBaseRowTotal($product->getPrice())
-    ->setBaseDiscountAmount(2);
+    ->setBaseDiscountAmount(2)
+    ->setTaxAmount(1)
+    ->setBaseTaxAmount(1);
 
 /** @var Order $order */
 $order = $objectManager->create(Order::class);

From 6b3195a9a66a2135b987d4f70cbcc72a9b02bf7a Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Fri, 28 Dec 2018 12:41:06 +0300
Subject: [PATCH 409/932] MAGETWO-97260: creating new shipment: gettting all
 trackers. after this commit 2307e16

- Fixed an issue with incrrect getting list of tracking numbers for shipment;
---
 app/code/Magento/Sales/Model/Order/Shipment.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index cecee4283648d..ef9c6fc628dd5 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -356,12 +356,11 @@ public function getTracksCollection()
         if ($this->tracksCollection === null) {
             $this->tracksCollection = $this->_trackCollectionFactory->create();
 
-            if ($this->getId()) {
-                $this->tracksCollection->setShipmentFilter($this->getId());
+            $id = $this->getId() ?: 0;
+            $this->tracksCollection->setShipmentFilter($id);
 
-                foreach ($this->tracksCollection as $item) {
-                    $item->setShipment($this);
-                }
+            foreach ($this->tracksCollection as $item) {
+                $item->setShipment($this);
             }
         }
 

From ac407dec09c2bf9fd4fe6e2ffd2d5875e0aac707 Mon Sep 17 00:00:00 2001
From: Vinoth Kumar <vinogcs@users.noreply.github.com>
Date: Fri, 28 Dec 2018 15:23:35 +0530
Subject: [PATCH 410/932] Updated to show error message to all Env.

---
 .../Framework/Serialize/Serializer/Json.php   | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index 7f1e69d3f2c4d..05d1f299ce761 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -23,11 +23,7 @@ public function serialize($data)
     {
         $result = json_encode($data);
         if (false === $result) {
-            $errorMessage = "Unable to serialize value.";
-            if(!$this->isOnProduction()){
-                $errorMessage .= "Error: " . json_last_error_msg();
-            }
-            throw new \InvalidArgumentException($errorMessage);
+            throw new \InvalidArgumentException("Unable to serialize value. Error: " . json_last_error_msg());
         }
         return $result;
     }
@@ -40,18 +36,8 @@ public function unserialize($string)
     {
         $result = json_decode($string, true);
         if (json_last_error() !== JSON_ERROR_NONE) {
-            $errorMessage = "Unable to unserialize value.";
-            if(!$this->isOnProduction()){
-                $errorMessage .= "Error: " . json_last_error_msg();
-            }
-            throw new \InvalidArgumentException($errorMessage);
+            throw new \InvalidArgumentException("Unable to unserialize value. Error: " . json_last_error_msg());
         }
         return $result;
-    }
-    
-    private function isOnProduction(){
-        $appState = \Magento\Framework\App\ObjectManager::getInstance()
-            ->get('Magento\Framework\App\State');
-        return $appState === \Magento\Framework\App\State::MODE_PRODUCTION;
-    }
+    }    
 }

From a6c4b6c64d3b8f8223bb8dafaba0c164076c1bd8 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 28 Dec 2018 13:01:46 +0200
Subject: [PATCH 411/932] MAGETWO-97359: [FT] [MFTF] test fix

---
 .../Backend/Test/Mftf/Section/AdminMainActionsSection.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
index bc576559e7a13..8c6a6f4be4750 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminMainActionsSection">
         <element name="save" type="button" selector="#save" timeout="30"/>
         <element name="delete" type="button" selector="#delete" timeout="30"/>
+        <element name="add" type="button" selector="#add" timeout="30"/>
     </section>
 </sections>

From 3314f44b8ea6f4a48ed3f2bcbe36a11cf27b2b3b Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 28 Dec 2018 14:35:15 +0300
Subject: [PATCH 412/932] MAGETWO-71344: Update product from mini shopping cart
 doesn't reflect in the shopping cart

- Stabilize static tests.
---
 app/code/Magento/Checkout/view/frontend/web/js/sidebar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index d4ad69f586021..e66c66006246c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -228,6 +228,7 @@ define([
 
             if (!_.isUndefined(productData)) {
                 $(document).trigger('ajax:updateCartItemQty');
+
                 if (window.location.href === this.shoppingCartUrl) {
                     window.location.reload(false);
                 }

From 57a1fe9e8d7bf27ccce534151431754ca9a80a92 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 28 Dec 2018 14:58:32 +0300
Subject: [PATCH 413/932] MAGETWO-96424: Requesition list qty of configurable
 product variation not updated individually

- Update automated test script
---
 .../Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
index 6a46f93b9a4c9..d2abfc7977519 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -131,7 +131,7 @@
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
     </actionGroup>
 
-    <actionGroup name="createConfigurationsForTwoAttribute" extends="createConfigurationsForAttribute">
+    <actionGroup name="createConfigurationsForTwoAttribute" extends="generateConfigurationsByAttributeCode">
         <arguments>
             <argument name="secondAttributeCode" type="string"/>
         </arguments>
@@ -147,5 +147,7 @@
         <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(secondAttributeCode)}}" stepKey="grabSecondAttributeDefaultLabel" after="grabFirstAttributeDefaultLabel"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFistAttribute" after="clickOnNextButton1"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="clickOnSelectAllForFistAttribute"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
     </actionGroup>
 </actionGroups>

From 7f950d2f089306f3ac536796a9a940e402c959e5 Mon Sep 17 00:00:00 2001
From: ajeetsinghcedcoss <36220521+ajeetsinghcedcoss@users.noreply.github.com>
Date: Fri, 28 Dec 2018 18:18:28 +0530
Subject: [PATCH 414/932] Update AbstractFilter.php

---
 app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
index d21a8666ec0ac..f2e2e67f944e9 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
@@ -139,7 +139,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
     }
 
     /**
-     * Get fiter items count
+     * Get filter items count
      *
      * @return int
      */

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 415/932] 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 7a5f80c16bc7fb6b6f19ed2030a58ca7c3968a62 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 28 Dec 2018 16:32:10 +0300
Subject: [PATCH 416/932] MAGETWO-95809: Item row total display incorrect value
 in API response

- Stabilize static tests.
---
 .../Sales/Block/Order/Item/Renderer/DefaultRenderer.php   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
index 82974fdf6cc80..aac625e7c3800 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -48,6 +48,8 @@ public function __construct(
     }
 
     /**
+     * Set item.
+     *
      * @param \Magento\Framework\DataObject $item
      * @return $this
      */
@@ -58,6 +60,8 @@ public function setItem(\Magento\Framework\DataObject $item)
     }
 
     /**
+     * Get item.
+     *
      * @return array|null
      */
     public function getItem()
@@ -76,6 +80,8 @@ public function getOrder()
     }
 
     /**
+     * Get order item.
+     *
      * @return array|null
      */
     public function getOrderItem()
@@ -88,6 +94,8 @@ public function getOrderItem()
     }
 
     /**
+     * Get item options.
+     *
      * @return array
      */
     public function getItemOptions()

From 48e2544228d7e7e4467ae8aa8dfe4941acf93ddb Mon Sep 17 00:00:00 2001
From: Stas Puga <stas.puga@transoftgroup.com>
Date: Fri, 28 Dec 2018 15:32:47 +0200
Subject: [PATCH 417/932] MAGETWO-97030: Product image assignment for multiple
 stores

---
 .../Section/AdminSlideOutDialogSection.xml    |  22 +++
 .../AdminAssignImageRolesActionGroup.xml      |  24 ++++
 .../ActionGroup/AdminProductActionGroup.xml   |   1 +
 .../Catalog/Test/Mftf/Data/ProductData.xml    |   9 ++
 .../Section/AdminProductImagesSection.xml     |   3 +-
 .../Section/StorefrontProductMediaSection.xml |   1 +
 ...ctImageAssignmentForMultipleStoresTest.xml | 133 ++++++++++++++++++
 .../AdminSwitchStoreViewActionGroup.xml       |   4 +
 .../StorefrontSwitchStoreViewActionGroup.xml  |   2 +-
 .../Store/Test/Mftf/Data/StoreData.xml        |   8 +-
 .../Mftf/Section/AdminMainActionsSection.xml  |   1 +
 11 files changed, 202 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
new file mode 100644
index 0000000000000..77922b8c2b5fa
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   /**
+    * Copyright © Magento, Inc. All rights reserved.
+    * See COPYING.txt for license details.
+    */
+  -->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminSlideOutDialogSection">
+        <element name="closeButton" type="button" selector=".modal-slide._show [data-role='closeBtn']" timeout="30"/>
+        <element name="cancelButton" type="button"
+                 selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Cancel']"
+                 timeout="30"/>
+        <element name="doneButton" type="button"
+                 selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Done']"
+                 timeout="30"/>
+        <element name="saveButton" type="button"
+                 selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Save']"
+                 timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
new file mode 100644
index 0000000000000..90ceb1e4a1f96
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAssignImageRolesActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminAssignImageRolesActionGroup">
+        <arguments>
+            <argument name="image"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductImagesSection.productImagesToggleState('closed')}}" dependentSelector="{{AdminProductImagesSection.productImagesToggleState('open')}}" visible="false" stepKey="clickSectionImage"/>
+        <click selector="{{AdminProductImagesSection.imageFile(image.fileName)}}" stepKey="clickProductImage"/>
+        <waitForElementVisible selector="{{AdminProductImagesSection.altText}}" stepKey="seeAltTextSection"/>
+        <checkOption selector="{{AdminProductImagesSection.roleBase}}" stepKey="checkRoleBase"/>
+        <checkOption selector="{{AdminProductImagesSection.roleSmall}}" stepKey="checkRoleSmall"/>
+        <checkOption selector="{{AdminProductImagesSection.roleThumbnail}}" stepKey="checkRoleThumbnail"/>
+        <checkOption selector="{{AdminProductImagesSection.roleSwatch}}" stepKey="checkRoleSwatch"/>
+        <click selector="{{AdminSlideOutDialogSection.closeButton}}" stepKey="clickCloseButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 2b5fbfbe6a79b..28587e6405e49 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -70,6 +70,7 @@
 
     <!--Save product and see success message-->
     <actionGroup name="saveProductForm">
+        <scrollToTopOfPage stepKey="scrollTopPageProduct"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 23253ad6ad8f8..74492ed416206 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -497,4 +497,13 @@
         <data key="name" unique="suffix">Product With Long Name And Sku - But not too long</data>
         <data key="sku" unique="suffix">Product With Long Name And Sku - But not too long</data>
     </entity>
+    <entity name="Magento3" type="image">
+        <data key="title" unique="suffix">Magento3</data>
+        <data key="price">1.00</data>
+        <data key="file_type">Upload File</data>
+        <data key="shareable">Yes</data>
+        <data key="file">magento3.jpg</data>
+        <data key="filename">magento3</data>
+        <data key="file_extension">jpg</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
index eca0cb6f02ea1..89eb1ed678cc9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductImagesSection.xml
@@ -16,6 +16,7 @@
         <element name="removeImageButton" type="button" selector=".action-remove"/>
         <element name="modalOkBtn" type="button" selector="button.action-primary.action-accept"/>
         <element name="uploadProgressBar" type="text" selector=".uploader .file-row"/>
+        <element name="productImagesToggleState" type="button" selector="[data-index='gallery'] > [data-state-collapsible='{{status}}']" parameterized="true"/>
 
         <element name="nthProductImage" type="button" selector="#media_gallery_content > div:nth-child({{var}}) img.product-image" parameterized="true"/>
         <element name="nthRemoveImageBtn" type="button" selector="#media_gallery_content > div:nth-child({{var}}) button.action-remove" parameterized="true"/>
@@ -32,4 +33,4 @@
         <element name="isThumbnailSelected" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li[contains(@class, 'selected')]/label[normalize-space(.) = 'Thumbnail']"/>
         <element name="isSwatchSelected" type="button" selector="//div[contains(@class, 'field-image-role')]//ul/li[contains(@class, 'selected')]/label[normalize-space(.) = 'Swatch']"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
index 83c3ca5348606..45e0b03e8d995 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductMediaSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontProductMediaSection">
         <element name="imageFile" type="text" selector="//*[@class='product media']//img[contains(@src, '{{filename}}')]" parameterized="true"/>
+        <element name="productImageActive" type="text" selector=".product.media div[data-active=true] > img[src*='{{filename}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml
new file mode 100644
index 0000000000000..b9a5a31ad2168
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml
@@ -0,0 +1,133 @@
+<?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="AdminProductImageAssignmentForMultipleStoresTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Product image assignment for multiple stores"/>
+            <title value="Product image assignment for multiple stores"/>
+            <description value="Product image assignment for multiple stores"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-58718"/>
+            <group value="product"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <before>
+            <!-- Login Admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Create Store View English -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <!-- Create Store View France -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewFr">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+            <!-- Create Category and Simple Product -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">100</field>
+            </createData>
+        </before>
+        <after>
+            <!-- Delete Store View English -->
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <!-- Delete Store View France -->
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+            <!-- Clear Filter Store -->
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="resetFiltersOnStorePage"/>
+            <!-- Delete Category and Simple Product -->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Clear Filter Product -->
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
+            <!-- Logout Admin -->
+            <actionGroup ref="logout" stepKey="logoutOfAdmin"/>
+        </after>
+        <!-- Search Product and Open Edit -->
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <!-- Switch to the English store view -->
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchStoreViewEnglishProduct">
+            <argument name="storeView" value="customStoreEN.name"/>
+        </actionGroup>
+
+        <!-- Upload Image English -->
+        <actionGroup ref="addProductImage" stepKey="uploadImageEnglish"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct1"/>
+
+        <!-- Switch to the French store view -->
+        <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchStoreViewFrenchProduct">
+            <argument name="storeView" value="customStoreFR.name"/>
+        </actionGroup>
+
+        <!-- Upload Image French -->
+        <actionGroup ref="addProductImage" stepKey="uploadImageFrench">
+            <argument name="image" value="Magento3"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssignImageRolesActionGroup" stepKey="assignImageRole1">
+            <argument name="image" value="Magento3"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct2"/>
+
+        <!-- Switch to the All store view -->
+        <actionGroup ref="AdminSwitchToAllStoreViewActionGroup" stepKey="switchAllStoreViewProduct"/>
+
+        <!-- Upload Image All Store View -->
+        <actionGroup ref="addProductImage" stepKey="uploadImageAllStoreView">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssignImageRolesActionGroup" stepKey="assignImageRole">
+            <argument name="image" value="TestImageNew"/>
+        </actionGroup>
+
+        <!-- Change any product data product description -->
+        <click selector="{{AdminProductContentSection.sectionHeader}}" stepKey="openDescriptionDropDown"/>
+        <fillField selector="{{AdminProductContentSection.descriptionTextArea}}" userInput="This is the long description" stepKey="fillLongDescription"/>
+        <fillField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="This is the short description" stepKey="fillShortDescription"/>
+        <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+
+        <!-- Go to Product Page and see Default Store View-->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToDefaultStorefrontProductPage"/>
+        <seeElement selector="{{StorefrontProductMediaSection.productImageActive(TestImageNew.filename)}}" stepKey="seeActiveImageDefault"/>
+
+        <!-- English Switch Store View and see English Store View -->
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStoreViewEnglish">
+            <argument name="storeView" value="customStoreEN"/>
+        </actionGroup>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad time="30" stepKey="waitForCategoryPage"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc(ProductImage.fileName)}}" stepKey="seeThumb"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct.name$$)}}" stepKey="openProductPage"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPage"/>
+        <seeElement selector="{{StorefrontProductMediaSection.productImageActive(ProductImage.filename)}}" stepKey="seeActiveImageEnglish"/>
+
+        <!-- Switch France Store View and see France Store View -->
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchStoreViewFrance">
+            <argument name="storeView" value="customStoreFR"/>
+        </actionGroup>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="openCategoryPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForCategoryPage1"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc(Magento3.fileName)}}" stepKey="seeThumb1"/>
+        <click selector="{{StorefrontCategoryProductSection.ProductTitleByName($$createSimpleProduct.name$$)}}" stepKey="openProductPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForProductPage1"/>
+        <seeElement selector="{{StorefrontProductMediaSection.productImageActive(Magento3.filename)}}" stepKey="seeActiveImageFrance"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
index 860f094a48ecc..ac8e9d717fdca 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSwitchStoreViewActionGroup.xml
@@ -20,4 +20,8 @@
         <waitForPageLoad stepKey="waitForStoreViewSwitched"/>
         <see userInput="{{storeView}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
     </actionGroup>
+    <actionGroup name="AdminSwitchToAllStoreViewActionGroup" extends="AdminSwitchStoreViewActionGroup">
+        <click selector="{{AdminMainActionsSection.allStoreViews}}" stepKey="clickStoreViewByName" after="waitForStoreViewsAreVisible"/>
+        <see selector="{{AdminMainActionsSection.storeSwitcher}}" userInput="All Store Views" stepKey="seeNewStoreViewName" after="waitForStoreViewSwitched"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
index cfcd25086e067..efd3a8c6b8cad 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml
@@ -14,7 +14,7 @@
         </arguments>
         <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
         <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropdown"/>
-        <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.name)}}" stepKey="clickSelectStoreView"/>
+        <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.code)}}" stepKey="clickSelectStoreView"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index 9fae618020ff3..ab5fdf9b9903e 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -22,8 +22,8 @@
         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
     </entity>
     <entity name="customStoreEN" type="store">
-        <data key="name">EN</data>
-        <data key="code">en</data>
+        <data key="name" unique="suffix">EN</data>
+        <data key="code" unique="suffix">en</data>
         <data key="is_active">1</data>
         <data key="store_id">null</data>
         <data key="store_action">add</data>
@@ -31,8 +31,8 @@
         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
     </entity>
     <entity name="customStoreFR" type="store">
-        <data key="name">FR</data>
-        <data key="code">fr</data>
+        <data key="name" unique="suffix">FR</data>
+        <data key="code" unique="suffix">fr</data>
         <data key="is_active">1</data>
         <data key="store_id">null</data>
         <data key="store_action">add</data>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
index fda182246db4a..211ad6f370cae 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminMainActionsSection.xml
@@ -12,5 +12,6 @@
         <element name="storeSwitcher" type="text" selector=".store-switcher"/>
         <element name="storeViewDropdown" type="button" selector="#store-change-button"/>
         <element name="storeViewByName" type="button" selector="//*[@class='store-switcher-store-view  ']/a[contains(text(), '{{storeViewName}}')]" timeout="30" parameterized="true"/>
+        <element name="allStoreViews" type="button" selector=".store-switcher .store-switcher-all" timeout="30"/>
     </section>
 </sections>

From 62c5acc7b2ca6d628bb1579fc6ddf6f57db50209 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Fri, 28 Dec 2018 18:05:02 +0300
Subject: [PATCH 418/932] MAGETWO-96432: Payment method title does not update
 in the admin sales order grid

- Change title definition logic for offline payment methods
---
 app/code/Magento/Payment/Helper/Data.php      |  7 ++--
 .../Listing/Column/Method/Options.php         | 39 +++++++++++++++++--
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 5f7a5a97d94ed..f5866f68efbc9 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -261,11 +261,10 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
         $groupRelations = [];
 
         foreach ($this->getPaymentMethods() as $code => $data) {
-            $storedTitle = $this->getMethodInstance($code)->getConfigData('title', $store);
-            if (isset($storedTitle)) {
-                $methods[$code] = $storedTitle;
-            } elseif (isset($data['title'])) {
+            if (isset($data['title'])) {
                 $methods[$code] = $data['title'];
+            } else {
+                $methods[$code] = $this->getMethodInstance($code)->getConfigData('title', $store);
             }
             if ($asLabelValue && $withGroups && isset($data['group'])) {
                 $groupRelations[$code] = $data['group'];
diff --git a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
index 5afaa9fcf97b9..39b8ee7dfadee 100644
--- a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
+++ b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Payment\Ui\Component\Listing\Column\Method;
 
+use Magento\Payment\Api\PaymentMethodListInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
 /**
  * Class Options
  */
@@ -20,14 +23,29 @@ class Options implements \Magento\Framework\Data\OptionSourceInterface
      */
     protected $paymentHelper;
 
+    /**
+     * @var PaymentMethodListInterface
+     */
+    private $paymentMethodList;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Constructor
      *
      * @param \Magento\Payment\Helper\Data $paymentHelper
      */
-    public function __construct(\Magento\Payment\Helper\Data $paymentHelper)
-    {
+    public function __construct(
+        \Magento\Payment\Helper\Data $paymentHelper,
+        \Magento\Payment\Api\PaymentMethodListInterface $paymentMethodList,
+        \Magento\Store\Model\StoreManagerInterface $storeManager
+    ) {
         $this->paymentHelper = $paymentHelper;
+        $this->paymentMethodList = $paymentMethodList;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -38,8 +56,23 @@ public function __construct(\Magento\Payment\Helper\Data $paymentHelper)
     public function toOptionArray()
     {
         if ($this->options === null) {
-            $this->options = $this->paymentHelper->getPaymentMethodList(true, true);
+            $this->options = $this->getPaymentOptions();
+//            $this->options = $this->paymentHelper->getPaymentMethodList(true, true);
         }
         return $this->options;
     }
+
+    /**
+     * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getPaymentOptions()
+    {
+        $options = [];
+        foreach ($this->paymentMethodList->getList($this->storeManager->getStore()->getId()) as $option) {
+            $options[$option->getCode()] = ['value' => $option->getCode(), 'label' => $option->getTitle()];
+        }
+        asort($options);
+        return $options;
+    }
 }

From 73d13ab733e52b5243edb2eac2d257f077dfcc26 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 28 Dec 2018 21:05:04 +0300
Subject: [PATCH 419/932] MAGETWO-71344: Update product from mini shopping cart
 doesn't reflect in the shopping cart

- Stabilize functional test.
---
 .../StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
index b4a3ab4621776..aa90b7c1b54db 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
@@ -38,7 +38,7 @@
 
         <!--Go to Shopping cart and check Qty-->
         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCart"/>
-        <grabValueFrom selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" stepKey="grabQtyShoppingCart"/>
+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabQtyShoppingCart"/>
         <assertEquals expected="1" actual="$grabQtyShoppingCart" stepKey="assertQtyShoppingCart"/>
 
         <!--Open minicart and change Qty-->
@@ -50,7 +50,7 @@
         <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
 
        <!--Check Qty in shopping cart after updating-->
-        <grabValueFrom selector="{{CheckoutCartProductSection.qty($$createProduct.name$$)}}" stepKey="grabQtyShoppingCart1"/>
+        <grabValueFrom selector="{{CheckoutCartProductSection.ProductQuantityByName($$createProduct.name$$)}}" stepKey="grabQtyShoppingCart1"/>
         <assertEquals expected="5" actual="$grabQtyShoppingCart1" stepKey="assertQtyShoppingCart1"/>
     </test>
 </tests>

From ff7931b2623ae41d1c2d5a028e469c84ac62a346 Mon Sep 17 00:00:00 2001
From: Amrit Man Shrestha <1658188+amritms@users.noreply.github.com>
Date: Sun, 30 Dec 2018 18:26:28 +0545
Subject: [PATCH 420/932] Update README.md

removes extra dot on "How to run Magento"
---
 phpserver/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpserver/README.md b/phpserver/README.md
index 6bb814fe5f5f2..63436c8af7883 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -31,7 +31,7 @@ For more informations about the installation process using the CLI, you can cons
 
 ### How to run Magento
 
-Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ../phpserver/router.php```
+Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ./phpserver/router.php```
 
 ### What exactly the script does
 

From 6089f2735e3e629f08bffd94099790de9413f5bd Mon Sep 17 00:00:00 2001
From: hitesh-wagento <hitesh@wagento.com>
Date: Mon, 31 Dec 2018 11:25:02 +0530
Subject: [PATCH 421/932] [Fixed Radio alignment issue on Cart page #120021]

---
 .../luma/Magento_Checkout/web/css/source/module/_cart.less       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 58582d344e75a..02685fe5882b4 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -97,6 +97,7 @@
                 .field {
                     .radio {
                         float: left;
+                        margin-top: 4px;
                     }
 
                     .radio {

From 36f5b5ca743ee11aed9aa5e734227cfd0a8b0ae8 Mon Sep 17 00:00:00 2001
From: jhruehl <jr@refusion.com>
Date: Mon, 6 Aug 2018 14:13:28 +0300
Subject: [PATCH 422/932] increase length of sequence_table column in
 sales_sequence_meta table
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Having a too small length for the sequence_table column can lead to integrity constraint errors on setup:upgrade, because longer table names will be cut off at least the store id suffix of those sales sequence table names.
In our case it was the postfinance extension, which lead to the table names "sequence_postfinancecw_transaction_0" and "sequence_postfinancecw_transaction_1", which are 36 characters long.
So the name got cut off and as a consequence lead to an integrity constrained, when the recurring script in the Magento_SalesSequence module tries to add the meta data for the sequence_postfinancecw_transaction_1 table.

So a character length of only 32 is definitely not long enough. I guess 50 character should suffice though. ¯\_(ツ)_/¯
---
 app/code/Magento/SalesSequence/etc/db_schema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesSequence/etc/db_schema.xml b/app/code/Magento/SalesSequence/etc/db_schema.xml
index 0e580b85bd608..7ad48badf7b80 100644
--- a/app/code/Magento/SalesSequence/etc/db_schema.xml
+++ b/app/code/Magento/SalesSequence/etc/db_schema.xml
@@ -41,7 +41,7 @@
         <column xsi:type="varchar" name="entity_type" nullable="false" length="32" comment="Prefix"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Store Id"/>
-        <column xsi:type="varchar" name="sequence_table" nullable="false" length="32" comment="table for sequence"/>
+        <column xsi:type="varchar" name="sequence_table" nullable="false" length="64" comment="table for sequence"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="meta_id"/>
         </constraint>

From 398ae009b12427b1b385ee3427c2a418ffa7042d Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@magento.com>
Date: Mon, 31 Dec 2018 13:01:39 +0200
Subject: [PATCH 423/932] MAGETWO-97210: Add Product by SKU to category causes
 the browser to hang

---
 .../UrlRewrite/Model/Storage/DbStorage.php    | 72 +++++++++++--------
 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index f4aa61b145f62..1b97c97ccd9a9 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -161,41 +161,51 @@ private function deleteOldUrls(array $urls): void
         $oldUrlsSelect->from(
             $this->resource->getTableName(self::TABLE_NAME)
         );
+
+        $uniqueEntities = $this->prepareUniqueEntities($urls);
+        foreach ($uniqueEntities as $storeId => $entityTypes) {
+            foreach ($entityTypes as $entityType => $entities) {
+                $oldUrlsSelect->orWhere(
+                    $this->connection->quoteIdentifier(
+                        UrlRewrite::STORE_ID
+                    ) . ' = ' . $this->connection->quote($storeId, 'INTEGER') .
+                    ' AND ' . $this->connection->quoteIdentifier(
+                        UrlRewrite::ENTITY_ID
+                    ) . ' IN (' . $this->connection->quote($entities, 'INTEGER') . ')' .
+                    ' AND ' . $this->connection->quoteIdentifier(
+                        UrlRewrite::ENTITY_TYPE
+                    ) . ' = ' . $this->connection->quote($entityType)
+                );
+            }
+        }
+
+        $this->connection->query(
+            $oldUrlsSelect->deleteFromSelect(
+                $this->resource->getTableName(self::TABLE_NAME)
+            )
+        );
+    }
+
+    /**
+     * Prepare array with unique entities
+     *
+     * @param UrlRewrite[] $urls
+     * @return array
+     */
+    private function prepareUniqueEntities(array $urls): array
+    {
+        $uniqueEntities = [];
         /** @var UrlRewrite $url */
         foreach ($urls as $url) {
-            $oldUrlsSelect->orWhere(
-                $this->connection->quoteIdentifier(
-                    UrlRewrite::ENTITY_TYPE
-                ) . ' = ?',
-                $url->getEntityType()
-            );
-            $oldUrlsSelect->where(
-                $this->connection->quoteIdentifier(
-                    UrlRewrite::ENTITY_ID
-                ) . ' = ?',
-                $url->getEntityId()
-            );
-            $oldUrlsSelect->where(
-                $this->connection->quoteIdentifier(
-                    UrlRewrite::STORE_ID
-                ) . ' = ?',
-                $url->getStoreId()
-            );
-        }
+            $entityIds = (!empty($uniqueEntities[$url->getStoreId()][$url->getEntityType()])) ?
+                $uniqueEntities[$url->getStoreId()][$url->getEntityType()] : [];
 
-        // prevent query locking in a case when nothing to delete
-        $checkOldUrlsSelect = clone $oldUrlsSelect;
-        $checkOldUrlsSelect->reset(Select::COLUMNS);
-        $checkOldUrlsSelect->columns('count(*)');
-        $hasOldUrls = (bool)$this->connection->fetchOne($checkOldUrlsSelect);
-
-        if ($hasOldUrls) {
-            $this->connection->query(
-                $oldUrlsSelect->deleteFromSelect(
-                    $this->resource->getTableName(self::TABLE_NAME)
-                )
-            );
+            if (!\in_array($url->getEntityId(), $entityIds)) {
+                $entityIds[] = $url->getEntityId();
+            }
+            $uniqueEntities[$url->getStoreId()][$url->getEntityType()] = $entityIds;
         }
+        return $uniqueEntities;
     }
 
     /**

From 44fcc48286d36aa594feb8b48b5b9ccf90e881bd Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@magento.com>
Date: Mon, 31 Dec 2018 13:24:22 +0200
Subject: [PATCH 424/932] MAGETWO-97210: Add Product by SKU to category causes
 the browser to hang

---
 .../UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
index b96a8ef637404..697ce33be0fa7 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
@@ -445,7 +445,6 @@ public function testReplace()
         $urlSecond = $this->createMock(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class);
 
         // delete
-
         $urlFirst->expects($this->any())
             ->method('getEntityType')
             ->willReturn('product');
@@ -479,10 +478,6 @@ public function testReplace()
             ->with(DbStorage::TABLE_NAME)
             ->will($this->returnValue('table_name'));
 
-        $this->connectionMock->expects($this->any())
-            ->method('query')
-            ->with('sql delete query');
-
         // insert
 
         $urlFirst->expects($this->any())
@@ -497,10 +492,6 @@ public function testReplace()
             ->with(DbStorage::TABLE_NAME)
             ->will($this->returnValue('table_name'));
 
-        $this->connectionMock->expects($this->once())
-            ->method('insertMultiple')
-            ->with('table_name', [['row1'], ['row2']]);
-
         $this->storage->replace([$urlFirst, $urlSecond]);
     }
 

From 87d5775b26daa9aa1a95113560b22ee760e20318 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@magento.com>
Date: Mon, 31 Dec 2018 14:01:33 +0200
Subject: [PATCH 425/932] MAGETWO-97210: Add Product by SKU to category causes
 the browser to hang

---
 app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index 1b97c97ccd9a9..c867d0ab35344 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -87,7 +87,7 @@ protected function prepareSelect(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function doFindAllByData(array $data)
     {
@@ -95,7 +95,7 @@ protected function doFindAllByData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function doFindOneByData(array $data)
     {
@@ -299,7 +299,7 @@ protected function createFilterDataBasedOnUrls($urls)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function deleteByData(array $data)
     {

From 383a385fe095a590302a63c530a68889b40601e4 Mon Sep 17 00:00:00 2001
From: vtymchynskyi <vtymchynskyi@magento.com>
Date: Mon, 31 Dec 2018 15:10:03 +0200
Subject: [PATCH 426/932] MAGETWO-97314: [Magento Cloud] Custom Price not shown
 in Quotes

---
 .../Adminhtml/Order/Create/Sidebar/Cart.php   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
index 34d7a3f8ee25e..f2200e1c1a108 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
@@ -3,8 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+
 /**
  * Adminhtml sales order create sidebar cart block
  *
@@ -58,6 +63,17 @@ public function getItemCollection()
         return $collection;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getItemPrice(Product $product)
+    {
+        $customPrice = $this->getCartItemCustomPrice($product);
+        $price = $customPrice ?? $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue();
+
+        return $this->convertPrice($price);
+    }
+
     /**
      * Retrieve display item qty availability
      *
@@ -111,4 +127,23 @@ protected function _prepareLayout()
 
         return parent::_prepareLayout();
     }
+
+    /**
+     * Returns cart item custom price.
+     *
+     * @param Product $product
+     * @return float|null
+     */
+    private function getCartItemCustomPrice(Product $product): ?float
+    {
+        $items = $this->getItemCollection();
+        foreach ($items as $item) {
+            $productItemId = $this->getProduct($item)->getId();
+            if ($productItemId === $product->getId() && $item->getCustomPrice()) {
+                return (float)$item->getCustomPrice();
+            }
+        }
+
+        return null;
+    }
 }

From 9bf7ab7da8fab2031068f9c74bec02f5d74a5915 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 31 Dec 2018 15:33:04 +0200
Subject: [PATCH 427/932] ENGCOM-3763: Static test fix.

---
 .../view/frontend/web/css/source/_module.less | 61 ++++++++++---------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
index e907c61b39e7b..0aaec05aa2afe 100644
--- a/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
+++ b/app/code/Magento/Contact/view/frontend/web/css/source/_module.less
@@ -2,38 +2,41 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
 */
+
 & when (@media-common = true) {
-	.contact-index-index {
-		.column:not(.sidebar-main){
-			.form.contact {
-				width: 50%;
-				float: none;
-			}
-		}
-		.column:not(.sidebar-additional) {
-			.form.contact {
-				width: 50%;
-				float: none;
-			}
-		}
-	}
+    .contact-index-index {
+        .column:not(.sidebar-main) {
+            .form.contact {
+                float: none;
+                width: 50%;
+            }
+        }
+
+        .column:not(.sidebar-additional) {
+            .form.contact {
+                float: none;
+                width: 50%;
+            }
+        }
+    }
 }
 
-//	Mobile 
+//  Mobile
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-	.contact-index-index {
-		.column:not(.sidebar-main){
-			.form.contact {
-				width: 100%;
-				float: none;
-			}
-		}
-		.column:not(.sidebar-additional) {
-			.form.contact {
-				width: 100%;
-				float: none;
-			}
-		}
-	}
+    .contact-index-index {
+        .column:not(.sidebar-main) {
+            .form.contact {
+                float: none;
+                width: 100%;
+            }
+        }
+
+        .column:not(.sidebar-additional) {
+            .form.contact {
+                float: none;
+                width: 100%;
+            }
+        }
+    }
 }
 

From 410b012e2972819c2523706bfba83be109e490cd Mon Sep 17 00:00:00 2001
From: Patrick McLain <pat@pmclain.com>
Date: Mon, 31 Dec 2018 14:43:41 -0500
Subject: [PATCH 428/932] Allow introspection by default in production mode

Adds env.php parameter for disabling introspection:
```php
...
    'graphql' => [
        'disable_introspection' => true,
    ],
...
```

Fixes #232
---
 .../GraphQl/IntrospectionQueryTest.php        | 11 ++---
 .../Query/IntrospectionConfiguration.php      | 42 +++++++++++++++++++
 .../GraphQl/Query/QueryComplexityLimiter.php  | 14 ++++++-
 3 files changed, 57 insertions(+), 10 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
index 85b4c62c41945..60acb3a7a4d44 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/IntrospectionQueryTest.php
@@ -12,10 +12,10 @@
 class IntrospectionQueryTest extends GraphQlAbstract
 {
     /**
-     * Tests that Introspection is disabled when not in developer mode
+     * Tests that Introspection is allowed by default
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testIntrospectionQueryWithFieldArgs()
+    public function testIntrospectionQuery()
     {
         $query
             = <<<QUERY
@@ -54,11 +54,6 @@ public function testIntrospectionQueryWithFieldArgs()
 }
 QUERY;
 
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage(
-            'GraphQL response contains errors: GraphQL introspection is not allowed, but ' .
-            'the query contained __schema or __type'
-        );
-        $this->graphQlQuery($query);
+        $this->assertArrayHasKey('__schema', $this->graphQlQuery($query));
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
new file mode 100644
index 0000000000000..1bdb5e56d10de
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Query;
+
+use Magento\Framework\App\DeploymentConfig;
+
+/**
+ * Class for fetching the availability of introspection queries
+ */
+class IntrospectionConfiguration
+{
+    const CONFIG_PATH_DISABLE_INTROSPECTION = 'graphql/disable_introspection';
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @param DeploymentConfig $deploymentConfig
+     */
+    public function __construct(
+        DeploymentConfig $deploymentConfig
+    ) {
+        $this->deploymentConfig = $deploymentConfig;
+    }
+
+    /**
+     * Check the the environment config to determine if introspection should be disabled.
+     *
+     * @return int
+     */
+    public function disableIntrospection(): int
+    {
+        return (int) $this->deploymentConfig->get(self::CONFIG_PATH_DISABLE_INTROSPECTION);
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
index 5730156ca5b34..2e88f8902b663 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
@@ -11,6 +11,7 @@
 use GraphQL\Validator\Rules\DisableIntrospection;
 use GraphQL\Validator\Rules\QueryDepth;
 use GraphQL\Validator\Rules\QueryComplexity;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * QueryComplexityLimiter
@@ -33,16 +34,25 @@ class QueryComplexityLimiter
      */
     private $queryComplexity;
 
+    /**
+     * @var IntrospectionConfiguration
+     */
+    private $introspectionConfig;
+
     /**
      * @param int $queryDepth
      * @param int $queryComplexity
+     * @param IntrospectionConfiguration $introspectionConfig
      */
     public function __construct(
         int $queryDepth,
-        int $queryComplexity
+        int $queryComplexity,
+        IntrospectionConfiguration $introspectionConfig = null
     ) {
         $this->queryDepth = $queryDepth;
         $this->queryComplexity = $queryComplexity;
+        $this->introspectionConfig = $introspectionConfig ?? ObjectManager::getInstance()
+                ->get(IntrospectionConfiguration::class);
     }
 
     /**
@@ -53,7 +63,7 @@ public function __construct(
     public function execute(): void
     {
         DocumentValidator::addRule(new QueryComplexity($this->queryComplexity));
-        DocumentValidator::addRule(new DisableIntrospection());
+        DocumentValidator::addRule(new DisableIntrospection($this->introspectionConfig->disableIntrospection()));
         DocumentValidator::addRule(new QueryDepth($this->queryDepth));
     }
 }

From 2aa19a51895fbcb66294aaa731ca6c07487e029d Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@magento.com>
Date: Wed, 2 Jan 2019 11:19:33 +0200
Subject: [PATCH 429/932] MAGETWO-97210: Add Product by SKU to category causes
 the browser to hang

---
 .../UrlRewrite/Model/Storage/DbStorage.php     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index c867d0ab35344..ccf43e97016e1 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -179,11 +179,19 @@ private function deleteOldUrls(array $urls): void
             }
         }
 
-        $this->connection->query(
-            $oldUrlsSelect->deleteFromSelect(
-                $this->resource->getTableName(self::TABLE_NAME)
-            )
-        );
+        // prevent query locking in a case when nothing to delete
+        $checkOldUrlsSelect = clone $oldUrlsSelect;
+        $checkOldUrlsSelect->reset(Select::COLUMNS);
+        $checkOldUrlsSelect->columns('count(*)');
+ 	    $hasOldUrls = (bool)$this->connection->fetchOne($checkOldUrlsSelect);
+
+ 	    if ($hasOldUrls) {
+            $this->connection->query(
+                $oldUrlsSelect->deleteFromSelect(
+                    $this->resource->getTableName(self::TABLE_NAME)
+                )
+            );
+        }
     }
 
     /**

From ae9daaba0dafbe11ad56bb4605f7362801643e32 Mon Sep 17 00:00:00 2001
From: Devesh <38776269+ddevesh@users.noreply.github.com>
Date: Wed, 2 Jan 2019 15:25:40 +0530
Subject: [PATCH 430/932] typos error fixed

---
 .../view/adminhtml/web/catalog/product/composite/configure.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
index a2804a8723ce0..949742c718214 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -91,8 +91,8 @@ define([
 
         /**
          * Add product list types as scope and their urls
-         * expamle: addListType('product_to_add', {urlFetch: 'http://magento...'})
-         * expamle: addListType('wishlist', {urlSubmit: 'http://magento...'})
+         * example: addListType('product_to_add', {urlFetch: 'http://magento...'})
+         * example: addListType('wishlist', {urlSubmit: 'http://magento...'})
          *
          * @param type types as scope
          * @param urls obj can be

From 62994050ea5f1d52f252283c0aef07c2c2db803d Mon Sep 17 00:00:00 2001
From: Devesh <38776269+ddevesh@users.noreply.github.com>
Date: Wed, 2 Jan 2019 15:28:50 +0530
Subject: [PATCH 431/932] typo error fixed

Multiple use of expamle rather than "example" .
---
 .../view/adminhtml/web/catalog/product/composite/configure.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
index 949742c718214..1ac2a4ffadaae 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js
@@ -112,7 +112,7 @@ define([
         /**
          * Adds complex list type - that is used to submit several list types at once
          * Only urlSubmit is possible for this list type
-         * expamle: addComplexListType(['wishlist', 'product_list'], 'http://magento...')
+         * example: addComplexListType(['wishlist', 'product_list'], 'http://magento...')
          *
          * @param type types as scope
          * @param urls obj can be

From b0cd9b7b01614db985eb3d0979644e232f279dda Mon Sep 17 00:00:00 2001
From: Devesh <38776269+ddevesh@users.noreply.github.com>
Date: Wed, 2 Jan 2019 15:35:37 +0530
Subject: [PATCH 432/932] typo-error-fixed-trailing@63

trailig was used rather than trailing in line number 63
---
 app/code/Magento/Catalog/view/base/web/js/price-utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/base/web/js/price-utils.js b/app/code/Magento/Catalog/view/base/web/js/price-utils.js
index e2ea42f7d5fe3..7b83d12cc9804 100644
--- a/app/code/Magento/Catalog/view/base/web/js/price-utils.js
+++ b/app/code/Magento/Catalog/view/base/web/js/price-utils.js
@@ -60,7 +60,7 @@ define([
         pattern = pattern.indexOf('{sign}') < 0 ? s + pattern : pattern.replace('{sign}', s);
 
         // we're avoiding the usage of to fixed, and using round instead with the e representation to address
-        // numbers like 1.005 = 1.01. Using ToFixed to only provide trailig zeroes in case we have a whole number
+        // numbers like 1.005 = 1.01. Using ToFixed to only provide trailing zeroes in case we have a whole number
         i = parseInt(
                 amount = Number(Math.round(Math.abs(+amount || 0) + 'e+' + precision) + ('e-' + precision)),
                 10

From fd1a404de47cfe74d731b07973b4326530a0fca4 Mon Sep 17 00:00:00 2001
From: Devesh <38776269+ddevesh@users.noreply.github.com>
Date: Wed, 2 Jan 2019 15:39:12 +0530
Subject: [PATCH 433/932] typo-error-fixed-Retrieve@325

typo error fixed at line number 325 where " Rerieve " was used rather than "Retrieve",
---
 .../Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index c8153df41430e..23b927598e8e7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -322,7 +322,7 @@ protected function _prepareColumns()
     }
 
     /**
-     * Rerieve grid URL
+     * Retrieve grid URL
      *
      * @return string
      */

From fdf8c585e8cb1849c9f4b564cf492a5e525560f3 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Wed, 2 Jan 2019 12:18:04 +0200
Subject: [PATCH 434/932] MAGETWO-97278: Incorrect use of cookies for customer

---
 .../Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml | 11 +++++++++++
 .../Magento/Persistent/Block/Header/Additional.php    |  3 +--
 .../Model/Plugin/PersistentCustomerContext.php        |  2 ++
 ...rectWelcomeMessageAfterCustomerIsLoggedOutTest.xml |  8 ++++----
 .../Test/Mftf/Section/AdminCreditMemoTotalSection.xml |  1 -
 .../Test/Mftf/Section/AdminInvoiceItemsSection.xml    |  1 -
 6 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml
new file mode 100644
index 0000000000000..9c1fc7aa8a88d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomerLogoutSuccessPage" url="customer/account/logoutSuccess/" area="storefront" module="Magento_Customer"/>
+</pages>
diff --git a/app/code/Magento/Persistent/Block/Header/Additional.php b/app/code/Magento/Persistent/Block/Header/Additional.php
index f82a0e7250bf9..2f7f5ba604f9f 100644
--- a/app/code/Magento/Persistent/Block/Header/Additional.php
+++ b/app/code/Magento/Persistent/Block/Header/Additional.php
@@ -103,8 +103,7 @@ public function getCustomerId(): int
      */
     public function getConfig(): string
     {
-        return
-            $this->jsonSerializer->serialize(
+        return $this->jsonSerializer->serialize(
                 [
                     'expirationLifetime' => $this->persistentHelper->getLifeTime(),
                 ]
diff --git a/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
index 4ddb1040e0db6..be8998bc9be14 100644
--- a/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
+++ b/app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Persistent\Model\Plugin;
 
 /**
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
index 7fffc6c2b0d37..2b58e5c7bf62b 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
@@ -48,13 +48,13 @@
         </actionGroup>
 
         <!--Check customer name and last name in welcome message-->
-        <seeCurrentUrlMatches regex="~/customer/account/~" stepKey="seeCustomerAccountPageUrl"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerDashboardPage.url}}" stepKey="seeCustomerAccountPageUrl"/>
         <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seeLoggedInCustomerWelcomeMessage"/>
         <!--Logout and check default welcome message-->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout"/>
-        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" wait="5" stepKey="seeCustomerSignOutPageUrl"/>
         <see userInput="Default welcome msg!"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seeDefaultWelcomeMessage"/>
@@ -64,14 +64,14 @@
             <argument name="Customer" value="$$createCustomerForPersistent$$"/>
         </actionGroup>
         <!--Check customer name and last name in welcome message-->
-        <seeCurrentUrlMatches regex="~/customer/account/~" stepKey="seeCustomerAccountPageUrl1"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerDashboardPage.url}}" stepKey="seeCustomerAccountPageUrl1"/>
         <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$!"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seeLoggedInCustomerWelcomeMessage1"/>
 
         <!--Logout and check persistent customer welcome message-->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout1"/>
-        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl1"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" wait="5" stepKey="seeCustomerSignOutPageUrl1"/>
         <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$! Not you?"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seePersistentWelcomeMessage"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
index 6eb7e9e7d16df..d65074b3eb1e3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
@@ -19,7 +19,6 @@
         <element name="emailCopy" type="checkbox" selector=".order-totals-actions #send_email"/>
         <element name="refundStoreCredit" type="checkbox" selector=".order-totals-actions .field-refund-store-credit input[type='checkbox']"/>
         <element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="30"/>
-        <element name="submitRefundOfflineEnabled" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button'][class='action-default scalable save submit-button primary']" timeout="30"/>
         <element name="creditMemoItem" type="text" selector="#sales_order_view_tabs_order_creditmemos"/>
         <element name="viewMemo" type="text" selector="div#sales_order_view_tabs_order_creditmemos_content a.action-menu-item"/>
     </section>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
index 03087d8949c2f..92c01cf380746 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
@@ -28,6 +28,5 @@
         <element name="discountAmountColumn" type="text" selector=".order-invoice-tables .col-discount .price"/>
         <element name="totalColumn" type="text" selector=".order-invoice-tables .col-total .price"/>
         <element name="updateQty" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button']"/>
-        <element name="updateQtyEnabled" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button'][class='action-default scalable update-button']"/>
     </section>
 </sections>

From 81393b8b0f4aa694be6456ac1caa8e3988bbc8e7 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@magento.com>
Date: Wed, 2 Jan 2019 12:44:26 +0200
Subject: [PATCH 435/932] MAGETWO-97210: Add Product by SKU to category causes
 the browser to hang

---
 app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index ccf43e97016e1..d8ceb16d71fdc 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -183,9 +183,9 @@ private function deleteOldUrls(array $urls): void
         $checkOldUrlsSelect = clone $oldUrlsSelect;
         $checkOldUrlsSelect->reset(Select::COLUMNS);
         $checkOldUrlsSelect->columns('count(*)');
- 	    $hasOldUrls = (bool)$this->connection->fetchOne($checkOldUrlsSelect);
+        $hasOldUrls = (bool)$this->connection->fetchOne($checkOldUrlsSelect);
 
- 	    if ($hasOldUrls) {
+        if ($hasOldUrls) {
             $this->connection->query(
                 $oldUrlsSelect->deleteFromSelect(
                     $this->resource->getTableName(self::TABLE_NAME)

From 14bc5920d1aeb70a807c6ee2ff26c6dfb0ef14c5 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Wed, 2 Jan 2019 13:57:51 +0200
Subject: [PATCH 436/932] MAGETWO-97278: Incorrect use of cookies for customer

---
 app/code/Magento/Persistent/Block/Header/Additional.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Persistent/Block/Header/Additional.php b/app/code/Magento/Persistent/Block/Header/Additional.php
index 2f7f5ba604f9f..dfde2adf1e6ab 100644
--- a/app/code/Magento/Persistent/Block/Header/Additional.php
+++ b/app/code/Magento/Persistent/Block/Header/Additional.php
@@ -104,9 +104,9 @@ public function getCustomerId(): int
     public function getConfig(): string
     {
         return $this->jsonSerializer->serialize(
-                [
-                    'expirationLifetime' => $this->persistentHelper->getLifeTime(),
-                ]
-            );
+            [
+                'expirationLifetime' => $this->persistentHelper->getLifeTime(),
+            ]
+        );
     }
 }

From 4f402c255ed0cab4d3b22015db3776ac424cff79 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 2 Jan 2019 15:06:06 +0200
Subject: [PATCH 437/932] MAGETWO-65408: [FT]
 Magento\Search\Test\TestCase\AdvancedSearchWithAttributeTest fails on Jenkins

---
 .../Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml    | 4 ++--
 .../Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml  | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
index dce1358a1ecf4..59c00683e3b1a 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Fixture/GroupedProduct.xml
@@ -58,7 +58,7 @@
         <field name="sku" is_required="1" group="product-details" />
         <field name="small_image" is_required="0" />
         <field name="small_image_label" is_required="0" />
-        <field name="status" is_required="0" />
+        <field name="status" is_required="0" group="product-details" />
         <field name="thumbnail" is_required="0" />
         <field name="thumbnail_label" is_required="0" />
         <field name="updated_at" is_required="1" />
@@ -66,7 +66,7 @@
         <field name="upsell_tgtr_position_limit" is_required="0" />
         <field name="url_key" is_required="0" group="search-engine-optimization" />
         <field name="url_path" is_required="0" />
-        <field name="visibility" is_required="0" />
+        <field name="visibility" is_required="0" group="product-details" />
         <field name="id" />
         <field name="type_id" />
         <field name="attribute_set_id" group="product-details" source="Magento\Catalog\Test\Fixture\Product\AttributeSetId" />
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml
index 13c7051d0c1ba..733b110ec5494 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/TestCase/AdvancedSearchWithAttributeTest.xml
@@ -8,8 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Search\Test\TestCase\AdvancedSearchWithAttributeTest" summary="Use Advanced Search by Decimal indexable attribute if Edit/Add Attribute" ticketId="MAGETWO-25931">
         <variation name="AdvancedSearchWithWeightAttributeTestVariation1">
-            <data name="issue" xsi:type="string">MAGETWO-65408: [FT] Magento\Search\Test\TestCase\AdvancedSearchWithAttributeTest fails on Jenkins</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="productDropDownList/0" xsi:type="string">configurable</data>
             <data name="productDropDownList/1" xsi:type="string">simple</data>
             <data name="productDropDownList/2" xsi:type="string">bundle</data>

From 107cad68b14e20aebabc0103f5643991c6e8f7f2 Mon Sep 17 00:00:00 2001
From: Stas Puga <stas.puga@transoftgroup.com>
Date: Wed, 2 Jan 2019 15:07:12 +0200
Subject: [PATCH 438/932] MAGETWO-97030: Product image assignment for multiple
 stores

---
 ...tPurchaseProductWithCustomOptionsTest.xml} | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)
 rename app/code/Magento/Catalog/Test/Mftf/Test/{StorefrontPurchaseProductWithCustomOptions.xml => StorefrontPurchaseProductWithCustomOptionsTest.xml} (93%)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
similarity index 93%
rename from app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
rename to app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index c845a27773170..951afa2ddb68b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontPurchaseProductWithCustomOptions">
+    <test name="StorefrontPurchaseProductWithCustomOptionsTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="Purchase a product with Custom Options of different types"/>
@@ -53,6 +53,10 @@
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsMultiselect(ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.price)}}" stepKey="checkMultiSelectProductOption"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsData(ProductOptionDate.title, ProductOptionDate.price)}}" stepKey="checkDataProductOption"/>
 
+        <!--Generate year-->
+        <generateDate date="Now" format="Y" stepKey="year"/>
+        <generateDate date="Now" format="y" stepKey="shortYear"/>
+
         <!-- Adding items to the checkout -->
 
         <fillField userInput="OptionField" selector="{{StorefrontProductInfoMainSection.productOptionFieldInput(ProductOptionField.title)}}" stepKey="fillProductOptionInputField"/>
@@ -64,10 +68,10 @@
         <selectOption userInput="{{ProductOptionValueMultiSelect1.price}}" selector="{{StorefrontProductInfoMainSection.productOptionSelect(ProductOptionMultiSelect.title)}}" stepKey="selectProductOptionMultiSelect"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataMonth(ProductOptionDate.title)}}" stepKey="selectProductOptionDate"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDataDay(ProductOptionDate.title)}}" stepKey="selectProductOptionDate1"/>
-        <selectOption userInput="2018" selector="{{StorefrontProductInfoMainSection.productOptionDataYear(ProductOptionDate.title)}}" stepKey="selectProductOptionDate2"/>
+        <selectOption userInput="$year" selector="{{StorefrontProductInfoMainSection.productOptionDataYear(ProductOptionDate.title)}}" stepKey="selectProductOptionDate2"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMonth(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMonth"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeDay(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeDay"/>
-        <selectOption userInput="2018" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeYear(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeYear"/>
+        <selectOption userInput="$year" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeYear(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeYear"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeHour(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeHour"/>
         <selectOption userInput="00" selector="{{StorefrontProductInfoMainSection.productOptionDateAndTimeMinute(ProductOptionDateTime.title)}}" stepKey="selectProductOptionDateAndTimeMinute"/>
         <selectOption userInput="01" selector="{{StorefrontProductInfoMainSection.productOptionTimeHour(ProductOptionTime.title)}}" stepKey="selectProductOptionTimeHour"/>
@@ -100,8 +104,8 @@
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeProductOptionValueRadioButtons1Input1"/>
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeProductOptionValueCheckboxInput1" />
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeproductAttributeOptionsMultiselect1Input1" />
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="Jan 1, 2018" stepKey="seeProductOptionDateAndTimeInput" />
-        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1/1/18, 1:00 AM" stepKey="seeProductOptionDataInput" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="Jan 1, $year" stepKey="seeProductOptionDateAndTimeInput" />
+        <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeProductOptionDataInput" />
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($createProduct.name$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
         <!--Select shipping method-->
         <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
@@ -138,8 +142,8 @@
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton1"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect1" />
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, 2018" stepKey="seeAdminOrderProductOptionDateAndTime" />
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/18, 1:00 AM" stepKey="seeAdminOrderProductOptionData" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, $year" stepKey="seeAdminOrderProductOptionDateAndTime" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeAdminOrderProductOptionData" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime" />
 
         <!-- Reorder and Checking the correctness of displayed custom options for user parameters on Order and correctness of displayed price Subtotal-->
@@ -156,8 +160,8 @@
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeAdminOrderProductOptionValueRadioButton11"/>
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeAdminOrderProductOptionValueCheckbox1" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeAdminOrderproductAttributeOptionsMultiselect11" />
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, 2018" stepKey="seeAdminOrderProductOptionDateAndTime1" />
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/18, 1:00 AM" stepKey="seeAdminOrderProductOptionData1" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Jan 1, $year" stepKey="seeAdminOrderProductOptionDateAndTime1" />
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeAdminOrderProductOptionData1" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="1:00 AM" stepKey="seeAdminOrderProductOptionTime1" />
 
         <see selector="{{AdminOrderTotalSection.subTotal}}" userInput="{$finalProductPrice}" stepKey="seeOrderSubTotal"/>
@@ -174,8 +178,8 @@
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionRadiobutton.title, ProductOptionValueRadioButtons1.title)}}" userInput="{{ProductOptionValueRadioButtons1.title}}" stepKey="seeStorefontOrderProductOptionValueRadioButtons11"/>
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionCheckbox.title, ProductOptionValueCheckbox.title)}}" userInput="{{ProductOptionValueCheckbox.title}}" stepKey="seeStorefontOrderProductOptionValueCheckbox1" />
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionMultiSelect.title, ProductOptionValueMultiSelect1.title)}}" userInput="{{ProductOptionValueMultiSelect1.title}}" stepKey="seeStorefontOrderproductAttributeOptionsMultiselect11" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDate.title, 'Jan 1, 2018')}}" userInput="Jan 1, 2018" stepKey="seeStorefontOrderProductOptionDateAndTime1" />
-        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDateTime.title, '1/1/18, 1:00 AM')}}" userInput="1/1/18, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDate.title, 'Jan 1, $year')}}" userInput="Jan 1, $year" stepKey="seeStorefontOrderProductOptionDateAndTime1" />
+        <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionDateTime.title, '1/1/$shortYear, 1:00 AM')}}" userInput="1/1/$shortYear, 1:00 AM" stepKey="seeStorefontOrderProductOptionData1" />
         <see selector="{{StorefrontCustomerOrderSection.productCustomOptions($createProduct.name$, ProductOptionTime.title, '1:00 AM')}}" userInput="1:00 AM" stepKey="seeStorefontOrderProductOptionTime1" />
 
         <!-- Delete product and category -->

From 0f825a761142584ac38e744499cc805d6407a470 Mon Sep 17 00:00:00 2001
From: Dmitriy Kogut <kogut.dmitriy@gmail.com>
Date: Wed, 2 Jan 2019 16:10:23 +0200
Subject: [PATCH 439/932] MAGETWO-97026: Check Url Rewrites Correctly Generated
 for Multiple Storeviews During Product Import

---
 .../Mftf/Section/AdminMessagesSection.xml     |   1 +
 .../SearchForProductOnBackendActionGroup.xml  |   8 ++
 .../Test/Mftf/Page/AdminImportIndexPage.xml   |  15 +++
 .../Mftf/Section/AdminImportHeaderSection.xml |  14 +++
 .../Mftf/Section/AdminImportMainSection.xml   |  17 +++
 .../Store/Test/Mftf/Data/StoreData.xml        |  18 +++
 .../AdminNewStoreViewActionsSection.xml       |   2 +-
 .../Section/AdminUrlRewriteIndexSection.xml   |   1 +
 ...tipleStoreviewsDuringProductImportTest.xml | 111 ++++++++++++++++++
 .../acceptance/tests/_data/import_updated.csv |   4 +
 10 files changed, 190 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
 create mode 100644 app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
 create mode 100644 dev/tests/acceptance/tests/_data/import_updated.csv

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
index b1350d5dcc1d7..88e740d689cdd 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
@@ -12,5 +12,6 @@
         <element name="success" type="text" selector="#messages div.message-success"/>
         <element name="nthSuccess" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
         <element name="error" type="text" selector="#messages div.message-error"/>
+        <element name="notice" type="text" selector=".message.message-notice.notice"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
index a303511ffe5bb..aca9ba24c1168 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchForProductOnBackendActionGroup.xml
@@ -19,6 +19,14 @@
         <click selector="{{AdminProductFiltersSection.apply}}" stepKey="clickApplyFiltersButton"/>
     </actionGroup>
 
+    <actionGroup name="SearchForProductOnBackendByNameActionGroup" extends="SearchForProductOnBackendActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <remove keyForRemoval="fillSkuFieldOnFiltersSection"/>
+        <fillField userInput="{{productName}}" selector="{{AdminProductFiltersSection.nameInput}}" after="cleanFiltersIfTheySet" stepKey="fillNameFieldOnFiltersSection"/>
+    </actionGroup>
+
     <actionGroup name="ClearProductsFilterActionGroup">
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
         <waitForPageLoad time="30" stepKey="waitForProductsPageToLoad"/>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
new file mode 100644
index 0000000000000..87807eb9b0e85
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminImportIndexPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminImportIndexPage" url="admin/import/" area="admin" module="Magento_ImportExport">
+        <section name="AdminImportHeaderSection"/>
+        <section name="AdminImportMainSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
new file mode 100644
index 0000000000000..748580be09406
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportHeaderSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminImportHeaderSection">
+        <element name="checkDataButton" type="button" selector="#upload_button" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
new file mode 100644
index 0000000000000..2ce6b1e35777f
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminImportMainSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminImportMainSection">
+        <element name="entityType" type="select" selector="#entity"/>
+        <element name="importBehavior" type="select" selector="#basic_behavior"/>
+        <element name="selectFileToImport" type="input" selector="#import_file"/>
+        <element name="importButton" type="button" selector="#import_validation_container button" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index 9fae618020ff3..edc5108cb6bd0 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -39,6 +39,24 @@
         <data key="store_type">group</data>
         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
     </entity>
+    <entity name="customStoreENNotUnique" type="store">
+        <data key="name">EN</data>
+        <data key="code">en</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
+    <entity name="customStoreNLNotUnique" type="store">
+        <data key="name">NL</data>
+        <data key="code">nl</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
     <entity name="staticStore" type="store">
         <!--data key="group_id">customStoreGroup.id</data-->
         <data key="name">Second Store View</data>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
index 0e3a74fccf9f0..1f9832a5d6e9a 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
@@ -11,6 +11,6 @@
         <element name="delete" type="button" selector="#delete" timeout="30"/>
         <element name="resetButton" type="button" selector="#reset" timeout="30"/>
         <element name="saveButton" type="button" selector="#save" timeout="60"/>
-        <element name="loadingMask" type="text" selector=".loading-mask"/>
+        <element name="loadingMask" type="text" selector=".loading-mask" timeout="60"/>
     </section>
 </sections>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
index 0880b50950e15..1dcda298dfbdb 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminUrlRewriteIndexSection">
         <element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
         <element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
+        <element name="targetPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='target_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
new file mode 100644
index 0000000000000..ccfadcf862c01
--- /dev/null
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
@@ -0,0 +1,111 @@
+<?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="AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest">
+        <annotations>
+            <features value="Url Rewrite"/>
+            <stories value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import"/>
+            <title value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import"/>
+            <description value="Check Url Rewrites Correctly Generated for Multiple Storeviews During Product Import."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-68980"/>
+            <group value="urlRewrite123"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!-- Create Store View EN -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
+                <argument name="customStore" value="customStoreENNotUnique"/>
+            </actionGroup>
+            <!-- Create Store View NL -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewFr">
+                <argument name="customStore" value="customStoreNLNotUnique"/>
+            </actionGroup>
+            <createData entity="ApiCategory" stepKey="createCategory">
+                <field key="name">category-admin</field>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="deleteProductByName" stepKey="deleteImportedProduct">
+                <argument name="sku" value="productformagetwo68980"/>
+                <argument name="name" value="productformagetwo68980"/>
+            </actionGroup>
+            <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFiltersIfSet"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+        <actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewEn">
+            <argument name="Store" value="customStoreENNotUnique.name"/>
+            <argument name="CatName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValueENStoreView"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-english" stepKey="changeNameField"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="clickOnSectionHeader"/>
+        <actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyENStoreView">
+            <argument name="value" value="category-english"/>
+        </actionGroup>
+        <actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewNl">
+            <argument name="Store" value="customStoreNLNotUnique.name"/>
+            <argument name="CatName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValue1"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-dutch" stepKey="changeNameFieldNLStoreView"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="clickOnSectionHeader2"/>
+        <actionGroup ref="ChangeSeoUrlKeyForSubCategory" stepKey="changeSeoUrlKeyNLStoreView">
+            <argument name="value" value="category-dutch"/>
+        </actionGroup>
+        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="navigateToSystemImport"/>
+        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
+        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Add/Update" stepKey="selectAddUpdateOption"/>
+        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="import_updated.csv" stepKey="attachFileForImport"/>
+        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
+        <see selector="{{AdminMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>
+        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
+        <see selector="{{AdminMessagesSection.successMessage}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
+        <see selector="{{AdminMessagesSection.notice}}" userInput="Created: 1, Updated: 0, Deleted: 0" stepKey="assertNotice1"/>
+        <actionGroup ref="SearchForProductOnBackendByNameActionGroup" stepKey="searchForProductOnBackend">
+            <argument name="productName" value="productformagetwo68980"/>
+        </actionGroup>
+        <click selector="{{AdminProductGridSection.productRowBySku('productformagetwo68980')}}" stepKey="clickOnProductRow"/>
+        <grabFromCurrentUrl regex="~/id/(\d+)/~" stepKey="grabProductIdFromUrl"/>
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="goToUrlRewritesIndexPage"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english.html" stepKey="inputCategoryUrlForENStoreView"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english.html')}}" stepKey="seeUrlInRequestPathColumn"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch.html" stepKey="inputCategoryUrlForNLStoreView"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton1"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch.html')}}" stepKey="seeUrlInRequestPathColumn1"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn1"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton2"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn2"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn2"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreViewdfdf"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton3"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn3"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn3"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english/productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreViewdfdefef"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton4"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english/productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn4"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn4"/>
+
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch/productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreViewdfefdefef"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton5"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch/productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn5"/>
+        <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn5"/>
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/_data/import_updated.csv b/dev/tests/acceptance/tests/_data/import_updated.csv
new file mode 100644
index 0000000000000..b517150eec840
--- /dev/null
+++ b/dev/tests/acceptance/tests/_data/import_updated.csv
@@ -0,0 +1,4 @@
+product_websites,store_view_code,attribute_set_code,product_type,categories,sku,price,name,url_key
+base,,Default,simple,Default Category/category-admin,productformagetwo68980,123,productformagetwo68980,productformagetwo68980
+,en,Default,simple,,productformagetwo68980,,productformagetwo68980-english,productformagetwo68980-english
+,nl,Default,simple,,productformagetwo68980,,productformagetwo68980-dutch,productformagetwo68980-dutch

From cd6694765470e4473581d773ae1a6ad236559609 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Wed, 2 Jan 2019 08:47:15 -0600
Subject: [PATCH 440/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 .../Magento/Customer/Block/Address/Book.php   | 157 +++++++++++-------
 1 file changed, 94 insertions(+), 63 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 124fb3bbba869..62810c7a677cb 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -6,10 +6,10 @@
 namespace Magento\Customer\Block\Address;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Address\Mapper;
 use Magento\Framework\App\ObjectManager;
 use Magento\Directory\Model\CountryFactory;
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
 
 /**
  * Customer address book block
@@ -25,11 +25,6 @@ class Book extends \Magento\Framework\View\Element\Template
      */
     protected $currentCustomer;
 
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    protected $customerRepository;
-
     /**
      * @var AddressRepositoryInterface
      */
@@ -48,12 +43,12 @@ class Book extends \Magento\Framework\View\Element\Template
     /**
      * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory
      */
-    private $addressesCollectionFactory;
+    private $addressCollectionFactory;
 
     /**
      * @var \Magento\Customer\Model\ResourceModel\Address\Collection
      */
-    private $addressesCollection;
+    private $addressCollection;
 
     /**
      * @var CountryFactory
@@ -62,58 +57,56 @@ class Book extends \Magento\Framework\View\Element\Template
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param CustomerRepositoryInterface $customerRepository
+     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param AddressRepositoryInterface $addressRepository
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param \Magento\Customer\Model\Address\Config $addressConfig
      * @param Mapper $addressMapper
      * @param array $data
-     * @param \Magento\Customer\Model\ResourceModel\Address\Collection $addressesCollection
+     * @param AddressCollectionFactory|null $addressCollectionFactory
      * @param CountryFactory|null $countryFactory
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        CustomerRepositoryInterface $customerRepository,
+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository = null,
         AddressRepositoryInterface $addressRepository,
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
         \Magento\Customer\Model\Address\Config $addressConfig,
         Mapper $addressMapper,
         array $data = [],
-        \Magento\Customer\Model\ResourceModel\Address\CollectionFactory $addressesCollectionFactory = null,
+        AddressCollectionFactory $addressCollectionFactory = null,
         CountryFactory $countryFactory = null
     ) {
-        $this->customerRepository = $customerRepository;
         $this->currentCustomer = $currentCustomer;
         $this->addressRepository = $addressRepository;
         $this->_addressConfig = $addressConfig;
         $this->addressMapper = $addressMapper;
-        $this->addressesCollectionFactory = $addressesCollectionFactory ?: ObjectManager::getInstance()
-            ->get(\Magento\Customer\Model\ResourceModel\Address\CollectionFactory::class);
+        $this->addressCollectionFactory = $addressCollectionFactory ?: ObjectManager::getInstance()
+            ->get(AddressCollectionFactory::class);
         $this->countryFactory = $countryFactory ?: ObjectManager::getInstance()->get(CountryFactory::class);
 
         parent::__construct($context, $data);
     }
 
     /**
+     * Prepare the Address Book section layout
+     *
      * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _prepareLayout()
     {
         $this->pageConfig->getTitle()->set(__('Address Book'));
         parent::_prepareLayout();
-        $addresses = $this->getAddressesCollection();
-        if (null !== $addresses) {
-            $pager = $this->getLayout()->createBlock(
-                \Magento\Theme\Block\Html\Pager::class,
-                'customer.addresses.pager'
-            )->setCollection($this->getAddressesCollection());
-            $this->setChild('pager', $pager);
-            $this->getAddressesCollection()->load();
-        }
+        $this->preparePager();
         return $this;
     }
 
     /**
+     * Generate and return "New Address" URL
+     *
      * @return string
      */
     public function getAddAddressUrl()
@@ -122,6 +115,8 @@ public function getAddAddressUrl()
     }
 
     /**
+     * Generate and return "Back" URL
+     *
      * @return string
      */
     public function getBackUrl()
@@ -133,6 +128,8 @@ public function getBackUrl()
     }
 
     /**
+     * Generate and return "Delete" URL
+     *
      * @return string
      */
     public function getDeleteUrl()
@@ -141,6 +138,9 @@ public function getDeleteUrl()
     }
 
     /**
+     * Generate and return "Edit Address" URL.
+     * Address ID passed in parameters
+     *
      * @param int $addressId
      * @return string
      */
@@ -150,7 +150,10 @@ public function getAddressEditUrl($addressId)
     }
 
     /**
+     * Determines is the address primary (billing or shipping)
+     *
      * @return bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function hasPrimaryAddress()
     {
@@ -158,12 +161,16 @@ public function hasPrimaryAddress()
     }
 
     /**
+     * Get current additional customer addresses
+     * Will return array of address interfaces if customer have additional addresses and false in other case.
+     *
      * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getAdditionalAddresses()
     {
         try {
-            $addresses = $this->getAddressesCollection();
+            $addresses = $this->getAddressCollection();
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             return false;
         }
@@ -181,6 +188,7 @@ public function getAdditionalAddresses()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
+     * @deprecated Not used anymore as addresses are showed as a grid
      */
     public function getAddressHtml(\Magento\Customer\Api\Data\AddressInterface $address = null)
     {
@@ -193,38 +201,57 @@ public function getAddressHtml(\Magento\Customer\Api\Data\AddressInterface $addr
     }
 
     /**
-     * @return \Magento\Customer\Api\Data\CustomerInterface|null
+     * Get current customer
+     * Check if customer is stored in current object and return it
+     * or get customer by current customer ID through repository
+     *
+     * @return \Magento\Customer\Api\Data\CustomerInterface
      */
     public function getCustomer()
     {
         $customer = $this->getData('customer');
         if ($customer === null) {
-            try {
-                $customer = $this->customerRepository->getById($this->currentCustomer->getCustomerId());
-            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-                return null;
-            }
+            $customer = $this->currentCustomer->getCustomer();
             $this->setData('customer', $customer);
         }
         return $customer;
     }
 
     /**
-     * @return int|null
+     * Get default billing address
+     * Return address string if address found and null of not
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getDefaultBilling()
     {
         $customer = $this->getCustomer();
-        if ($customer === null) {
-            return null;
-        } else {
-            return $customer->getDefaultBilling();
-        }
+
+        return $customer->getDefaultBilling();
     }
 
+
     /**
+     * Get default shipping address
+     * Return address string if address found and null of not
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getDefaultShipping()
+    {
+        $customer = $this->getCustomer();
+
+        return $customer->getDefaultShipping();
+    }
+
+    /**
+     * Get customer address by ID
+     *
      * @param int $addressId
      * @return \Magento\Customer\Api\Data\AddressInterface|null
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getAddressById($addressId)
     {
@@ -235,23 +262,10 @@ public function getAddressById($addressId)
         }
     }
 
-    /**
-     * @return int|null
-     */
-    public function getDefaultShipping()
-    {
-        $customer = $this->getCustomer();
-        if ($customer === null) {
-            return null;
-        } else {
-            return $customer->getDefaultShipping();
-        }
-    }
-
     /**
      * Get one string street address from "two fields" array or just returns string if it was passed in parameters
      *
-     * @param $street
+     * @param string|array $street
      * @return string
      */
     public function getStreetAddress($street)
@@ -263,6 +277,8 @@ public function getStreetAddress($street)
     }
 
     /**
+     * Get pager section HTML code
+     *
      * @return string
      */
     public function getPagerHtml()
@@ -274,7 +290,7 @@ public function getPagerHtml()
      * Get country name by $countryId
      * Using \Magento\Directory\Model\Country to get country name by $countryId
      *
-     * @param $countryId
+     * @param string $countryId
      * @return string
      */
     public function getCountryById($countryId)
@@ -284,25 +300,40 @@ public function getCountryById($countryId)
         return $country->loadByCode($countryId)->getName();
     }
 
+    /**
+     * Get pager layout
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function preparePager()
+    {
+        $addressCollection = $this->getAddressCollection();
+        if (null !== $addressCollection) {
+            $pager = $this->getLayout()->createBlock(
+                \Magento\Theme\Block\Html\Pager::class,
+                'customer.addresses.pager'
+            )->setCollection($addressCollection);
+            $this->setChild('pager', $pager);
+        }
+    }
+
     /**
      * Get customer addresses collection.
      * Filters collection by customer id
      *
      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
      */
-    private function getAddressesCollection()
+    private function getAddressCollection()
     {
-        if (null === $this->addressesCollection) {
+        if (null === $this->addressCollection) {
             /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
-            $collection = $this->addressesCollectionFactory->create();
-            $collection->setOrder(
-                'entity_id',
-                'desc'
-            );
-            $collection->setCustomerFilter([$this->currentCustomer->getCustomer()->getId()]);
-            $this->addressesCollection = $collection;
+            $collection = $this->addressCollectionFactory->create();
+            $collection->setOrder('entity_id', 'desc')
+                ->setCustomerFilter([$this->getCustomer()->getId()]);
+            $this->addressCollection = $collection;
         }
-
-        return $this->addressesCollection;
+        return $this->addressCollection;
     }
+
 }

From 734e95e244d4fa637a5aa418445752b8b10ca5eb Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 2 Jan 2019 16:47:56 +0200
Subject: [PATCH 441/932] Fix functional test.

---
 .../Adminhtml/Product/Edit/Section/Options.php  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php
index 2ac4fb81ae604..d591f3b44462a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php
@@ -403,4 +403,21 @@ public function getFileOptionElements()
     {
         return $this->_rootElement->getElements($this->hintMessage);
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _fill(array $fields, SimpleElement $element = null)
+    {
+        $context = ($element === null) ? $this->_rootElement : $element;
+        foreach ($fields as $name => $field) {
+            $element = $this->getElement($context, $field);
+            if (!$element->isDisabled()) {
+                $element->getContext()->hover();
+                $element->setValue($field['value']);
+            } else {
+                throw new \Exception("Unable to set value to field '$name' as it's disabled.");
+            }
+        }
+    }
 }

From 8b623a428414793298b4386d56bd288c2ed9e868 Mon Sep 17 00:00:00 2001
From: Tiago Sampaio <tiago@tiagosampaio.com>
Date: Wed, 2 Jan 2019 12:58:40 -0200
Subject: [PATCH 442/932] Added constants to unit codes to make it easier to
 reuse it if necessary.

---
 .../Directory/Model/Config/Source/WeightUnit.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
index 4e2758b362a43..6c0c50d620146 100644
--- a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
+++ b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Directory\Model\Config\Source;
 
 /**
@@ -13,11 +14,24 @@
  */
 class WeightUnit implements \Magento\Framework\Option\ArrayInterface
 {
+    /**
+     * @var string
+     */
+    const CODE_LBS = 'lbs';
+
+    /**
+     * @var string
+     */
+    const CODE_KGS = 'kgs';
+
     /**
      * {@inheritdoc}
      */
     public function toOptionArray()
     {
-        return [['value' => 'lbs', 'label' => __('lbs')], ['value' => 'kgs', 'label' => __('kgs')]];
+        return [
+            ['value' => self::CODE_LBS, 'label' => __('lbs')],
+            ['value' => self::CODE_KGS, 'label' => __('kgs')]
+        ];
     }
 }

From be1a04c2bba580faea0124b206c17c885bb686ad Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Wed, 2 Jan 2019 10:28:13 -0600
Subject: [PATCH 443/932] MC-5554: [GraphQL] Not valid scenario's name in
 GraphQL PAT builds

---
 setup/performance-toolkit/benchmark.jmx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
index 5294b16f41007..e7e3087419b55 100644
--- a/setup/performance-toolkit/benchmark.jmx
+++ b/setup/performance-toolkit/benchmark.jmx
@@ -41118,7 +41118,7 @@ if (totalCount == null) {
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n    products(search: \"color\") {\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n                items_count\n                ... on SwatchLayerFilterItemInterface {\n                    swatch_data {\n                        type\n                        value\n                    }\n                }\n            }\n        }\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n                    weight\n                  }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n    products(search: \"Option 1\") {\n        filters {\n            name\n            filter_items_count\n            request_var\n            filter_items {\n                label\n                value_string\n                items_count\n                ... on SwatchLayerFilterItemInterface {\n                    swatch_data {\n                        type\n                        value\n                    }\n                }\n            }\n        }\n        total_count\n        items {\n            attribute_set_id\n            categories\n            {\n                id\n                position\n            }\n            country_of_manufacture\n            created_at\n            description {\n                html\n            }\n            gift_message_available\n            id\n            image\n            {\n                url\n                label\n            }\n            meta_description\n            meta_keyword\n            meta_title\n            media_gallery_entries\n            {\n                disabled\n                file\n                id\n                label\n                media_type\n                position\n                types\n                content\n                {\n                    base64_encoded_data\n                    type\n                    name\n                }\n                video_content\n                {\n                    media_type\n                    video_description\n                    video_metadata\n                    video_provider\n                    video_title\n                    video_url\n                }\n            }\n            name\n            new_from_date\n            new_to_date\n            options_container\n            ... on CustomizableProductInterface {\n                options\n                {\n                    title\n                    required\n                    sort_order\n                }\n            }\n            \n            price {\n                minimalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                maximalPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n                regularPrice {\n                    amount {\n                        value\n                        currency\n                    }\n                    adjustments {\n                        amount {\n                            value\n                            currency\n                        }\n                        code\n                        description\n                    }\n                }\n            }\n            product_links\n            {\n                link_type\n                linked_product_sku\n                linked_product_type\n                position\n                sku\n            }\n            short_description {\n                html\n            }\n            sku\n            small_image\n            {\n                url\n                label\n            }\n            special_from_date\n            special_price\n            special_to_date\n            swatch_image\n            thumbnail\n            {\n                url\n                label\n            }\n            tier_price\n            tier_prices\n            {\n                customer_group_id\n                percentage_value\n                qty\n                value\n                website_id\n            }\n            type_id\n            updated_at\n            url_key\n            url_path\n            websites { id name code sort_order default_group_id is_default }\n            ... on PhysicalProductInterface {\n                    weight\n                  }\n            ... on ConfigurableProduct {\n                configurable_options {\n                    id\n                    attribute_id\n                    label\n                    position\n                    use_default\n                    attribute_code\n                    values {\n                        value_index\n                        label\n                        store_label\n                        default_label\n                        use_default_value\n                    }\n                    product_id\n                }\n                variants {\n                    product {\n                        ... on PhysicalProductInterface {\n                            weight\n                        }\n                        sku\n                        color\n                        attribute_set_id\n                        categories\n                        {\n                            id\n                            position\n                        }\n                        country_of_manufacture\n                        created_at\n                        description {\n                            html\n                        }\n                        gift_message_available\n                        id\n                        image\n                        {\n                            url\n                            label\n                        }\n                        meta_description\n                        meta_keyword\n                        meta_title\n                        media_gallery_entries\n                        {\n                            disabled\n                            file\n                            id\n                            label\n                            media_type\n                            position\n                            types\n                            content\n                            {\n                                base64_encoded_data\n                                type\n                                name\n                            }\n                            video_content\n                            {\n                                media_type\n                                video_description\n                                video_metadata\n                                video_provider\n                                video_title\n                                video_url\n                            }\n                        }\n                        name\n                        new_from_date\n                        new_to_date\n                        options_container\n                        ... on CustomizableProductInterface {\n                            options\n                            {\n                                title\n                                required\n                                sort_order\n                            }\n                        }\n                        \n                        price {\n                            minimalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            maximalPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                            regularPrice {\n                                amount {\n                                    value\n                                    currency\n                                }\n                                adjustments {\n                                    amount {\n                                        value\n                                        currency\n                                    }\n                                    code\n                                    description\n                                }\n                            }\n                        }\n                        product_links\n                        {\n                            link_type\n                            linked_product_sku\n                            linked_product_type\n                            position\n                            sku\n                        }\n                        short_description {\n                            html\n                        }\n                        sku\n                        small_image\n                        {\n                            url\n                            label\n                        }\n                        special_from_date\n                        special_price\n                        special_to_date\n                        swatch_image\n                        thumbnail\n                        {\n                            url\n                            label\n                        }\n                        tier_price\n                        tier_prices\n                        {\n                            customer_group_id\n                            percentage_value\n                            qty\n                            value\n                            website_id\n                        }\n                        type_id\n                        updated_at\n                        url_key\n                        url_path\n                        websites { id name code sort_order default_group_id is_default }\n\n\n                    }\n                    attributes {\n                        label\n                        code\n                        value_index\n                    }\n                }\n            }\n        }\n    }\n}","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>

From 34de9fe3caeee548cef5323c7e58cca2a275287b Mon Sep 17 00:00:00 2001
From: Yevhen Sentiabov <isentiabov@magento.com>
Date: Wed, 2 Jan 2019 19:40:34 +0200
Subject: [PATCH 444/932] MAGETWO-97403: Order Summary doesn't show Qty of
 Bundle Product ordered

  - Added ordered qty for a bundle product
---
 .../sales/order/items/renderer.phtml          | 141 ++++++++++--------
 1 file changed, 81 insertions(+), 60 deletions(-)

diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
index 063d66edb9e70..74e1c5f874954 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
@@ -7,95 +7,111 @@
 // @codingStandardsIgnoreFile
 
 /** @var $block \Magento\Bundle\Block\Sales\Order\Items\Renderer */
+$parentItem = $block->getItem();
+$items = array_merge([$parentItem], $parentItem->getChildrenItems());
+$index = 0;
+$prevOptionId = '';
 ?>
-<?php $parentItem = $block->getItem() ?>
-<?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
-<?php $_index = 0 ?>
 
-<?php $_prevOptionId = '' ?>
+<?php foreach ($items as $item): ?>
 
-<?php foreach ($items as $_item): ?>
-
-    <?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
-        <?php $_showlastRow = true ?>
+    <?php if ($block->getItemOptions()
+        || $parentItem->getDescription()
+        || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem)
+        && $parentItem->getGiftMessageId()): ?>
+        <?php $showLastRow = true; ?>
     <?php else: ?>
-        <?php $_showlastRow = false ?>
+        <?php $showLastRow = false; ?>
     <?php endif; ?>
 
-    <?php if ($_item->getParentItem()): ?>
-        <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']): ?>
+    <?php if ($item->getParentItem()): ?>
+        <?php $attributes = $block->getSelectionAttributes($item) ?>
+        <?php if ($prevOptionId != $attributes['option_id']): ?>
             <tr class="options-label">
-                <td class="col label" colspan="5"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></td>
+                <td class="col label" colspan="5"><?= $block->escapeHtml($attributes['option_label']); ?></td>
             </tr>
-            <?php $_prevOptionId = $attributes['option_id'] ?>
+            <?php $prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
-    <?php if (!$_item->getParentItem()): ?>
-        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
-            <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
+<tr id="order-item-row-<?= /* @noEscape */ $item->getId() ?>"
+    class="<?php if ($item->getParentItem()): ?>
+        item-options-container
+    <?php else: ?>
+        item-parent
+    <?php endif; ?>"
+    <?php if ($item->getParentItem()): ?>
+        data-th="<?= $block->escapeHtml($attributes['option_label']); ?>"
+    <?php endif; ?>>
+    <?php if (!$item->getParentItem()): ?>
+        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')); ?>">
+            <strong class="product name product-item-name"><?= $block->escapeHtml($item->getName()); ?></strong>
         </td>
     <?php else: ?>
-        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
+        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')); ?>">
+            <?= $block->getValueHtml($item); ?>
+        </td>
     <?php endif; ?>
-    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($_item->getSku()) ?></td>
-    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
-        <?php if (!$_item->getParentItem()): ?>
-            <?= $block->getItemPriceHtml() ?>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')); ?>">
+        <?= /* @noEscape */ $block->prepareSku($item->getSku()); ?>
+    </td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')); ?>">
+        <?php if (!$item->getParentItem()): ?>
+            <?= /* @noEscape */ $block->getItemPriceHtml(); ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Quantity')) ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Quantity')); ?>">
         <?php if (
-        ($_item->getParentItem() && $block->isChildCalculated()) ||
-        (!$_item->getParentItem() && !$block->isChildCalculated()) || ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately())):?>
+        ($item->getParentItem() && $block->isChildCalculated()) ||
+        (!$item->getParentItem() && !$block->isChildCalculated()) ||
+        ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately())): ?>
             <ul class="items-qty">
         <?php endif; ?>
-        <?php if (($_item->getParentItem() && $block->isChildCalculated()) ||
-            (!$_item->getParentItem() && !$block->isChildCalculated())): ?>
-            <?php if ($_item->getQtyOrdered() > 0): ?>
+        <?php if (($item->getParentItem() && $block->isChildCalculated()) ||
+            (!$item->getParentItem() && !$block->isChildCalculated())): ?>
+            <?php if ($item->getQtyOrdered() > 0): ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Ordered')); ?></span>
+                    <span class="content"><?= /* @noEscape */ $item->getQtyOrdered() * 1; ?></span>
                 </li>
             <?php endif; ?>
-            <?php if ($_item->getQtyShipped() > 0 && !$block->isShipmentSeparately()): ?>
+            <?php if ($item->getQtyShipped() > 0 && !$block->isShipmentSeparately()): ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Shipped')); ?></span>
+                    <span class="content"><?= /* @noEscape */ $item->getQtyShipped() * 1; ?></span>
                 </li>
             <?php endif; ?>
-            <?php if ($_item->getQtyCanceled() > 0): ?>
+            <?php if ($item->getQtyCanceled() > 0): ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Canceled')); ?></span>
+                    <span class="content"><?= /* @noEscape */ $item->getQtyCanceled() * 1; ?></span>
                 </li>
             <?php endif; ?>
-            <?php if ($_item->getQtyRefunded() > 0): ?>
+            <?php if ($item->getQtyRefunded() > 0): ?>
                 <li class="item">
-                    <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
-                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></span>
+                    <span class="title"><?= $block->escapeHtml(__('Refunded')); ?></span>
+                    <span class="content"><?= /* @noEscape */ $item->getQtyRefunded() * 1; ?></span>
                 </li>
             <?php endif; ?>
-        <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately()): ?>
+        <?php elseif ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately()): ?>
             <li class="item">
-                <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
-                <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></span>
+                <span class="title"><?= $block->escapeHtml(__('Shipped')); ?></span>
+                <span class="content"><?= /* @noEscape */ $item->getQtyShipped() * 1; ?></span>
             </li>
         <?php else: ?>
-            &nbsp;
+            <span class="content"><?= /* @noEscape */ $parentItem->getQtyOrdered() * 1; ?></span>
         <?php endif; ?>
         <?php if (
-        ($_item->getParentItem() && $block->isChildCalculated()) ||
-        (!$_item->getParentItem() && !$block->isChildCalculated()) || ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately())):?>
+        ($item->getParentItem() && $block->isChildCalculated()) ||
+        (!$item->getParentItem() && !$block->isChildCalculated()) ||
+        ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately())):?>
             </ul>
         <?php endif; ?>
     </td>
     <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
-        <?php if (!$_item->getParentItem()): ?>
-            <?= $block->getItemRowTotalHtml() ?>
+        <?php if (!$item->getParentItem()): ?>
+            <?= /* @noEscape */ $block->getItemRowTotalHtml(); ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
@@ -103,33 +119,38 @@
 </tr>
 <?php endforeach; ?>
 
-<?php if ($_showlastRow && (($_options = $block->getItemOptions()) || $block->escapeHtml($_item->getDescription()))): ?>
+<?php if ($showLastRow && (($options = $block->getItemOptions()) || $block->escapeHtml($item->getDescription()))): ?>
 <tr>
     <td class="col options" colspan="5">
-        <?php if ($_options = $block->getItemOptions()): ?>
+        <?php if ($options = $block->getItemOptions()): ?>
             <dl class="item-options">
-                <?php foreach ($_options as $_option) : ?>
-                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                <?php foreach ($options as $option) : ?>
+                    <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <?php if (!$block->getPrintStatus()): ?>
-                        <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                        <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
-                            <?php if (isset($_formatedOptionValue['full_view'])): ?>
+                        <?php $formattedOptionValue = $block->getFormatedOptionValue($option) ?>
+                        <dd<?php if (isset($formattedOptionValue['full_view'])): ?>
+                            class="tooltip wrapper"
+                        <?php endif; ?>>
+                            <?= /* @noEscape */ $formattedOptionValue['value'] ?>
+                            <?php if (isset($formattedOptionValue['full_view'])): ?>
                                 <div class="tooltip content">
                                     <dl class="item options">
-                                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
+                                        <dt><?= $block->escapeHtml($option['label']); ?></dt>
+                                        <dd><?= /* @noEscape */ $formattedOptionValue['full_view']; ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
                         </dd>
                     <?php else: ?>
-                        <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                        <dd><?= $block->escapeHtml((isset($option['print_value']) ?
+                                $option['print_value'] :
+                                $option['value'])); ?>
+                        </dd>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
-        <?= $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($item->getDescription()); ?>
     </td>
 </tr>
 <?php endif; ?>

From e6251c52c034732da18cba735002de1ab8c81ac9 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Wed, 2 Jan 2019 14:17:21 -0600
Subject: [PATCH 445/932] MC-5648: Catalog product list widget Viewport Issues:
 Add to cart buttons are hidden on mobile & Review Links Clash With Other
 Elements

---
 .../luma/Magento_Catalog/web/css/source/module/_listings.less   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index f271f472f2cd8..599b3ae81def9 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -407,8 +407,8 @@
     .page-layout-1column .block.widget .products-grid .product-item,
     .page-layout-3columns .block.widget .products-grid .product-item {
         .product-item-inner {
-            margin: 9px 0 0 -1px;
             box-shadow: 3px 6px 4px 0 rgba(0, 0, 0, .3);
+            margin: 9px 0 0 -1px;
         }
     }
 }

From 686a6a57368dbe731aab54080df8dd4176577e9b Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Wed, 2 Jan 2019 14:45:55 -0600
Subject: [PATCH 446/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 app/code/Magento/Customer/Block/Address/Book.php               | 2 +-
 app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 62810c7a677cb..0409a5af298ea 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -219,7 +219,7 @@ public function getCustomer()
 
     /**
      * Get default billing address
-     * Return address string if address found and null of not
+     * Return address string if address found and null if not
      *
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php
index 8da1dc9114944..8402a9331b471 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php
@@ -70,7 +70,7 @@ protected function setUp()
             \Magento\Customer\Block\Address\Book::class,
             [
                 'countryFactory' => $this->countryFactory,
-                'addressesCollectionFactory' => $this->addressCollectionFactory,
+                'addressCollectionFactory' => $this->addressCollectionFactory,
                 'currentCustomer' => $this->currentCustomer,
                 'pageConfig' => $this->pageConfig
             ]
@@ -127,7 +127,6 @@ public function testGetPagerHtml()
             ->willReturnSelf();
         $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
             ->willReturnSelf();
-        $addressCollection->expects($this->atLeastOnce())->method('load');
         $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
             ->willReturn($addressCollection);
         $block->expects($this->atLeastOnce())->method('setCollection')->with($addressCollection)->willReturnSelf();

From d08ce919585c9f3e9020662eaf0948df260fbb4a Mon Sep 17 00:00:00 2001
From: Patrick McLain <pat@pmclain.com>
Date: Wed, 2 Jan 2019 20:19:07 -0500
Subject: [PATCH 447/932] Add missing throws to docblock

Document the `InputException` thrown https://github.com/magento/magento2/blob/2.3.0/app/code/Magento/Catalog/Model/CategoryLinkRepository.php#L81
---
 .../Magento/Catalog/Api/CategoryLinkRepositoryInterface.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
index 30ac06107ba1d..7f6fccf29c600 100644
--- a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
@@ -32,6 +32,7 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\InputException
      */
     public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
 
@@ -44,6 +45,7 @@ public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $p
      *
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\InputException
      */
     public function deleteByIds($categoryId, $sku);
 }

From 34416b1c6840ee8f794339f4f12bd214af8f4911 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Wed, 2 Jan 2019 22:05:17 -0600
Subject: [PATCH 448/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 .../Magento/Customer/Block/Address/Book.php   |   2 +-
 .../frontend/templates/address/book.phtml     |   2 +-
 .../Customer/Block/Address/BookTest.php       | 115 +++++++++++-------
 3 files changed, 70 insertions(+), 49 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 0409a5af298ea..d6d728b7cf013 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -177,7 +177,7 @@ public function getAdditionalAddresses()
         $primaryAddressIds = [$this->getDefaultBilling(), $this->getDefaultShipping()];
         foreach ($addresses as $address) {
             if (!in_array($address->getId(), $primaryAddressIds)) {
-                $additional[] = $address;
+                $additional[] = $address->getDataModel();
             }
         }
         return empty($additional) ? false : $additional;
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index 9e256d7d09ff1..8c6d8e5985201 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -92,7 +92,7 @@
                             <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->getStreetAddress($address->getStreet()) ?></td>
                             <td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= /* @escapeNotVerified */ $address->getCity() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= /* @escapeNotVerified */ $block->getCountryById($address->getCountryId()) ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion()->getRegion() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= /* @escapeNotVerified */ $address->getPostcode() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= /* @escapeNotVerified */ $address->getTelephone() ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
index 4c31fb740c57e..b5ae01b32fada 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
@@ -11,9 +11,9 @@
 class BookTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Customer\Block\Address\Book
+     * @var \Magento\Framework\View\LayoutInterface
      */
-    protected $_block;
+    private $layout;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
@@ -32,15 +32,8 @@ protected function setUp()
 
         $this->currentCustomer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get(\Magento\Customer\Helper\Session\CurrentCustomer::class);
-        /** @var \Magento\Framework\View\LayoutInterface $layout */
-        $layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
-        $layout->setBlock('head', $blockMock);
-        $this->_block = $layout
-            ->createBlock(
-                \Magento\Customer\Block\Address\Book::class,
-                '',
-                ['currentCustomer' => $this->currentCustomer]
-            );
+        $this->layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
+        $this->layout->setBlock('head', $blockMock);
     }
 
     protected function tearDown()
@@ -52,11 +45,17 @@ protected function tearDown()
         $customerRegistry->remove(1);
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoAppIsolation enabled
+     */
     public function testGetAddressEditUrl()
     {
+        $bookBlock = $this->createBlockForCustomer(1);
+
         $this->assertEquals(
             'http://localhost/index.php/customer/address/edit/id/1/',
-            $this->_block->getAddressEditUrl(1)
+            $bookBlock->getAddressEditUrl(1)
         );
     }
 
@@ -65,109 +64,114 @@ public function testGetAddressEditUrl()
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
      * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
      * @dataProvider hasPrimaryAddressDataProvider
+     * @param int $customerId
+     * @param bool $expected
+     * @magentoAppIsolation enabled
      */
     public function testHasPrimaryAddress($customerId, $expected)
     {
-        if (!empty($customerId)) {
-            $this->currentCustomer->setCustomerId($customerId);
-        }
-        $this->assertEquals($expected, $this->_block->hasPrimaryAddress());
+        $bookBlock = $this->createBlockForCustomer($customerId);
+        $this->assertEquals($expected, $bookBlock->hasPrimaryAddress());
     }
 
     public function hasPrimaryAddressDataProvider()
     {
-        return ['0' => [0, false], '1' => [1, true], '5' => [5, false]];
+        return ['1' => [1, true], '5' => [5, false]];
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoAppIsolation enabled
      */
     public function testGetAdditionalAddresses()
     {
-        $this->currentCustomer->setCustomerId(1);
-        $this->assertNotNull($this->_block->getAdditionalAddresses());
-        $this->assertCount(1, $this->_block->getAdditionalAddresses());
+        $bookBlock = $this->createBlockForCustomer(1);
+        $this->assertNotNull($bookBlock->getAdditionalAddresses());
+        $this->assertCount(1, $bookBlock->getAdditionalAddresses());
         $this->assertInstanceOf(
             \Magento\Customer\Api\Data\AddressInterface::class,
-            $this->_block->getAdditionalAddresses()[0]
+            $bookBlock->getAdditionalAddresses()[0]
         );
-        $this->assertEquals(2, $this->_block->getAdditionalAddresses()[0]->getId());
+        $this->assertEquals(2, $bookBlock->getAdditionalAddresses()[0]->getId());
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
      * @dataProvider getAdditionalAddressesDataProvider
+     * @magentoAppIsolation enabled
      */
     public function testGetAdditionalAddressesNegative($customerId, $expected)
     {
-        if (!empty($customerId)) {
-            $this->currentCustomer->setCustomerId($customerId);
-        }
-        $this->assertEquals($expected, $this->_block->getAdditionalAddresses());
+        $bookBlock = $this->createBlockForCustomer($customerId);
+        $this->currentCustomer->setCustomerId($customerId);
+        $this->assertEquals($expected, $bookBlock->getAdditionalAddresses());
     }
 
     public function getAdditionalAddressesDataProvider()
     {
-        return ['0' => [0, false], '5' => [5, false]];
+        return ['5' => [5, false]];
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoAppIsolation enabled
      */
     public function testGetAddressHtml()
     {
+        $bookBlock = $this->createBlockForCustomer(1);
         $expected = "John Smith<br />\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM,  Alabama, 75477<br />" .
             "\nUnited States<br />\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
         $address = Bootstrap::getObjectManager()->get(
             \Magento\Customer\Api\AddressRepositoryInterface::class
         )->getById(1);
-        $html = $this->_block->getAddressHtml($address);
+        $html = $bookBlock->getAddressHtml($address);
         $this->assertEquals($expected, $html);
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+     * @magentoAppIsolation enabled
+     */
     public function testGetAddressHtmlWithoutAddress()
     {
-        $this->assertEquals('', $this->_block->getAddressHtml(null));
+        $bookBlock = $this->createBlockForCustomer(5);
+        $this->assertEquals('', $bookBlock->getAddressHtml(null));
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoAppIsolation enabled
      */
     public function testGetCustomer()
     {
+        $bookBlock = $this->createBlockForCustomer(1);
         /** @var CustomerRepositoryInterface $customerRepository */
         $customerRepository = Bootstrap::getObjectManager()->get(
             \Magento\Customer\Api\CustomerRepositoryInterface::class
         );
         $customer = $customerRepository->getById(1);
-
-        $this->currentCustomer->setCustomerId(1);
-        $object = $this->_block->getCustomer();
+        $object = $bookBlock->getCustomer();
         $this->assertEquals($customer, $object);
     }
 
-    public function testGetCustomerMissingCustomer()
-    {
-        $this->assertNull($this->_block->getCustomer());
-    }
-
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
      * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
      * @dataProvider getDefaultBillingDataProvider
+     * @magentoAppIsolation enabled
      */
     public function testGetDefaultBilling($customerId, $expected)
     {
-        $this->currentCustomer->setCustomerId($customerId);
-        $this->assertEquals($expected, $this->_block->getDefaultBilling());
+        $bookBlock = $this->createBlockForCustomer($customerId);
+        $this->assertEquals($expected, $bookBlock->getDefaultBilling());
     }
 
     public function getDefaultBillingDataProvider()
     {
-        return ['0' => [0, null], '1' => [1, 1], '5' => [5, null]];
+        return ['1' => [1, 1], '5' => [5, null]];
     }
 
     /**
@@ -175,27 +179,44 @@ public function getDefaultBillingDataProvider()
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
      * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
      * @dataProvider getDefaultShippingDataProvider
+     * @magentoAppIsolation enabled
      */
     public function testGetDefaultShipping($customerId, $expected)
     {
-        if (!empty($customerId)) {
-            $this->currentCustomer->setCustomerId($customerId);
-        }
-        $this->assertEquals($expected, $this->_block->getDefaultShipping());
+        $bookBlock = $this->createBlockForCustomer($customerId);
+        $this->currentCustomer->setCustomerId($customerId);
+        $this->assertEquals($expected, $bookBlock->getDefaultShipping());
     }
 
     public function getDefaultShippingDataProvider()
     {
-        return ['0' => [0, null], '1' => [1, 1], '5' => [5, null]];
+        return ['1' => [1, 1], '5' => [5, null]];
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoAppIsolation enabled
      */
     public function testGetAddressById()
     {
-        $this->assertInstanceOf(\Magento\Customer\Api\Data\AddressInterface::class, $this->_block->getAddressById(1));
-        $this->assertNull($this->_block->getAddressById(5));
+        $bookBlock = $this->createBlockForCustomer(1);
+        $this->assertInstanceOf(\Magento\Customer\Api\Data\AddressInterface::class, $bookBlock->getAddressById(1));
+    }
+
+    /**
+     * Create address book block for customer
+     *
+     * @param int $customerId
+     * @return \Magento\Framework\View\Element\BlockInterface
+     */
+    private function createBlockForCustomer($customerId)
+    {
+        $this->currentCustomer->setCustomerId($customerId);
+        return $this->layout->createBlock(
+            \Magento\Customer\Block\Address\Book::class,
+            '',
+            ['currentCustomer' => $this->currentCustomer]
+        );
     }
 }

From 39bf467860a3a88bf7fa78fdf6ed8183649e14d7 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 3 Jan 2019 12:22:47 +0530
Subject: [PATCH 449/932] Update
 lib/internal/Magento/Framework/Serialize/Serializer/Json.php

Co-Authored-By: vinogcs <vinogcs@users.noreply.github.com>
---
 lib/internal/Magento/Framework/Serialize/Serializer/Json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index 05d1f299ce761..ddcbf86614583 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -39,5 +39,5 @@ public function unserialize($string)
             throw new \InvalidArgumentException("Unable to unserialize value. Error: " . json_last_error_msg());
         }
         return $result;
-    }    
+    }
 }

From 76ca463a96e3e215cae08a1acacef8eea24cdf44 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 2 Jan 2019 13:28:05 +0200
Subject: [PATCH 450/932] magento/magento2#12549: Payment method option is not
 showing under shopping cart rules condition tab.

---
 app/code/Magento/SalesRule/Model/Rule/Condition/Address.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
index fd5953697c7db..89ec2b84572fc 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\SalesRule\Model\Rule\Condition;
 
+/**
+ * Address rule condition data model.
+ */
 class Address extends \Magento\Rule\Model\Condition\AbstractCondition
 {
     /**
@@ -61,6 +64,7 @@ public function loadAttributeOptions()
             'base_subtotal' => __('Subtotal'),
             'total_qty' => __('Total Items Quantity'),
             'weight' => __('Total Weight'),
+            'payment_method' => __('Payment Method'),
             'shipping_method' => __('Shipping Method'),
             'postcode' => __('Shipping Postcode'),
             'region' => __('Shipping Region'),

From a1d3299191805ea5fbee133436fe82ccb6b9a5cd Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 3 Jan 2019 12:51:56 +0200
Subject: [PATCH 451/932] ENGCOM-3780: Static test fix.

---
 .../Magento/Catalog/Api/CategoryLinkRepositoryInterface.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
index 7f6fccf29c600..34656d522a72c 100644
--- a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
@@ -39,7 +39,7 @@ public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $p
     /**
      * Remove the product assignment from the category by category id and sku
      *
-     * @param string $sku
+     * @param string $categoryId
      * @param string $sku
      * @return bool will returned True if products successfully deleted
      *

From e2d6f1aead1ffa5ae5818a7f0c8c7bae5596423f Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 3 Jan 2019 13:09:11 +0200
Subject: [PATCH 452/932] ENGCOM-3774: Static test fix.

---
 app/code/Magento/Directory/Model/Config/Source/WeightUnit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
index 6c0c50d620146..97d22633af03c 100644
--- a/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
+++ b/app/code/Magento/Directory/Model/Config/Source/WeightUnit.php
@@ -25,7 +25,7 @@ class WeightUnit implements \Magento\Framework\Option\ArrayInterface
     const CODE_KGS = 'kgs';
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function toOptionArray()
     {

From 46a9ed54a43d2c3b0a112d5c09c9b34967dfdbfc Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 3 Jan 2019 14:24:46 +0200
Subject: [PATCH 453/932] Fix static tests.

---
 app/code/Magento/Checkout/Block/Onepage.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index 6beba481d4ec8..e01d5835b4cf0 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -50,6 +50,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
      * @param \Magento\Framework\Serialize\SerializerInterface $serializerInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -71,7 +72,7 @@ public function __construct(
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     public function getJsLayout()
     {
@@ -116,6 +117,8 @@ public function getBaseUrl()
     }
 
     /**
+     * Retrieve serialized checkout config.
+     *
      * @return bool|string
      * @since 100.2.0
      */

From 0ee1bc8c2a37d3815a7b4dd5fe8a4cfb90397ab5 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Thu, 3 Jan 2019 08:12:55 -0600
Subject: [PATCH 454/932] MC-6283: [System Configuration] Introduce the new
 settings related to Smart buttons

- add button configuration for express checkout
---
 .../Config/Source/ExpressButtons/Color.php    | 25 ++++++++
 .../Config/Source/ExpressButtons/Label.php    | 27 +++++++++
 .../Config/Source/ExpressButtons/Layout.php   | 23 +++++++
 .../Config/Source/ExpressButtons/Shape.php    | 23 +++++++
 .../Config/Source/ExpressButtons/Size.php     | 24 ++++++++
 .../etc/adminhtml/system/express_checkout.xml | 60 +++++++++++++++++++
 6 files changed, 182 insertions(+)
 create mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php
 create mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
 create mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php
 create mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
 create mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php

diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php
new file mode 100644
index 0000000000000..2c2a428fc7c4b
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
+
+class Color
+{
+    /**
+     * Button color source getter for Checkout Page
+     *
+     * @return array
+     */
+    public function getCheckoutColor()
+    {
+        return [
+            'gold' => __('Gold'),
+            'blue' => __('Blue'),
+            'silver' => __('Silver'),
+            'black' => __('Black')
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
new file mode 100644
index 0000000000000..c4e6b8de64e51
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
+
+class Label
+{
+    /**
+     * Button label source getter for Checkout Page
+     *
+     * @return array
+     */
+    public function getCheckoutLabel()
+    {
+        return [
+            'checkout' => __('Checkout'),
+            'credit' => __('Credit'),
+            'pay' => __('Pay'),
+            'buynow' => __('Buynow'),
+            'paypal' => __('Paypal'),
+            'installment' => __('Installment')
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php
new file mode 100644
index 0000000000000..30af9362f15a4
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
+
+class Layout
+{
+    /**
+     * Button layout source getter for Checkout Page
+     *
+     * @return array
+     */
+    public function getCheckoutLayout()
+    {
+        return [
+            'vertical' => __('Vertical'),
+            'horizontal' => __('Horizontal')
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
new file mode 100644
index 0000000000000..b5bfd4614e708
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
+
+class Shape
+{
+    /**
+     * Button shape source getter for Checkout Page
+     *
+     * @return array
+     */
+    public function getCheckoutShape()
+    {
+        return [
+            'pill' => __('Pill'),
+            'rect' => __('Rect')
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php
new file mode 100644
index 0000000000000..f89ea2c8c168f
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
+
+class Size
+{
+    /**
+     * Button size source getter for Checkout Page
+     *
+     * @return array
+     */
+    public function getCheckoutSize()
+    {
+        return [
+            'medium' => __('Medium'),
+            'large' => __('Large'),
+            'responsive' => __('Responsive')
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index bff076aad9cb5..a1b6e1f3ab622 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -645,6 +645,66 @@
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
+                    <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <label>Checkout Display</label>
+                        <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
+                        <attribute type="shared">1</attribute>
+                    </field>
+                    <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
+                        <label>PayPal Button - Checkout Page</label>
+                        <field id="checkout_page_button_customise" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
+                            <label>Customise Button</label>
+                            <comment><![CDATA[Customise the display of the PayPal button in the Checkout.]]></comment>
+                            <config_path>payment/paypal_express/checkout_page_button_customize</config_path>
+                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                            <attribute type="shared">1</attribute>
+                        </field>
+                        <field id="checkout_page_button_label" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                            <label>Label</label>
+                            <config_path>payment/paypal_express/checkout_page_button_label</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Label::getCheckoutLabel</source_model>
+                            <depends>
+                                <field id="checkout_page_button_customise">1</field>
+                            </depends>
+                            <attribute type="shared">1</attribute>
+                        </field>
+                        <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
+                            <label>Layout</label>
+                            <config_path>payment/paypal_express/checkout_page_button_layout</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Layout::getCheckoutLayout</source_model>
+                            <depends>
+                                <field id="checkout_page_button_customise">1</field>
+                            </depends>
+                            <attribute type="shared">1</attribute>
+                        </field>
+                        <field id="checkout_page_button_size" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
+                            <label>Size</label>
+                            <config_path>payment/paypal_express/checkout_page_button_size</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Size::getCheckoutSize</source_model>
+                            <depends>
+                                <field id="checkout_page_button_customise">1</field>
+                            </depends>
+                            <attribute type="shared">1</attribute>
+                        </field>
+                        <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
+                            <label>Shape</label>
+                            <config_path>payment/paypal_express/checkout_page_button_shape</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Shape::getCheckoutShape</source_model>
+                            <depends>
+                                <field id="checkout_page_button_customise">1</field>
+                            </depends>
+                            <attribute type="shared">1</attribute>
+                        </field>
+                        <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
+                            <label>Color</label>
+                            <config_path>payment/paypal_express/checkout_page_button_color</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Color::getCheckoutColor</source_model>
+                            <depends>
+                                <field id="checkout_page_button_customise">1</field>
+                            </depends>
+                            <attribute type="shared">1</attribute>
+                        </field>
+                    </group>
                 </group>
             </group>
         </group>

From 5aa28860dbabde770bff5643569d46522e85f15e Mon Sep 17 00:00:00 2001
From: olysenko <olysenko@magento.com>
Date: Thu, 3 Jan 2019 16:14:46 +0200
Subject: [PATCH 455/932] MAGETWO-96594: Image Position issue with Associated
 Products

- Skip failing tests
---
 .../Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
index c845a27773170..86755cb602ee2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml
@@ -17,6 +17,8 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-61717"/>
             <group value="Catalog"/>
+            <!-- skip due to MAGETWO-97424 -->
+            <group value="skip"/>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>

From 1ebcaae6f529042b51880fb67fb519ae8852bee6 Mon Sep 17 00:00:00 2001
From: Aditya Yadav <adityayadav@cedcoss.com>
Date: Thu, 3 Jan 2019 20:00:48 +0530
Subject: [PATCH 456/932] Fixed Typo of $extensionAttrbutes ->
 $extensionAttributes

---
 app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index c95b812705adc..9ec5369f8d7c0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -180,7 +180,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    private $extensionAttrbutes;
+    private $extensionAttributes;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -218,7 +218,7 @@ protected function setUp()
             \Magento\Framework\Module\Manager::class,
             ['isEnabled']
         );
-        $this->extensionAttrbutes = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class)
+        $this->extensionAttributes = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesInterface::class)
             ->setMethods(['getWebsiteIds', 'setWebsiteIds'])
             ->disableOriginalConstructor()
             ->getMock();

From 2f0c383b82156058fd1a814d81eee7fb6b3afee5 Mon Sep 17 00:00:00 2001
From: Eayshwary <31269039+Eayshwary@users.noreply.github.com>
Date: Thu, 3 Jan 2019 20:02:48 +0530
Subject: [PATCH 457/932] Typo corrected Acstract -> Abstract

---
 .../view/adminhtml/web/js/form/element/action-delete.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/action-delete.js b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/action-delete.js
index 97f978de47b60..f829c66c4011c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/action-delete.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/action-delete.js
@@ -5,10 +5,10 @@
 define([
     'underscore',
     'Magento_Ui/js/form/element/abstract'
-], function (_, Acstract) {
+], function (_, Abstract) {
     'use strict';
 
-    return Acstract.extend({
+    return Abstract.extend({
         defaults: {
             prefixName: '',
             prefixElementName: '',

From acbb755d28ab4d5cfa83b9794b40460d56b98b5e Mon Sep 17 00:00:00 2001
From: Aditya Yadav <adityayadav@cedcoss.com>
Date: Thu, 3 Jan 2019 20:03:57 +0530
Subject: [PATCH 458/932] Fixed Typo WigetTabs -> WidgetTabs

---
 .../Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
index 04c3a208b97f9..136484b4ceccc 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
@@ -8,7 +8,7 @@
 
 use Magento\Backend\Block\Template\Context;
 use Magento\Backend\Block\Widget\Accordion;
-use Magento\Backend\Block\Widget\Tabs as WigetTabs;
+use Magento\Backend\Block\Widget\Tabs as WidgetTabs;
 use Magento\Backend\Model\Auth\Session;
 use Magento\Catalog\Helper\Catalog;
 use Magento\Catalog\Helper\Data;
@@ -22,7 +22,7 @@
  * Admin product edit tabs
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Tabs extends WigetTabs
+class Tabs extends WidgetTabs
 {
     const BASIC_TAB_GROUP_CODE = 'basic';
 

From 32fd4bdedb19ac567364a185ffcbc5da86d7cd2a Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 3 Jan 2019 17:00:49 +0200
Subject: [PATCH 459/932] Fix static test.

---
 .../Serialize/Test/Unit/Serializer/JsonHexTagTest.php       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
index f8197a279c62a..c867dced0fc6e 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/JsonHexTagTest.php
@@ -69,7 +69,8 @@ public function testUnserialize($value, $expected)
     /**
      * @return array
      */
-    public function unserializeDataProvider(): array {
+    public function unserializeDataProvider(): array
+    {
         return [
             ['""', ''],
             ['"string"', 'string'],
@@ -105,7 +106,8 @@ public function testUnserializeException($value)
     /**
      * @return array
      */
-    public function unserializeExceptionDataProvider(): array {
+    public function unserializeExceptionDataProvider(): array
+    {
         return [
             [''],
             [false],

From a6acc4a9f31037854444c6136a21e1a40cdb2359 Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Thu, 3 Jan 2019 15:01:55 +0000
Subject: [PATCH 460/932] MAGETWO-96847: [2.3.x] Special price does not work
 when "default config" scope timezone does not match "website" scope timezone

- Add admin scope to calculate
---
 app/code/Magento/Catalog/Model/Product/Type/Price.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index f6caa299d66d7..f9cf1522e3f70 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -11,6 +11,7 @@
 use Magento\Store\Model\Store;
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Api\Data\WebsiteInterface;
 
 /**
  * Product type price model
@@ -184,6 +185,8 @@ public function getFinalPrice($qty, $product)
     }
 
     /**
+     * Retrieve final price for child product
+     *
      * @param Product $product
      * @param float $productQty
      * @param Product $childProduct
@@ -428,6 +431,8 @@ public function setTierPrices($product, array $tierPrices = null)
     }
 
     /**
+     * Retrieve customer group id from product
+     *
      * @param Product $product
      * @return int
      */
@@ -453,7 +458,7 @@ protected function _applySpecialPrice($product, $finalPrice)
             $product->getSpecialPrice(),
             $product->getSpecialFromDate(),
             $product->getSpecialToDate(),
-            $product->getStore()
+            WebsiteInterface::ADMIN_CODE
         );
     }
 
@@ -601,7 +606,7 @@ public function calculatePrice(
             $specialPrice,
             $specialPriceFrom,
             $specialPriceTo,
-            $sId
+            WebsiteInterface::ADMIN_CODE
         );
 
         if ($rulePrice === false) {

From f7f56fc819f1b7fc33370e66cf613c35c2044c48 Mon Sep 17 00:00:00 2001
From: Andrii Meysar <andrii.meysar@transoftgroup.com>
Date: Thu, 3 Jan 2019 17:47:33 +0200
Subject: [PATCH 461/932] MAGETWO-67129: Function test
 Magento\GroupedProduct\Test\TestCase\CreateGroupedProductEntityTest fails
 randomly

---
 .../AssociatedProducts/Search/Grid.php        | 62 +++++++++++++++++++
 .../CreateGroupedProductEntityTest.xml        |  2 +-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
index 45481d6ee0758..6c19291222a97 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts/Search/Grid.php
@@ -20,6 +20,13 @@ class Grid extends DataGrid
      */
     protected $addProducts = '.action-primary[data-role="action"]';
 
+    /**
+     * Grid selector.
+     *
+     * @var string
+     */
+    private $gridSelector = '[data-role="grid-wrapper"]';
+
     /**
      * Filters array mapping
      *
@@ -40,4 +47,59 @@ public function addProducts()
     {
         $this->_rootElement->find($this->addProducts)->click();
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function searchAndSelect(array $filter)
+    {
+        $this->waitGridVisible();
+        $this->waitLoader();
+        parent::searchAndSelect($filter);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function waitLoader()
+    {
+        parent::waitLoader();
+        $this->waitGridLoaderInvisible();
+    }
+
+    /**
+     * Wait for grid to appear.
+     *
+     * @return void
+     */
+    private function waitGridVisible()
+    {
+        $browser = $this->_rootElement;
+        $selector = $this->gridSelector;
+
+        return $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isVisible() ? true : null;
+            }
+        );
+    }
+
+    /**
+     * Wait for grid spinner disappear.
+     *
+     * @return void
+     */
+    private function waitGridLoaderInvisible()
+    {
+        $browser = $this->_rootElement;
+        $selector = $this->loader;
+
+        return $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isVisible() === false ? true : null;
+            }
+        );
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
index 38ef02ff49441..39f4fd08bb922 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/CreateGroupedProductEntityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\GroupedProduct\Test\TestCase\CreateGroupedProductEntityTest" summary="Create Grouped Product" ticketId="MAGETWO-24877">
         <variation name="CreateGroupedProductEntityTestVariation1" summary="Create Grouped Product and Assign It to the Category" ticketId="MAGETWO-13610">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
             <data name="product/data/url_key" xsi:type="string">test-grouped-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">GroupedProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">GroupedProduct_sku%isolation%</data>

From 9d1811f0b7a56f7c966cf500d76609c538eccbb5 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Thu, 3 Jan 2019 10:25:32 -0600
Subject: [PATCH 462/932] MC-6283: [System Configuration] Introduce the new
 settings related to Smart buttons

- add disabled funding configuration settings and add strict types
---
 .../Config/Source/ExpressButtons/Color.php    |  3 ++-
 .../ExpressButtons/DisableFundingOptions.php  | 23 +++++++++++++++++++
 .../Config/Source/ExpressButtons/Label.php    |  3 ++-
 .../Config/Source/ExpressButtons/Layout.php   |  3 ++-
 .../Config/Source/ExpressButtons/Shape.php    |  3 ++-
 .../Config/Source/ExpressButtons/Size.php     |  3 ++-
 .../etc/adminhtml/system/express_checkout.xml | 14 +++++++++++
 7 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php

diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php
index 2c2a428fc7c4b..7617bd9031c4b 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
 
@@ -13,7 +14,7 @@ class Color
      *
      * @return array
      */
-    public function getCheckoutColor()
+    public function getCheckoutColor(): array
     {
         return [
             'gold' => __('Gold'),
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php
new file mode 100644
index 0000000000000..0914f9afb7151
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
+
+class DisableFundingOptions
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function toOptionArray(): array
+    {
+        return [
+            ['value' => 'paypal.FUNDING.CREDIT', 'label' => 'PayPal Credit'],
+            ['value' => 'paypal.FUNDING.CARD', 'label' => 'PayPal Guest Checkout Credit Card Icons'],
+            ['value' => 'paypal.FUNDING.ELV', 'label' => 'Elektronisches Lastschriftverfahren - German ELV']
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
index c4e6b8de64e51..3a3e8b8461fb4 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
 
@@ -13,7 +14,7 @@ class Label
      *
      * @return array
      */
-    public function getCheckoutLabel()
+    public function getCheckoutLabel(): array
     {
         return [
             'checkout' => __('Checkout'),
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php
index 30af9362f15a4..9f28101024cf3 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
 
@@ -13,7 +14,7 @@ class Layout
      *
      * @return array
      */
-    public function getCheckoutLayout()
+    public function getCheckoutLayout(): array
     {
         return [
             'vertical' => __('Vertical'),
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
index b5bfd4614e708..d4be160d2c52b 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
 
@@ -13,7 +14,7 @@ class Shape
      *
      * @return array
      */
-    public function getCheckoutShape()
+    public function getCheckoutShape(): array
     {
         return [
             'pill' => __('Pill'),
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php
index f89ea2c8c168f..01559868561b9 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
 
@@ -13,7 +14,7 @@ class Size
      *
      * @return array
      */
-    public function getCheckoutSize()
+    public function getCheckoutSize(): array
     {
         return [
             'medium' => __('Medium'),
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index a1b6e1f3ab622..137e224fa75c8 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -705,6 +705,20 @@
                             <attribute type="shared">1</attribute>
                         </field>
                     </group>
+                    <group id="features" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                        <label>Features</label>
+                        <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                            <label>Disable Funding Options</label>
+                            <comment>
+                                <![CDATA[PayPal will automatically display each enabled funding option to eligible buyers.
+                                For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is
+                                offered and the currency offered by the merchant is USD.]]>
+                            </comment>
+                            <config_path>payment/paypal_express/disable_funding_options</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\DisableFundingOptions</source_model>
+                            <attribute type="shared">1</attribute>
+                        </field>
+                    </group>
                 </group>
             </group>
         </group>

From 5fd3edb8614c4322ecca8447b9e2ae8bdb52be39 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 3 Jan 2019 10:31:50 -0600
Subject: [PATCH 463/932] MC-6280:[Frontend part] Implement Smart button
 component

---
 .../Paypal/Model/ExpressConfigProvider.php    |   4 +-
 .../express-checkout-smart-buttons.js         | 111 ++++++++++++++++++
 .../in-context/checkout-express.js            | 105 +++--------------
 .../payment/paypal-express-in-context.html    |  12 +-
 4 files changed, 132 insertions(+), 100 deletions(-)
 create mode 100644 app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js

diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 518e8b12bfcd5..bb625a40f36f2 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -129,7 +129,9 @@ public function getConfig()
                     'locale' => $locale,
                     'button' => [
                         self::IN_CONTEXT_BUTTON_ID
-                    ]
+                    ],
+                    'allowedFunding' => ['CREDIT', 'ELV'],
+                    'disallowedFunding' => []
                 ],
             ];
         }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
new file mode 100644
index 0000000000000..11b9a97d5b210
--- /dev/null
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -0,0 +1,111 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'paypalInContextExpressCheckout',
+    'Magento_Ui/js/model/messageList',
+    'underscore',
+    'domReady!'
+], function (paypal, messageList, _) {
+    'use strict';
+
+    /**
+     * Returns styles object
+     *
+     * @param {Object} config
+     * @return Object
+     */
+    function processStyles(config) {
+        return {
+            layout: 'vertical',
+            size: 'responsive',
+            color: 'gold',
+            shape: 'rect',
+            label: 'paypal',
+        }
+    };
+
+    /**
+     * Returns array of allowed funding
+     *
+     * @param {Object} config
+     * @return {Array}
+     */
+    function getFunding(config) {
+        var funding = [];
+        _.each(config, function (name) {
+            funding.push(paypal.FUNDING[name]);
+        }, this);
+        return funding;
+    };
+
+    return function (clientConfig, element) {
+        paypal.Button.render({
+
+            // Configure environment
+            env: clientConfig.environment,
+            client: {[clientConfig.environment]:clientConfig.merchantId},
+            // Customize button (optional)
+            locale: clientConfig.locale,
+            funding: {
+                allowed: getFunding(clientConfig.allowedFunding),
+                disallowed: getFunding(clientConfig.disallowedFunding)
+            },
+            style: processStyles(clientConfig.buttonStyles),
+
+            // Enable Pay Now checkout flow (optional)
+            commit: true,
+
+            // Set up a payment
+            payment: function (data, actions) {
+                return new paypal.Promise(function (resolve, reject) {
+                    var customConfig = {
+                        'quote_id': clientConfig.quoteId,
+                        'customer_id': clientConfig.customerId,
+                        'button': clientConfig.button
+                    };
+                    $.post(clientConfig.startUrl, customConfig, function (data) {
+                        resolve(data.token);
+                    });
+                });
+            },
+            // Execute the payment
+            onAuthorize: function (data, actions) {
+                if (clientConfig.button === 0) {
+                    //add logic to set payment method
+                }
+                var params =
+                    {
+                        paymentToken: data.paymentToken,
+                        payerId: data.payerID,
+                        quoteId: clientConfig.quoteId,
+                        method: clientConfig.payment.method,
+                        customerId: clientConfig.customerId,
+                        form_key: clientConfig.formKey
+                        // add email for guest customer
+                        /*email:*/
+
+                    };
+                return paypal.request.post(clientConfig.onAuthorizeUrl, params)
+                    .then(function (res) {
+                        //add logic to process negative cases
+                        // 3. Return res.id from the response
+                        return window.location.replace(clientConfig.successUrl);
+
+                    });
+
+            },
+            onCancel: function (data, actions) {
+                window.alert('Transaction is cancelled.');
+            },
+
+            onError: function (err) {
+                messageList.addErrorMessage({
+                    message: err
+                });
+
+            }
+        }, element);
+    };
+});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index c56f21bc718fb..efecb541a3b17 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -10,9 +10,9 @@ define(
         'Magento_Paypal/js/action/set-payment-method',
         'Magento_Checkout/js/model/payment/additional-validators',
         'Magento_Ui/js/lib/view/utils/dom-observer',
-        'paypalInContextExpressCheckout',
         'Magento_Customer/js/customer-data',
-        'Magento_Ui/js/model/messageList'
+        'Magento_Ui/js/model/messageList',
+        'Magento_Paypal/js/in-context/express-checkout-smart-buttons'
     ],
     function (
         _,
@@ -21,9 +21,9 @@ define(
         setPaymentMethodAction,
         additionalValidators,
         domObserver,
-        paypalExpressCheckout,
         customerData,
-        messageList
+        messageList,
+        checkoutSmartButtons
     ) {
         'use strict';
 
@@ -33,95 +33,22 @@ define(
         return Component.extend({
 
             defaults: {
-                template: 'Magento_Paypal/payment/paypal-express-in-context',
-                clientConfig: {
-                    /**
-                     * @param {Object} event
-                     */
-                    click: function (event) {
-                        event.preventDefault();
-
-                        if (additionalValidators.validate()) {
-                            paypalExpressCheckout.checkout.initXO();
-
-                            this.selectPaymentMethod();
-                            setPaymentMethodAction(this.messageContainer).done(function () {
-                                $('body').trigger('processStart');
-
-                                $.getJSON(this.path, {
-                                    button: 0
-                                }).done(function (response) {
-                                    var message = response && response.message;
-
-                                    if (message) {
-                                        if (message.type === 'error') {
-                                            messageList.addErrorMessage({
-                                                message: message.text
-                                            });
-                                        } else {
-                                            messageList.addSuccessMessage({
-                                                message: message.text
-                                            });
-                                        }
-                                    }
-
-                                    if (response && response.url) {
-                                        paypalExpressCheckout.checkout.startFlow(response.url);
-
-                                        return;
-                                    }
-
-                                    paypalExpressCheckout.checkout.closeFlow();
-                                }).fail(function () {
-                                    paypalExpressCheckout.checkout.closeFlow();
-                                }).always(function () {
-                                    $('body').trigger('processStop');
-                                    customerData.invalidate(['cart']);
-                                });
-                            }.bind(this)).fail(function () {
-                                paypalExpressCheckout.checkout.closeFlow();
-                            });
-                        }
-                    }
-                }
+                template: 'Magento_Paypal/payment/paypal-express-in-context'
             },
 
             /**
-             * @returns {Object}
+             * Render PayPal buttons using checkout.js
              */
-            initialize: function () {
-                this._super();
-                this.initClient();
-
-                return this;
-            },
-
-            /**
-             * @returns {Object}
-             */
-            initClient: function () {
-                var selector = '#' + this.getButtonId();
-
-                _.each(this.clientConfig, function (fn, name) {
-                    if (typeof fn === 'function') {
-                        this.clientConfig[name] = fn.bind(this);
-                    }
-                }, this);
-
-                if (!clientInit) {
-                    domObserver.get(selector, function () {
-                        paypalExpressCheckout.checkout.setup(this.merchantId, this.clientConfig);
-                        clientInit = true;
-                        domObserver.off(selector);
-                    }.bind(this));
-                } else {
-                    domObserver.get(selector, function () {
-                        $(selector).on('click', this.clientConfig.click);
-                        domObserver.off(selector);
-                    }.bind(this));
-                }
-
-                return this;
+            renderPayPalButtons: function() {
+                this.clientConfig.payment = {
+                    'method': this.item.method
+                };
+                this.clientConfig.quoteId = window.checkoutConfig.quoteData.entity_id;
+                this.clientConfig.formKey = window.checkoutConfig.formKey;
+                this.clientConfig.customerId = window.customerData.id;
+                this.clientConfig.button = 0;
+                this.clientConfig.merchantId = this.merchantId;
+                checkoutSmartButtons(this.clientConfig, '#' + this.getButtonId());
             },
 
             /**
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index 562243decaa6b..9726e5b8ffea5 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -30,15 +30,7 @@
                 <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
-        <div class="actions-toolbar">
-            <div class="primary">
-                <button class="action primary checkout"
-                        type="submit"
-                        data-bind="enable: (getCode() == isChecked()), attr: {id: getButtonId()}"
-                        disabled>
-                    <span data-bind="i18n: 'Continue to PayPal'"></span>
-                </button>
-            </div>
-        </div>
+
+        <div class="actions-toolbar" data-bind="attr: {id: getButtonId()}" afterRender="renderPayPalButtons"></div>
     </div>
 </div>

From f6b8e494cfeec533fab8cd4dad5cc0685f033f04 Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Thu, 3 Jan 2019 22:34:28 +0530
Subject: [PATCH 464/932] some changes fixed

---
 .../Config/Block/System/Config/Form.php       | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index f9faa364d3c9f..ee0c21473baf4 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -366,11 +366,7 @@ protected function _initElement(
 
         $sharedClass = $this->_getSharedCssClass($field);
         $requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
-        $isReadOnly = $this->isDefaultFieldReadOnly($path);
-        if (!$isReadOnly) {
-            $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
-                ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
-        }
+        $isReadOnly = $this->getReadOnly($field, $path);
 
         $formField = $fieldset->addField(
             $elementId,
@@ -801,20 +797,21 @@ private function getAppConfig()
     }
 
     /**
-     * Check Default Path Readonly
-     *
+     * Check Path is Readonly
+     * 
+     * @param \Magento\Config\Model\Config\Structure\Element\Field $field
      * @param string $path
      * @return boolean
      */
-    private function isDefaultFieldReadOnly($path)
+    private function getReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
     {
-        $scope = $this->getScope();
-        $isReadOnly = false;
-        if ($scope !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
-            $isReadOnly = $this->getSettingChecker()->isReadOnly(
-                $path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
-            );
-        } 
+        $isReadOnly = $this->getSettingChecker()->isReadOnly(
+            $path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        );
+        if (!$isReadOnly) {
+            $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
+                ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
+        }
         return $isReadOnly;
     }
 

From eeab3818801585ed10663a1c76c5ed16c7ea0e53 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Thu, 3 Jan 2019 11:50:53 -0600
Subject: [PATCH 465/932] MC-4378: Convert UpdateCategoryEntityTest to MFTF

---
 .../Catalog/Test/Mftf/Data/CategoryData.xml   |  8 ++
 .../Section/AdminCategoryContentSection.xml   |  1 +
 ...ryAndCheckDefaultUrlKeyOnStoreViewTest.xml | 75 +++++++++++++++
 ...AdminUpdateCategoryAndMakeInactiveTest.xml | 53 +++++++++++
 ...minUpdateCategoryNameWithStoreViewTest.xml | 69 ++++++++++++++
 ...nUpdateCategoryUrlKeyWithStoreViewTest.xml | 73 +++++++++++++++
 ...eCategoryWithInactiveIncludeInMenuTest.xml | 92 +++++++++++++++++++
 .../AdminUpdateCategoryWithProductsTest.xml   | 77 ++++++++++++++++
 dev/tests/functional/composer.json            |  3 +-
 9 files changed, 450 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index ff3c5cb4403bf..d9d9bb013cf67 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -62,4 +62,12 @@
         <data key="name" unique="suffix">FifthLevelCategory</data>
         <data key="name_lwr" unique="suffix">category</data>
     </entity>
+    <entity name="SimpleRootSubCategory" type="category">
+        <data key="name" unique="prefix">SimpleRootSubCat</data>
+        <data key="name_lwr" unique="prefix">simplerootsubcat</data>
+        <data key="urlKey"  unique="prefix">simplerootsubcat</data>
+        <data key="is_active">true</data>
+        <data key="include_in_menu">true</data>
+        <var key="parent_id" entityType="category" entityKey="id" />
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
index e3d224904671b..86ca7f3064311 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
@@ -24,5 +24,6 @@
         <element name="productTableColumnName" type="input" selector="#catalog_category_products_filter_name"/>
         <element name="productTableRow" type="button" selector="#catalog_category_products_table tbody tr"/>
         <element name="productSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
+        <element name="showHideEditor" type="button" selector="#togglecategory_form_description"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
new file mode 100644
index 0000000000000..d0b717eeeca44
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
@@ -0,0 +1,75 @@
+<?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="AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest">
+        <annotations>
+            <stories value="Update categories"/>
+            <title value="Update category, check default URL key on the custom store view"/>
+            <description value="Login as admin and update category and check default URL Key on custom store view"/>
+            <testCaseId value="MC-6063"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
+            <createData entity="SimpleRootSubCategory" stepKey="category">
+                <requiredEntity createDataKey="rootCategory"/>
+            </createData>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
+                <argument name="storeGroupName" value="customStore.name"/>
+            </actionGroup>
+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Create Custom Store -->
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+        <!--Create Store View-->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
+            <argument name="StoreGroup" value="customStore"/>
+            <argument name="customStore" value="customStore"/>
+        </actionGroup>
+        <!--Update Category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="updateCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
+        <waitForPageLoad stepKey="waitForCateforyToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <!--<seeInField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="seeUrlKey" userInput="{{SimpleRootSubCategory.name_lwr}}" />-->
+        <grabValueFrom selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="getUrlKey"/>
+        <assertNotEmpty stepKey="verifyDefaultUrlKey">
+            <actualResult type="variable">getUrlKey</actualResult>
+        </assertNotEmpty>
+        <!--Verify Category UrlKey in Store View-->
+        <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategoryOnStoreFront"/>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <!--<seeInCurrentUrl stepKey="verifyUrlKey" url="{{_defaultCategory.name_lwr}}.html"/>-->
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
new file mode 100644
index 0000000000000..c1f5238e0dad2
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
@@ -0,0 +1,53 @@
+<?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="AdminUpdateCategoryAndMakeInactiveTest">
+        <annotations>
+            <stories value="Update categories"/>
+            <title value="Update category, make inactive"/>
+            <description value="Login as admin and update category and  make it Inactive"/>
+            <testCaseId value="MC-6060"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCreatedCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Update Category and make it inactive-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
+        <!--Verify Inactive Category is store front page-->
+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
+        <waitForPageLoad time="15" stepKey="wait"/>
+        <!--Verify Inactive Category in category page -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree1"/>
+        <seeElement  selector="{{AdminCategoryContentSection.categoryInTree(_defaultCategory.name)}}" stepKey="assertCategoryInTree" />
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory1"/>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle1" />
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="assertCategoryIsInactive"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
new file mode 100644
index 0000000000000..8ed5676c8a628
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.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="AdminUpdateCategoryNameWithStoreViewTest">
+        <annotations>
+            <stories value="Update categories"/>
+            <title value="Update category, with custom store view"/>
+            <description value="Login as admin and update category name with custom Store View"/>
+            <testCaseId value="MC-6061"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
+            <createData entity="SimpleRootSubCategory" stepKey="category">
+                    <requiredEntity createDataKey="rootCategory"/>
+            </createData>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
+                <argument name="storeGroupName" value="customStore.name"/>
+            </actionGroup>
+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Create Custom Store -->
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+        <!--Create Store View-->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
+            <argument name="StoreGroup" value="customStore"/>
+            <argument name="customStore" value="customStore"/>
+        </actionGroup>
+        <!--Verify created SubCAtegory is present on Store Front -->
+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
+        <!--Update Category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTreeUnderRoot(SimpleRootSubCategory.name)}}" stepKey="clickOnSubcategoryIsUndeRootCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="updateCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
+        <waitForPageLoad stepKey="waitForCateforyToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <!--Verify the Category is not present in Store Front-->
+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="dontSeeCatergoryInStoreFront"/>
+        <!--Verify the Updated Category is present in Store Front-->
+        <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheUpdatedCategoryInStoreFront"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeUpdatedCatergoryInStoreFront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
new file mode 100644
index 0000000000000..7349f09deabe0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
@@ -0,0 +1,73 @@
+<?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="AdminUpdateCategoryUrlKeyWithStoreViewTest">
+        <annotations>
+            <stories value="Update categories"/>
+            <title value="Update category, URL key with custom store view"/>
+            <description value="Login as admin and update category URL Key with store view"/>
+            <testCaseId value="MC-6062"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="NewRootCategory" stepKey="rootCategory"/>
+            <createData entity="SimpleRootSubCategory" stepKey="category">
+                <requiredEntity createDataKey="rootCategory"/>
+            </createData>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
+                <argument name="storeGroupName" value="customStore.name"/>
+            </actionGroup>
+            <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Create Custom Store -->
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
+        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
+        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
+        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+        <!--Create Store View-->
+        <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
+            <argument name="StoreGroup" value="customStore"/>
+            <argument name="customStore" value="customStore"/>
+        </actionGroup>
+        <!--Verify Category in Store View-->
+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <!--Update URL Key-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCategory1"/>
+        <scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSearchEngineOptimization"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
+        <clearField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="clearUrlKeyField"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="newurlkey" stepKey="enterURLKey"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCategoryOnNavigation1"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory2"/>
+        <waitForPageLoad stepKey="waitForProductToLoad1"/>
+        <!--Verify Updated URLKey is present-->
+        <seeInCurrentUrl stepKey="verifyUpdatedUrlKey" url="newurlkey.html"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
new file mode 100644
index 0000000000000..c4b13c0346488
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
@@ -0,0 +1,92 @@
+<?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="AdminUpdateCategoryWithInactiveIncludeInMenuTest">
+        <annotations>
+            <stories value="Update categories"/>
+            <title value="Update category, name description urlkey metatitle exclude from menu"/>
+            <description value="Login as admin and update category name, description, urlKey, metatitle and exclude from menu"/>
+            <testCaseId value="MC-6058"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Update Category and disable Include in Menu-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="fillCategoryName"/>
+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIncludeInMenu"/>
+        <!--Select Content and fill the options-->
+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent"/>
+        <click selector="{{AdminCategoryContentSection.showHideEditor}}" stepKey="clickONShowHideButton"/>
+        <fillField selector="{{AdminCategoryContentSection.description}}"  userInput="Updated category Description Fields" stepKey="fillUpdatedDescription"/>
+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleRootSubCategory.urlKey}}" stepKey="fillUpdatedUrlKey"/>
+        <fillField selector="{{AdminCategorySEOSection.MetaTitleInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="fillUpdatedMetaTitle"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <!--Verify Updated Category in UrlRewrite Page-->
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
+        <waitForPageLoad stepKey="waitForUrlRewritePage"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleRootSubCategory.urlKey}}" stepKey="fillUpdatedCategoryUrlKey"/>
+        <click selector="button[data-ui-id='widget-button-1']" stepKey="clickOnSearchButton"/>
+        <see selector="[data-column='request_path']" userInput="{{SimpleRootSubCategory.urlKey}}" stepKey="seeUpdatedCategoryUrlKey"/>
+        <!--Verify Updated Category UrlKey directs to category Store Front-->
+        <amOnPage url="{{SimpleRootSubCategory.urlKey}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
+        <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleRootSubCategory.name)}}" stepKey="seeSubCategoryInStoreFrontPage"/>
+        <!--Verify Updated fields in Category Page-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCreatedCategory1"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
+        <grabValueFrom selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}"  stepKey="getCategoryName"/>
+        <assertEquals stepKey="getUpdatedCategoryName">
+            <expectedResult type="string">{{SimpleRootSubCategory.name}}</expectedResult>
+            <actualResult type="variable">getCategoryName</actualResult>
+        </assertEquals>
+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent1"/>
+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent1"/>
+        <scrollTo selector="{{AdminCategoryContentSection.description}}" stepKey="scrollToDescription1"/>
+        <grabValueFrom selector="{{AdminCategoryContentSection.description}}"   stepKey="getUpdatedDescription"/>
+        <assertEquals stepKey="getDescription">
+            <expectedResult type="string">Updated category Description Fields</expectedResult>
+            <actualResult type="variable">getUpdatedDescription</actualResult>
+        </assertEquals>
+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
+        <grabValueFrom selector="{{AdminCategorySEOSection.UrlKeyInput}}"   stepKey="getUrkKey"/>
+        <assertEquals stepKey="getUpdatedUrkKey">
+            <expectedResult type="string">{{SimpleRootSubCategory.urlKey}}</expectedResult>
+            <actualResult type="variable">getUrkKey</actualResult>
+        </assertEquals>
+        <grabValueFrom selector="{{AdminCategorySEOSection.MetaTitleInput}}"   stepKey="getMetaTitleInput"/>
+        <assertEquals stepKey="getUpdatedMetaTitleInput">
+            <expectedResult type="string">{{SimpleRootSubCategory.name}}</expectedResult>
+            <actualResult type="variable">getMetaTitleInput</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
new file mode 100644
index 0000000000000..6b7c43b38b701
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
@@ -0,0 +1,77 @@
+<?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="AdminUpdateCategoryWithProductsTest">
+        <annotations>
+            <stories value="Update categories"/>
+            <title value="Update category, sort products by default sorting"/>
+            <description value="Login as admin, update category and sort products"/>
+            <testCaseId value="MC-6059"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct" />
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Create Category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
+        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
+        <!--Select Product Display Setting and fill the options-->
+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
+        <scrollToTopOfPage stepKey="scfrollToTop"/>
+        <click selector="{{CategoryDisplaySettingsSection.productListCheckBox}}" stepKey="enableTheAvailableProductList"/>
+        <selectOption selector="{{CategoryDisplaySettingsSection.productList}}" parameterArray="['Product Name', 'Price']" stepKey="selectPrice"/>
+        <scrollTo selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" x="0" y="-80" stepKey="scrollToDefaultProductList"/>
+        <click selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" stepKey="enableTheDefaultProductList"/>
+        <selectOption selector="{{CategoryDisplaySettingsSection.defaultProductList}}" userInput="name" stepKey="selectProductName"/>
+        <!--Select Products in Category-->
+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
+        <scrollToTopOfPage stepKey="scrollOnTopOfPage"/>
+        <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$"  stepKey="selectProduct1"/>
+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitFroPageToLoad1"/>
+        <scrollTo  selector="{{AdminCategoryContentSection.productTableRow}}"  stepKey="scrollToTableRow"/>
+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProduct1FromTableRow"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
+        <!--Verify the Category Title-->
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
+        <!--Verify Category in store front page-->
+        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}" stepKey="seeDefaultProductPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <!--Verify Product in Category-->
+        <seeElement stepKey="seeProductsInCategory" selector="{{StorefrontCategoryMainSection.productLink}}"/>
+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
+        <waitForPageLoad  stepKey="waitForProductToLoad1"/>
+        <!--Verify product name and price on Store Front-->
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{defaultSimpleProduct.price}}" stepKey="assertProductPrice"/>
+    </test>
+</tests>
+
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index e49824d17df80..25b5347e903b6 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -8,7 +8,8 @@
         "allure-framework/allure-phpunit": "~1.2.0",
         "doctrine/annotations": "1.4.*",
         "phpunit/phpunit": "~6.5.0",
-        "phpunit/phpunit-selenium": "~4.1.0"
+        "phpunit/phpunit-selenium": "~4.1.0",
+        "symfony/css-selector": "^4.1"
     },
     "suggest": {
         "netwing/selenium-server-standalone": "dev-master",

From 8f4dcc1893f595dbdd0ddbcf563f64411d741961 Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Thu, 3 Jan 2019 23:51:35 +0530
Subject: [PATCH 466/932] dependency injected in constructor

---
 app/code/Magento/Config/Block/System/Config/Form.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index ee0c21473baf4..39037fb70c857 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -131,6 +131,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Config\Model\Config\Factory $configFactory
      * @param \Magento\Config\Model\Config\Structure $configStructure
+     * @param \Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker $settingChecker
      * @param \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory
      * @param \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory
      * @param array $data
@@ -141,6 +142,7 @@ public function __construct(
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Config\Model\Config\Factory $configFactory,
         \Magento\Config\Model\Config\Structure $configStructure,
+        \Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker $settingChecker,
         \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory,
         \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory,
         array $data = []
@@ -150,6 +152,7 @@ public function __construct(
         $this->_configStructure = $configStructure;
         $this->_fieldsetFactory = $fieldsetFactory;
         $this->_fieldFactory = $fieldFactory;
+        $this->settingChecker = $settingChecker;
 
         $this->_scopeLabels = [
             self::SCOPE_DEFAULT => __('[GLOBAL]'),
@@ -416,7 +419,7 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
     {
         $data = $this->getAppConfigDataValue($path);
 
-        $placeholderValue = $this->getSettingChecker()->getPlaceholderValue(
+        $placeholderValue = $this->settingChecker->getPlaceholderValue(
             $path,
             $this->getScope(),
             $this->getStringScopeCode()
@@ -805,12 +808,12 @@ private function getAppConfig()
      */
     private function getReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
     {
-        $isReadOnly = $this->getSettingChecker()->isReadOnly(
+        $isReadOnly = $this->settingChecker->isReadOnly(
             $path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
         );
         if (!$isReadOnly) {
             $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
-                ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
+                ?: $this->settingChecker->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
         }
         return $isReadOnly;
     }

From d397810e9f123068977a070666e91f0151ff758c Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Fri, 4 Jan 2019 00:19:43 +0530
Subject: [PATCH 467/932] adding constructor parameter updated

---
 app/code/Magento/Config/Block/System/Config/Form.php      | 8 ++++----
 .../Config/Test/Unit/Block/System/Config/FormTest.php     | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 39037fb70c857..374e7b94cd93b 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -131,10 +131,10 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Config\Model\Config\Factory $configFactory
      * @param \Magento\Config\Model\Config\Structure $configStructure
-     * @param \Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker $settingChecker
      * @param \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory
      * @param \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory
      * @param array $data
+     * @param SettingChecker|null $settingChecker
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -142,17 +142,17 @@ public function __construct(
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Config\Model\Config\Factory $configFactory,
         \Magento\Config\Model\Config\Structure $configStructure,
-        \Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker $settingChecker,
         \Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory,
         \Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory,
-        array $data = []
+        array $data = [],
+        SettingChecker $settingChecker = null
     ) {
         parent::__construct($context, $registry, $formFactory, $data);
         $this->_configFactory = $configFactory;
         $this->_configStructure = $configStructure;
         $this->_fieldsetFactory = $fieldsetFactory;
         $this->_fieldFactory = $fieldFactory;
-        $this->settingChecker = $settingChecker;
+        $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
 
         $this->_scopeLabels = [
             self::SCOPE_DEFAULT => __('[GLOBAL]'),
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
index 008dae1eaab55..4e260b0fb2bb1 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
@@ -102,6 +102,9 @@ protected function setUp()
             \Magento\Config\Block\System\Config\Form\Fieldset\Factory::class
         );
         $this->_fieldFactoryMock = $this->createMock(\Magento\Config\Block\System\Config\Form\Field\Factory::class);
+        $settingCheckerMock = $this->getMockBuilder(SettingChecker::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->_coreConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
 
         $this->_backendConfigMock = $this->createMock(\Magento\Config\Model\Config::class);
@@ -153,6 +156,7 @@ protected function setUp()
             'fieldsetFactory' => $this->_fieldsetFactoryMock,
             'fieldFactory' => $this->_fieldFactoryMock,
             'context' => $context,
+            'settingChecker' => $settingCheckerMock,
         ];
 
         $objectArguments = $helper->getConstructArguments(\Magento\Config\Block\System\Config\Form::class, $data);

From f2b70f583296cacd6fabe0cc981ba2fa05b73e43 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 3 Jan 2019 14:28:59 -0600
Subject: [PATCH 468/932] MC-6280:[Frontend part] Implement Smart button
 component - set configuration with config provider

---
 .../Paypal/Model/ExpressConfigProvider.php    | 43 ++++++++++++++++++-
 app/code/Magento/Paypal/etc/config.xml        |  6 +++
 .../express-checkout-smart-buttons.js         | 20 +--------
 3 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index bb625a40f36f2..098c231583f9a 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -130,8 +130,9 @@ public function getConfig()
                     'button' => [
                         self::IN_CONTEXT_BUTTON_ID
                     ],
-                    'allowedFunding' => ['CREDIT', 'ELV'],
-                    'disallowedFunding' => []
+                    'allowedFunding' => [],
+                    'disallowedFunding' => $this->getDisallowedFunding(),
+                    'styles' => $this->getButtonStyles()
                 ],
             ];
         }
@@ -181,4 +182,42 @@ protected function getBillingAgreementCode($code)
         return $this->paypalHelper->shouldAskToCreateBillingAgreement($this->config, $customerId)
             ? Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT : null;
     }
+
+    /**
+     * Returns button styles based on configuration
+     *
+     * @return array
+     */
+    private function getButtonStyles()
+    {
+        $this->config->setMethod(Config::METHOD_EXPRESS);
+
+        $styles = [
+            'layout' => 'vertical',
+            'size' => 'responsive',
+            'color' => 'gold',
+            'shape' => 'rect',
+            'label' => 'paypal'
+        ];
+        if ($this->config->getValue('checkout_page_button_customize') === '1') {
+            $styles['layout'] = $this->config->getValue('checkout_page_button_layout');
+            $styles['size'] = $this->config->getValue('checkout_page_button_size');
+            $styles['color'] = $this->config->getValue('checkout_page_button_color');
+            $styles['shape'] = $this->config->getValue('checkout_page_button_shape');
+            $styles['label'] = $this->config->getValue('checkout_page_button_label');
+        }
+        return $styles;
+    }
+
+    /**
+     * Returns disallowed funding from configuration
+     *
+     * @return array
+     */
+    private function getDisallowedFunding()
+    {
+        $this->config->setMethod(Config::METHOD_EXPRESS);
+        $disallowedFunding = $this->config->getValue('disable_funding_options');
+        return $disallowedFunding ? explode(',', $disallowedFunding) : [];
+    }
 }
diff --git a/app/code/Magento/Paypal/etc/config.xml b/app/code/Magento/Paypal/etc/config.xml
index f0df648af9072..494a9ee904a97 100644
--- a/app/code/Magento/Paypal/etc/config.xml
+++ b/app/code/Magento/Paypal/etc/config.xml
@@ -44,6 +44,12 @@
                 <child_authorization_number>1</child_authorization_number>
                 <verify_peer>1</verify_peer>
                 <skip_order_review_step>1</skip_order_review_step>
+                <checkout_page_button_customize>0</checkout_page_button_customize>
+                <checkout_page_button_label>paypal</checkout_page_button_label>
+                <checkout_page_button_layout>vertical</checkout_page_button_layout>
+                <checkout_page_button_size>responsive</checkout_page_button_size>
+                <checkout_page_button_shape>rect</checkout_page_button_shape>
+                <checkout_page_button_color>gold</checkout_page_button_color>
             </paypal_express>
             <paypal_express_bml>
                 <model>Magento\Paypal\Model\Bml</model>
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 11b9a97d5b210..41086318c3108 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -10,22 +10,6 @@ define([
 ], function (paypal, messageList, _) {
     'use strict';
 
-    /**
-     * Returns styles object
-     *
-     * @param {Object} config
-     * @return Object
-     */
-    function processStyles(config) {
-        return {
-            layout: 'vertical',
-            size: 'responsive',
-            color: 'gold',
-            shape: 'rect',
-            label: 'paypal',
-        }
-    };
-
     /**
      * Returns array of allowed funding
      *
@@ -43,16 +27,14 @@ define([
     return function (clientConfig, element) {
         paypal.Button.render({
 
-            // Configure environment
             env: clientConfig.environment,
             client: {[clientConfig.environment]:clientConfig.merchantId},
-            // Customize button (optional)
             locale: clientConfig.locale,
             funding: {
                 allowed: getFunding(clientConfig.allowedFunding),
                 disallowed: getFunding(clientConfig.disallowedFunding)
             },
-            style: processStyles(clientConfig.buttonStyles),
+            style: clientConfig.styles,
 
             // Enable Pay Now checkout flow (optional)
             commit: true,

From 927ee7a847fdee4f4648189e4183f5cb82fd2329 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Thu, 3 Jan 2019 15:34:37 -0600
Subject: [PATCH 469/932] MC-5648: Catalog product list widget Viewport Issues:
 Add to cart buttons are hidden on mobile & Review Links Clash With Other
 Elements

---
 .../Magento_Catalog/web/css/source/module/_listings.less      | 4 ++++
 .../luma/Magento_Catalog/web/css/source/module/_listings.less | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
index d8fce03dc10ab..b7af69fd5ca82 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module/_listings.less
@@ -73,6 +73,10 @@
             &-actions {
                 font-size: 0;
 
+                > * {
+                    font-size: 1.4rem;
+                }
+
                 .actions-secondary {
                     display: inline-block;
                     font-size: 1.4rem;
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index 599b3ae81def9..d477c08fc9553 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -77,6 +77,10 @@
             &-actions {
                 font-size: 0;
 
+                > * {
+                    font-size: 1.4rem;
+                }
+
                 .actions-secondary {
                     display: inline-block;
                     font-size: 1.4rem;

From d0a5ba4491d2cc34e2f23cf407304516e50b7b5e Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 3 Jan 2019 16:49:22 -0600
Subject: [PATCH 470/932] MC-10850: Remove PayPal credit config setting

---
 .../System/Config/Field/Enable/BmlApi.php        |  2 ++
 app/code/Magento/Paypal/Model/AbstractConfig.php |  8 +++++---
 app/code/Magento/Paypal/Model/Config.php         |  2 ++
 .../Paypal/Model/ExpressConfigProvider.php       |  2 +-
 .../etc/adminhtml/system/express_checkout.xml    | 13 -------------
 .../frontend/layout/checkout_index_index.xml     |  3 ---
 .../method-renderer/paypal-express-bml.js        | 16 ----------------
 .../web/js/view/payment/paypal-payments.js       |  4 ----
 8 files changed, 10 insertions(+), 40 deletions(-)
 delete mode 100644 app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
index 1a8a5895c434c..88a33f19de2f4 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
@@ -7,6 +7,8 @@
 
 /**
  * Class Bml
+ * @deprecated
+ * "Enable PayPal Credit" setting was removed. Please @see "Disable Funding Options"
  */
 class BmlApi extends AbstractEnable
 {
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index e5beddac3b189..72f9143f90281 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -293,11 +293,13 @@ public function isMethodActive($method)
                 break;
             case Config::METHOD_WPS_BML:
             case Config::METHOD_WPP_BML:
-                $isEnabled = $this->_scopeConfig->isSetFlag(
-                    'payment/' . Config::METHOD_WPS_BML .'/active',
+                $disabledFunding = $this->_scopeConfig->getValue(
+                    'payment/paypal_express/disable_funding_options',
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
-                )
+                );
+                $isExpressCreditEnabled = $disabledFunding ? !!strpos('CREDIT', $disabledFunding) : true;
+                $isEnabled = $isExpressCreditEnabled
                 || $this->_scopeConfig->isSetFlag(
                     'payment/' . Config::METHOD_WPP_BML .'/active',
                     ScopeInterface::SCOPE_STORE,
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index b058ba129a33f..41ce152b65bce 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -654,6 +654,8 @@ public function isMethodAvailable($methodCode = null)
                 }
                 break;
             case self::METHOD_WPP_BML:
+                //add logic with disallowed funding
+
             case self::METHOD_WPS_BML:
                 // check for express payments dependence
                 if (!$this->isMethodActive(self::METHOD_WPP_EXPRESS)
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 098c231583f9a..eb98df07b05f2 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -199,7 +199,7 @@ private function getButtonStyles()
             'shape' => 'rect',
             'label' => 'paypal'
         ];
-        if ($this->config->getValue('checkout_page_button_customize') === '1') {
+        if (!!$this->config->getValue('checkout_page_button_customize')) {
             $styles['layout'] = $this->config->getValue('checkout_page_button_layout');
             $styles['size'] = $this->config->getValue('checkout_page_button_size');
             $styles['color'] = $this->config->getValue('checkout_page_button_color');
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 137e224fa75c8..87cd9008de2b2 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -158,19 +158,6 @@
                 </depends>
                 <validate>required-entry</validate>
             </field>
-            <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="1" showInWebsite="1">
-                <label>Enable PayPal Credit</label>
-                <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
-                        You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
-                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
-                </comment>
-                <config_path>payment/paypal_express_bml/active</config_path>
-                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\BmlApi</frontend_model>
-                <requires>
-                    <field id="enable_express_checkout"/>
-                </requires>
-            </field>
             <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Sort Order PayPal Credit</label>
                 <config_path>payment/paypal_express_bml/sort_order</config_path>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml
index 73c44faff5a57..ebf38dd2d9945 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml
@@ -47,9 +47,6 @@
                                                                         <item name="paypal_express" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
                                                                         </item>
-                                                                        <item name="paypal_express_bml" xsi:type="array">
-                                                                            <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
-                                                                        </item>
                                                                         <item name="payflow_express_bml" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">false</item>
                                                                         </item>
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js
deleted file mode 100644
index 561b3c0e97168..0000000000000
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-bml.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-define([
-    'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract'
-], function (Component) {
-    'use strict';
-
-    return Component.extend({
-        defaults: {
-            template: 'Magento_Paypal/payment/paypal-express-bml'
-        }
-    });
-});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js
index 9eae0dfb45e43..1628bbed8f1c6 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/paypal-payments.js
@@ -19,10 +19,6 @@ define([
             component: paypalExpress,
             config: window.checkoutConfig.payment.paypalExpress.inContextConfig
         },
-        {
-            type: 'paypal_express_bml',
-            component: 'Magento_Paypal/js/view/payment/method-renderer/paypal-express-bml'
-        },
         {
             type: 'payflow_express',
             component: 'Magento_Paypal/js/view/payment/method-renderer/payflow-express'

From f41a7f6d3812c7c8917f11c407060171cf1fc623 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Thu, 3 Jan 2019 19:28:46 -0600
Subject: [PATCH 471/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 .../Magento/Customer/Block/Address/Book.php   | 183 +++----------
 .../Magento/Customer/Block/Address/Grid.php   | 248 ++++++++++++++++++
 .../Address/{BookTest.php => GridTest.php}    | 134 ++++++----
 .../layout/customer_address_index.xml         |   1 +
 .../frontend/templates/address/book.phtml     |  71 -----
 .../frontend/templates/address/grid.phtml     |  82 ++++++
 .../web/css/source/_module.less               |   3 +-
 .../Customer/Block/Address/BookTest.php       | 108 ++++----
 .../Customer/Block/Address/GridTest.php       | 178 +++++++++++++
 9 files changed, 685 insertions(+), 323 deletions(-)
 create mode 100644 app/code/Magento/Customer/Block/Address/Grid.php
 rename app/code/Magento/Customer/Test/Unit/Block/Address/{BookTest.php => GridTest.php} (56%)
 create mode 100644 app/code/Magento/Customer/view/frontend/templates/address/grid.phtml
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index d6d728b7cf013..b157dbb8e5e4a 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -7,9 +7,7 @@
 
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Model\Address\Mapper;
-use Magento\Framework\App\ObjectManager;
-use Magento\Directory\Model\CountryFactory;
-use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
+use Magento\Customer\Block\Address\Grid as AddressesGrid;
 
 /**
  * Customer address book block
@@ -25,6 +23,11 @@ class Book extends \Magento\Framework\View\Element\Template
      */
     protected $currentCustomer;
 
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    protected $customerRepository;
+
     /**
      * @var AddressRepositoryInterface
      */
@@ -41,32 +44,20 @@ class Book extends \Magento\Framework\View\Element\Template
     protected $addressMapper;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory
-     */
-    private $addressCollectionFactory;
-
-    /**
-     * @var \Magento\Customer\Model\ResourceModel\Address\Collection
+     * @var AddressesGrid
      */
-    private $addressCollection;
-
-    /**
-     * @var CountryFactory
-     */
-    private $countryFactory;
+    private $addressesGrid;
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+     * @param CustomerRepositoryInterface|null $customerRepository
      * @param AddressRepositoryInterface $addressRepository
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param \Magento\Customer\Model\Address\Config $addressConfig
      * @param Mapper $addressMapper
      * @param array $data
-     * @param AddressCollectionFactory|null $addressCollectionFactory
-     * @param CountryFactory|null $countryFactory
+     * @param AddressesGrid|null $addressesGrid
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -76,17 +67,14 @@ public function __construct(
         \Magento\Customer\Model\Address\Config $addressConfig,
         Mapper $addressMapper,
         array $data = [],
-        AddressCollectionFactory $addressCollectionFactory = null,
-        CountryFactory $countryFactory = null
+        Grid $addressesGrid = null
     ) {
         $this->currentCustomer = $currentCustomer;
         $this->addressRepository = $addressRepository;
         $this->_addressConfig = $addressConfig;
         $this->addressMapper = $addressMapper;
-        $this->addressCollectionFactory = $addressCollectionFactory ?: ObjectManager::getInstance()
-            ->get(AddressCollectionFactory::class);
-        $this->countryFactory = $countryFactory ?: ObjectManager::getInstance()->get(CountryFactory::class);
-
+        $this->addressesGrid = $addressesGrid ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(AddressesGrid::class);
         parent::__construct($context, $data);
     }
 
@@ -94,24 +82,22 @@ public function __construct(
      * Prepare the Address Book section layout
      *
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _prepareLayout()
     {
         $this->pageConfig->getTitle()->set(__('Address Book'));
-        parent::_prepareLayout();
-        $this->preparePager();
-        return $this;
+        return parent::_prepareLayout();
     }
 
     /**
      * Generate and return "New Address" URL
      *
      * @return string
+     * @deprecated not used in this block (new block for additional addresses: \Magento\Customer\Block\Address\Grid
      */
     public function getAddAddressUrl()
     {
-        return $this->getUrl('customer/address/new', ['_secure' => true]);
+        return $this->addressesGrid->getAddAddressUrl();
     }
 
     /**
@@ -131,22 +117,25 @@ public function getBackUrl()
      * Generate and return "Delete" URL
      *
      * @return string
+     * @deprecated not used in this block (new block for additional addresses: \Magento\Customer\Block\Address\Grid
      */
     public function getDeleteUrl()
     {
-        return $this->getUrl('customer/address/delete');
+        return $this->addressesGrid->getDeleteUrl();
     }
 
     /**
      * Generate and return "Edit Address" URL.
+     *
      * Address ID passed in parameters
      *
      * @param int $addressId
      * @return string
+     * @deprecated not used in this block (new block for additional addresses: \Magento\Customer\Block\Address\Grid
      */
     public function getAddressEditUrl($addressId)
     {
-        return $this->getUrl('customer/address/edit', ['_secure' => true, 'id' => $addressId]);
+        return $this->addressesGrid->getAddressEditUrl($addressId);
     }
 
     /**
@@ -162,25 +151,16 @@ public function hasPrimaryAddress()
 
     /**
      * Get current additional customer addresses
+     *
      * Will return array of address interfaces if customer have additional addresses and false in other case.
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @deprecated not used in this block (new block for additional addresses: \Magento\Customer\Block\Address\Grid
      */
     public function getAdditionalAddresses()
     {
-        try {
-            $addresses = $this->getAddressCollection();
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-            return false;
-        }
-        $primaryAddressIds = [$this->getDefaultBilling(), $this->getDefaultShipping()];
-        foreach ($addresses as $address) {
-            if (!in_array($address->getId(), $primaryAddressIds)) {
-                $additional[] = $address->getDataModel();
-            }
-        }
-        return empty($additional) ? false : $additional;
+        return $this->addressesGrid->getAdditionalAddresses();
     }
 
     /**
@@ -188,7 +168,6 @@ public function getAdditionalAddresses()
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
-     * @deprecated Not used anymore as addresses are showed as a grid
      */
     public function getAddressHtml(\Magento\Customer\Api\Data\AddressInterface $address = null)
     {
@@ -202,48 +181,28 @@ public function getAddressHtml(\Magento\Customer\Api\Data\AddressInterface $addr
 
     /**
      * Get current customer
+     *
      * Check if customer is stored in current object and return it
      * or get customer by current customer ID through repository
      *
-     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @return \Magento\Customer\Api\Data\CustomerInterface|null
      */
     public function getCustomer()
     {
-        $customer = $this->getData('customer');
-        if ($customer === null) {
-            $customer = $this->currentCustomer->getCustomer();
-            $this->setData('customer', $customer);
-        }
-        return $customer;
+        return $this->addressesGrid->getCustomer();
     }
 
     /**
-     * Get default billing address
-     * Return address string if address found and null if not
-     *
-     * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return int|null
      */
     public function getDefaultBilling()
     {
         $customer = $this->getCustomer();
-
-        return $customer->getDefaultBilling();
-    }
-
-
-    /**
-     * Get default shipping address
-     * Return address string if address found and null of not
-     *
-     * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    public function getDefaultShipping()
-    {
-        $customer = $this->getCustomer();
-
-        return $customer->getDefaultShipping();
+        if ($customer === null) {
+            return null;
+        } else {
+            return $customer->getDefaultBilling();
+        }
     }
 
     /**
@@ -263,77 +222,15 @@ public function getAddressById($addressId)
     }
 
     /**
-     * Get one string street address from "two fields" array or just returns string if it was passed in parameters
-     *
-     * @param string|array $street
-     * @return string
+     * @return int|null
      */
-    public function getStreetAddress($street)
-    {
-        if (is_array($street)) {
-            $street = implode(', ', $street);
-        }
-        return $street;
-    }
-
-    /**
-     * Get pager section HTML code
-     *
-     * @return string
-     */
-    public function getPagerHtml()
-    {
-        return $this->getChildHtml('pager');
-    }
-
-    /**
-     * Get country name by $countryId
-     * Using \Magento\Directory\Model\Country to get country name by $countryId
-     *
-     * @param string $countryId
-     * @return string
-     */
-    public function getCountryById($countryId)
-    {
-        /** @var \Magento\Directory\Model\Country $country */
-        $country = $this->countryFactory->create();
-        return $country->loadByCode($countryId)->getName();
-    }
-
-    /**
-     * Get pager layout
-     *
-     * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    private function preparePager()
-    {
-        $addressCollection = $this->getAddressCollection();
-        if (null !== $addressCollection) {
-            $pager = $this->getLayout()->createBlock(
-                \Magento\Theme\Block\Html\Pager::class,
-                'customer.addresses.pager'
-            )->setCollection($addressCollection);
-            $this->setChild('pager', $pager);
-        }
-    }
-
-    /**
-     * Get customer addresses collection.
-     * Filters collection by customer id
-     *
-     * @return \Magento\Customer\Model\ResourceModel\Address\Collection
-     */
-    private function getAddressCollection()
+    public function getDefaultShipping()
     {
-        if (null === $this->addressCollection) {
-            /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
-            $collection = $this->addressCollectionFactory->create();
-            $collection->setOrder('entity_id', 'desc')
-                ->setCustomerFilter([$this->getCustomer()->getId()]);
-            $this->addressCollection = $collection;
+        $customer = $this->getCustomer();
+        if ($customer === null) {
+            return null;
+        } else {
+            return $customer->getDefaultShipping();
         }
-        return $this->addressCollection;
     }
-
 }
diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
new file mode 100644
index 0000000000000..c944bfb6550aa
--- /dev/null
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Block\Address;
+
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
+use Magento\Directory\Model\CountryFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Customer address grid
+ */
+class Grid extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * @var \Magento\Customer\Helper\Session\CurrentCustomer
+     */
+    private $currentCustomer;
+
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\Address\CollectionFactory
+     */
+    private $addressCollectionFactory;
+
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\Address\Collection
+     */
+    private $addressCollection;
+
+    /**
+     * @var CountryFactory
+     */
+    private $countryFactory;
+
+    /**
+     * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
+     * @param AddressCollectionFactory $addressCollectionFactory
+     * @param CountryFactory $countryFactory
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
+        AddressCollectionFactory $addressCollectionFactory,
+        CountryFactory $countryFactory,
+        \Magento\Framework\View\Element\Template\Context $context,
+        array $data = []
+    ) {
+        $this->currentCustomer = $currentCustomer;
+        $this->addressCollectionFactory = $addressCollectionFactory;
+        $this->countryFactory = $countryFactory;
+
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Prepare the Address Book section layout
+     *
+     * @return $this
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        $this->preparePager();
+        return $this;
+    }
+
+    /**
+     * Generate and return "New Address" URL
+     *
+     * @return string
+     */
+    public function getAddAddressUrl()
+    {
+        return $this->getUrl('customer/address/new', ['_secure' => true]);
+    }
+
+    /**
+     * Generate and return "Delete" URL
+     *
+     * @return string
+     */
+    public function getDeleteUrl()
+    {
+        return $this->getUrl('customer/address/delete');
+    }
+
+    /**
+     * Generate and return "Edit Address" URL.
+     *
+     * Address ID passed in parameters
+     *
+     * @param int $addressId
+     * @return string
+     */
+    public function getAddressEditUrl($addressId)
+    {
+        return $this->getUrl('customer/address/edit', ['_secure' => true, 'id' => $addressId]);
+    }
+
+    /**
+     * Get current additional customer addresses
+     *
+     * Will return array of address interfaces if customer have additional addresses and false in other case.
+     *
+     * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getAdditionalAddresses()
+    {
+        try {
+            $addresses = $this->getAddressCollection();
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+            return false;
+        }
+        $primaryAddressIds = [$this->getDefaultBilling(), $this->getDefaultShipping()];
+        foreach ($addresses as $address) {
+            if (!in_array($address->getId(), $primaryAddressIds)) {
+                $additional[] = $address->getDataModel();
+            }
+        }
+        return empty($additional) ? false : $additional;
+    }
+
+    /**
+     * Get current customer
+     *
+     * Check if customer is stored in current object and return it
+     * or get customer by current customer ID through repository
+     *
+     * @return \Magento\Customer\Api\Data\CustomerInterface|null
+     */
+    public function getCustomer()
+    {
+        $customer = $this->getData('customer');
+        if ($customer === null) {
+            try {
+                $customer = $this->currentCustomer->getCustomer();
+            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+                return null;
+            }
+            $this->setData('customer', $customer);
+        }
+        return $customer;
+    }
+
+    /**
+     * Get one string street address from "two fields" array or just returns string if it was passed in parameters
+     *
+     * @param string|array $street
+     * @return string
+     */
+    public function getStreetAddress($street)
+    {
+        if (is_array($street)) {
+            $street = implode(', ', $street);
+        }
+        return $street;
+    }
+
+    /**
+     * Get country name by $countryCode
+     *
+     * Using \Magento\Directory\Model\Country to get country name by $countryCode
+     *
+     * @param string $countryCode
+     * @return string
+     */
+    public function getCountryByCode($countryCode)
+    {
+        /** @var \Magento\Directory\Model\Country $country */
+        $country = $this->countryFactory->create();
+        return $country->loadByCode($countryCode)->getName();
+    }
+
+
+    /**
+     * Get default billing address
+     * Return address string if address found and null of not
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getDefaultBilling()
+    {
+        $customer = $this->getCustomer();
+
+        return $customer->getDefaultBilling();
+    }
+
+
+    /**
+     * Get default shipping address
+     * Return address string if address found and null of not
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getDefaultShipping()
+    {
+        $customer = $this->getCustomer();
+
+        return $customer->getDefaultShipping();
+    }
+
+    /**
+     * Get pager layout
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function preparePager()
+    {
+        $addressCollection = $this->getAddressCollection();
+        if (null !== $addressCollection) {
+            $pager = $this->getLayout()->createBlock(
+                \Magento\Theme\Block\Html\Pager::class,
+                'customer.addresses.pager'
+            )->setCollection($addressCollection);
+            $this->setChild('pager', $pager);
+        }
+    }
+
+    /**
+     * Get customer addresses collection.
+     *
+     * Filters collection by customer id
+     *
+     * @return \Magento\Customer\Model\ResourceModel\Address\Collection
+     * @throws NoSuchEntityException
+     */
+    private function getAddressCollection()
+    {
+        if (null === $this->addressCollection && $this->getCustomer()) {
+            /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
+            $collection = $this->addressCollectionFactory->create();
+            $collection->setOrder('entity_id', 'desc')
+                ->setCustomerFilter([$this->getCustomer()->getId()]);
+            $this->addressCollection = $collection;
+        } elseif (null === $this->getCustomer()) {
+            throw new NoSuchEntityException(__('Customer not logged in'));
+        }
+        return $this->addressCollection;
+    }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
similarity index 56%
rename from app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php
rename to app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
index 8402a9331b471..0e5b43d38b009 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/BookTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -8,20 +8,15 @@
 use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
 
 /**
- * Unit tests for \Magento\Customer\Block\Address\Book class
+ * Unit tests for \Magento\Customer\Block\Address\Grid class
  */
-class BookTest extends \PHPUnit\Framework\TestCase
+class GridTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
      */
     private $objectManager;
 
-    /**
-     * @var \Magento\Directory\Model\CountryFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $countryFactory;
-
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -32,25 +27,26 @@ class BookTest extends \PHPUnit\Framework\TestCase
      */
     private $currentCustomer;
 
+
     /**
-     * @var \Magento\Framework\View\Page\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Directory\Model\CountryFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $pageConfig;
+    private $countryFactory;
 
     /**
-     * @var \Magento\Customer\Block\Address\Book
+     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $bookBlock;
+    private $urlBuilder;
+
+    /**
+     * @var \Magento\Customer\Block\Address\Grid
+     */
+    private $gridBlock;
 
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->countryFactory = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-
         $this->currentCustomer = $this->getMockBuilder(\Magento\Customer\Helper\Session\CurrentCustomer::class)
             ->disableOriginalConstructor()
             ->setMethods(['getCustomer'])
@@ -61,36 +57,28 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->pageConfig = $this->getMockBuilder(\Magento\Framework\View\Page\Config::class)
+        $this->countryFactory = $this->getMockBuilder(\Magento\Directory\Model\CountryFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getTitle'])
+            ->setMethods(['create'])
             ->getMock();
 
-        $this->bookBlock = $this->objectManager->getObject(
-            \Magento\Customer\Block\Address\Book::class,
+        $this->urlBuilder = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
+
+        $this->gridBlock = $this->objectManager->getObject(
+            \Magento\Customer\Block\Address\Grid::class,
             [
-                'countryFactory' => $this->countryFactory,
                 'addressCollectionFactory' => $this->addressCollectionFactory,
                 'currentCustomer' => $this->currentCustomer,
-                'pageConfig' => $this->pageConfig
+                'countryFactory' => $this->countryFactory,
+                '_urlBuilder' => $this->urlBuilder
             ]
         );
     }
 
     /**
-     * Test for \Magento\Customer\Block\Address\Book::getStreetAddress method
-     */
-    public function testGetStreetAddress()
-    {
-        $street = ['Line 1', 'Line 2'];
-        $expectedAddress = 'Line 1, Line 2';
-        $this->assertEquals($expectedAddress, $this->bookBlock->getStreetAddress($street));
-    }
-
-    /**
-     * Test for \Magento\Customer\Block\Address\Book::getPagerHtml method
+     * Test for \Magento\Customer\Block\Address\Book::getChildHtml method with 'pager' argument
      */
-    public function testGetPagerHtml()
+    public function testGetChildHtml()
     {
         $customerId = 1;
 
@@ -100,11 +88,6 @@ public function testGetPagerHtml()
             ->getMockForAbstractClass();
         /** @var  $layout \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject */
         $layout = $this->getMockForAbstractClass(\Magento\Framework\View\LayoutInterface::class);
-        /** @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject $title */
-        $title = $this->getMockBuilder(\Magento\Framework\View\Page\Title::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['set'])
-            ->getMock();
         /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
         $customer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
         /** @var \PHPUnit_Framework_MockObject_MockObject */
@@ -119,8 +102,6 @@ public function testGetPagerHtml()
             ->willReturn('OutputString');
         $layout->expects($this->atLeastOnce())->method('createBlock')
             ->with(\Magento\Theme\Block\Html\Pager::class, 'customer.addresses.pager')->willReturn($block);
-        $title->expects($this->atLeastOnce())->method('set')->with(__('Address Book'))->willReturnSelf();
-        $this->pageConfig->expects($this->atLeastOnce())->method('getTitle')->willReturn($title);
         $customer->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
         $this->currentCustomer->expects($this->atLeastOnce())->method('getCustomer')->willReturn($customer);
         $addressCollection->expects($this->atLeastOnce())->method('setOrder')->with('entity_id', 'desc')
@@ -130,15 +111,74 @@ public function testGetPagerHtml()
         $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
             ->willReturn($addressCollection);
         $block->expects($this->atLeastOnce())->method('setCollection')->with($addressCollection)->willReturnSelf();
-        $this->bookBlock->setNameInLayout('NameInLayout');
-        $this->bookBlock->setLayout($layout);
-        $this->assertEquals('OutputString', $this->bookBlock->getPagerHtml());
+        $this->gridBlock->setNameInLayout('NameInLayout');
+        $this->gridBlock->setLayout($layout);
+        $this->assertEquals('OutputString', $this->gridBlock->getChildHtml('pager'));
+    }
+
+    /**
+     * Test for \Magento\Customer\Block\Address\Grid::getAddressEditUrl method
+     */
+    public function testGetAddAddressUrl()
+    {
+        $addressId = 1;
+        $expectedUrl = 'expected_url';
+        $this->urlBuilder->expects($this->atLeastOnce())->method('getUrl')
+            ->with('customer/address/edit', ['_secure' => true, 'id' => $addressId])
+            ->willReturn($expectedUrl);
+        $this->assertEquals($expectedUrl, $this->gridBlock->getAddressEditUrl($addressId));
+    }
+
+    public function testGetAdditionalAddresses()
+    {
+        $customerId = 1;
+        /** @var \Magento\Customer\Api\Data\CustomerInterface|\PHPUnit_Framework_MockObject_MockObject $customer */
+        $customer = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+        /** @var \PHPUnit_Framework_MockObject_MockObject */
+        $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setOrder', 'setCustomerFilter', 'load', 'getIterator'])
+            ->getMock();
+        $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
+        $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getId', 'getDataModel'])
+            ->getMock();
+        $collection = [$address, $address, $address];
+        $address->expects($this->exactly(3))->method('getId')
+            ->willReturnOnConsecutiveCalls(1, 2, 3);
+        $address->expects($this->atLeastOnce())->method('getDataModel')->willReturn($addressDataModel);
+        $customer->expects($this->atLeastOnce())->method('getId')->willReturn($customerId);
+        $customer->expects($this->atLeastOnce())->method('getDefaultBilling')->willReturn('1');
+        $customer->expects($this->atLeastOnce())->method('getDefaultShipping')->willReturn('2');
+
+        $this->currentCustomer->expects($this->atLeastOnce())->method('getCustomer')->willReturn($customer);
+        $addressCollection->expects($this->atLeastOnce())->method('setOrder')->with('entity_id', 'desc')
+            ->willReturnSelf();
+        $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->with([$customerId])
+            ->willReturnSelf();
+        $addressCollection->expects($this->atLeastOnce())->method('getIterator')
+            ->willReturn(new \ArrayIterator($collection));
+        $this->addressCollectionFactory->expects($this->atLeastOnce())->method('create')
+            ->willReturn($addressCollection);
+
+        $this->assertEquals($addressDataModel, $this->gridBlock->getAdditionalAddresses()[0]);
+    }
+
+    /**
+     * Test for \Magento\Customer\ViewModel\CustomerAddress::getStreetAddress method
+     */
+    public function testGetStreetAddress()
+    {
+        $street = ['Line 1', 'Line 2'];
+        $expectedAddress = 'Line 1, Line 2';
+        $this->assertEquals($expectedAddress, $this->gridBlock->getStreetAddress($street));
     }
 
     /**
-     * Test for \Magento\Customer\Block\Address\Book::getCountryById method
+     * Test for \Magento\Customer\ViewModel\CustomerAddress::getCountryByCode method
      */
-    public function testGetCpuntryByid()
+    public function testGetCountryByCode()
     {
         $countryId = 'US';
         $countryName = 'United States';
@@ -149,6 +189,6 @@ public function testGetCpuntryByid()
         $this->countryFactory->expects($this->atLeastOnce())->method('create')->willReturn($country);
         $country->expects($this->atLeastOnce())->method('loadByCode')->with($countryId)->willReturnSelf();
         $country->expects($this->atLeastOnce())->method('getName')->willReturn($countryName);
-        $this->assertEquals($countryName, $this->bookBlock->getCountryById($countryId));
+        $this->assertEquals($countryName, $this->gridBlock->getCountryByCode($countryId));
     }
 }
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
index bad120e46277f..2c5e5b98e5f7b 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
@@ -13,6 +13,7 @@
         </referenceBlock>
         <referenceContainer name="content">
             <block class="Magento\Customer\Block\Address\Book" name="address_book" template="Magento_Customer::address/book.phtml" cacheable="false"/>
+            <block class="Magento\Customer\Block\Address\Grid" name="address_grid" template="Magento_Customer::address/grid.phtml" cacheable="false"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index 8c6d8e5985201..9d09a090deac1 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -62,74 +62,3 @@
         <?php endif ?>
     </div>
 </div>
-
-<div class="block block-addresses-list">
-    <div class="block-title"><strong><?= $block->escapeHtml(__('Additional Address Entries')) ?></strong></div>
-    <div class="block-content">
-        <?php if ($_pAddsses = $block->getAdditionalAddresses()): ?>
-
-            <div class="table-wrapper additional-addresses">
-                <table class="data table table-additional-addresses-items history" id="additional-addresses-table">
-                    <caption class="table-caption"><?= /* @escapeNotVerified */ __('Additional addresses') ?></caption>
-                    <thead>
-                    <tr>
-                        <th scope="col" class="col firstname"><?= /* @escapeNotVerified */ __('First Name') ?></th>
-                        <th scope="col" class="col lastname"><?= /* @escapeNotVerified */ __('Last Name') ?></th>
-                        <th scope="col" class="col streetaddress"><?= /* @escapeNotVerified */ __('Street Address') ?></th>
-                        <th scope="col" class="col city"><?= /* @escapeNotVerified */ __('City') ?></th>
-                        <th scope="col" class="col country"><?= /* @escapeNotVerified */ __('Country') ?></th>
-                        <th scope="col" class="col state"><?= /* @escapeNotVerified */ __('State') ?></th>
-                        <th scope="col" class="col zip"><?= /* @escapeNotVerified */ __('Zip/Postal Code') ?></th>
-                        <th scope="col" class="col phone"><?= /* @escapeNotVerified */ __('Phone') ?></th>
-                        <th scope="col" class="col actions"> </th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <?php foreach ($_pAddsses as $address): ?>
-                        <tr>
-                            <td data-th="<?= $block->escapeHtml(__('First Name')) ?>" class="col firstname"><?= /* @escapeNotVerified */ $address->getFirstname() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Last Name')) ?>" class="col lastname"><?= /* @escapeNotVerified */ $address->getLastname() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->getStreetAddress($address->getStreet()) ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= /* @escapeNotVerified */ $address->getCity() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= /* @escapeNotVerified */ $block->getCountryById($address->getCountryId()) ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion()->getRegion() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= /* @escapeNotVerified */ $address->getPostcode() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= /* @escapeNotVerified */ $address->getTelephone() ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
-                                <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
-                                <a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete')) ?></span></a>
-                            </td>
-                        </tr>
-                    <?php endforeach; ?>
-                    </tbody>
-                </table>
-            </div>
-            <?php if ($block->getPagerHtml()): ?>
-                <div class="customer-addresses-toolbar toolbar bottom"><?= $block->getPagerHtml() ?></div>
-            <?php endif ?>
-        <?php else: ?>
-            <p class="empty"><?= $block->escapeHtml(__('You have no other address entries in your address book.')) ?></p>
-        <?php endif ?>
-    </div>
-</div>
-
-<div class="actions-toolbar">
-    <div class="primary">
-        <button type="button" role="add-address" title="<?= $block->escapeHtmlAttr(__('Add New Address')) ?>" class="action primary add"><span><?= $block->escapeHtml(__('Add New Address')) ?></span></button>
-    </div>
-    <div class="secondary">
-        <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
-    </div>
-</div>
-<script type="text/x-magento-init">
-    {
-        ".page-main": {
-            "address": {
-                "deleteAddress": "td a[role='delete-address']",
-                "deleteUrlPrefix": "<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>id/",
-                "addAddress": "button[role='add-address']",
-                "addAddressLocation": "<?= $block->escapeJs($block->escapeUrl($block->getAddAddressUrl())) ?>"
-            }
-        }
-    }
-</script>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml b/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml
new file mode 100644
index 0000000000000..452c30fe9f5fc
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+/** @var \Magento\Customer\Block\Address\Grid $block */
+$customerAddressView = $block->getData('customer_address');
+?>
+
+<div class="block block-addresses-list">
+    <div class="block-title"><strong><?= $block->escapeHtml(__('Additional Address Entries')) ?></strong></div>
+    <div class="block-content">
+        <?php if ($_pAddsses = $block->getAdditionalAddresses()): ?>
+
+            <div class="table-wrapper additional-addresses">
+                <table class="data table table-additional-addresses-items history" id="additional-addresses-table">
+                    <caption class="table-caption"><?= /* @escapeNotVerified */ __('Additional addresses') ?></caption>
+                    <thead>
+                    <tr>
+                        <th scope="col" class="col firstname"><?= /* @escapeNotVerified */ __('First Name') ?></th>
+                        <th scope="col" class="col lastname"><?= /* @escapeNotVerified */ __('Last Name') ?></th>
+                        <th scope="col" class="col streetaddress"><?= /* @escapeNotVerified */ __('Street Address') ?></th>
+                        <th scope="col" class="col city"><?= /* @escapeNotVerified */ __('City') ?></th>
+                        <th scope="col" class="col country"><?= /* @escapeNotVerified */ __('Country') ?></th>
+                        <th scope="col" class="col state"><?= /* @escapeNotVerified */ __('State') ?></th>
+                        <th scope="col" class="col zip"><?= /* @escapeNotVerified */ __('Zip/Postal Code') ?></th>
+                        <th scope="col" class="col phone"><?= /* @escapeNotVerified */ __('Phone') ?></th>
+                        <th scope="col" class="col actions"> </th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <?php foreach ($_pAddsses as $address): ?>
+                        <tr>
+                            <td data-th="<?= $block->escapeHtml(__('First Name')) ?>" class="col firstname"><?= $block->escapeHtml($address->getFirstname()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Last Name')) ?>" class="col lastname"><?= $block->escapeHtml($address->getLastname()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->escapeHtml($block->getStreetAddress($address->getStreet())) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= $block->escapeHtml($address->getCity()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= /* @escapeNotVerified */ $block->getCountryByCode($address->getCountryId()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion()->getRegion() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Zip/Postal Code')) ?>" class="col zip"><?= $block->escapeHtml($address->getPostcode()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Phone')) ?>" class="col phone"><?= $block->escapeHtml($address->getTelephone()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
+                                <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
+                                <a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete')) ?></span></a>
+                            </td>
+                        </tr>
+                    <?php endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
+            <?php if ($block->getChildHtml('pager')): ?>
+                <div class="customer-addresses-toolbar toolbar bottom"><?= $block->getChildHtml('pager') ?></div>
+            <?php endif ?>
+        <?php else: ?>
+            <p class="empty"><?= $block->escapeHtml(__('You have no other address entries in your address book.')) ?></p>
+        <?php endif ?>
+    </div>
+</div>
+
+<div class="actions-toolbar">
+    <div class="primary">
+        <button type="button" role="add-address" title="<?= $block->escapeHtmlAttr(__('Add New Address')) ?>" class="action primary add"><span><?= $block->escapeHtml(__('Add New Address')) ?></span></button>
+    </div>
+    <div class="secondary">
+        <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
+    </div>
+</div>
+<script type="text/x-magento-init">
+    {
+        ".page-main": {
+            "address": {
+                "deleteAddress": "td a[role='delete-address']",
+                "deleteUrlPrefix": "<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>id/",
+                "addAddress": "button[role='add-address']",
+                "addAddressLocation": "<?= $block->escapeJs($block->escapeUrl($block->getAddAddressUrl())) ?>"
+            }
+        }
+    }
+</script>
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index 6e953778ee8ed..2e7856d390bd0 100755
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -334,7 +334,8 @@
         }
     }
 
-    .order-products-toolbar, .customer-addresses-toolbar {
+    .order-products-toolbar,
+    .customer-addresses-toolbar {
         position: relative;
 
         .toolbar-amount {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
index b5ae01b32fada..1ef7d54c5aa78 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
@@ -11,9 +11,9 @@
 class BookTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\View\LayoutInterface
+     * @var \Magento\Customer\Block\Address\Book
      */
-    private $layout;
+    protected $_block;
 
     /**
      * @var \Magento\Customer\Helper\Session\CurrentCustomer
@@ -32,8 +32,15 @@ protected function setUp()
 
         $this->currentCustomer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get(\Magento\Customer\Helper\Session\CurrentCustomer::class);
-        $this->layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
-        $this->layout->setBlock('head', $blockMock);
+        /** @var \Magento\Framework\View\LayoutInterface $layout */
+        $layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
+        $layout->setBlock('head', $blockMock);
+        $this->_block = $layout
+            ->createBlock(
+                \Magento\Customer\Block\Address\Book::class,
+                '',
+                ['currentCustomer' => $this->currentCustomer]
+            );
     }
 
     protected function tearDown()
@@ -45,17 +52,11 @@ protected function tearDown()
         $customerRegistry->remove(1);
     }
 
-    /**
-     * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoAppIsolation enabled
-     */
     public function testGetAddressEditUrl()
     {
-        $bookBlock = $this->createBlockForCustomer(1);
-
         $this->assertEquals(
             'http://localhost/index.php/customer/address/edit/id/1/',
-            $bookBlock->getAddressEditUrl(1)
+            $this->_block->getAddressEditUrl(1)
         );
     }
 
@@ -64,19 +65,19 @@ public function testGetAddressEditUrl()
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
      * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
      * @dataProvider hasPrimaryAddressDataProvider
-     * @param int $customerId
-     * @param bool $expected
      * @magentoAppIsolation enabled
      */
     public function testHasPrimaryAddress($customerId, $expected)
     {
-        $bookBlock = $this->createBlockForCustomer($customerId);
-        $this->assertEquals($expected, $bookBlock->hasPrimaryAddress());
+        if (!empty($customerId)) {
+            $this->currentCustomer->setCustomerId($customerId);
+        }
+        $this->assertEquals($expected, $this->_block->hasPrimaryAddress());
     }
 
     public function hasPrimaryAddressDataProvider()
     {
-        return ['1' => [1, true], '5' => [5, false]];
+        return ['0' => [0, false], '1' => [1, true], '5' => [5, false]];
     }
 
     /**
@@ -86,14 +87,14 @@ public function hasPrimaryAddressDataProvider()
      */
     public function testGetAdditionalAddresses()
     {
-        $bookBlock = $this->createBlockForCustomer(1);
-        $this->assertNotNull($bookBlock->getAdditionalAddresses());
-        $this->assertCount(1, $bookBlock->getAdditionalAddresses());
+        $this->currentCustomer->setCustomerId(1);
+        $this->assertNotNull($this->_block->getAdditionalAddresses());
+        $this->assertCount(1, $this->_block->getAdditionalAddresses());
         $this->assertInstanceOf(
             \Magento\Customer\Api\Data\AddressInterface::class,
-            $bookBlock->getAdditionalAddresses()[0]
+            $this->_block->getAdditionalAddresses()[0]
         );
-        $this->assertEquals(2, $bookBlock->getAdditionalAddresses()[0]->getId());
+        $this->assertEquals(2, $this->_block->getAdditionalAddresses()[0]->getId());
     }
 
     /**
@@ -103,14 +104,15 @@ public function testGetAdditionalAddresses()
      */
     public function testGetAdditionalAddressesNegative($customerId, $expected)
     {
-        $bookBlock = $this->createBlockForCustomer($customerId);
-        $this->currentCustomer->setCustomerId($customerId);
-        $this->assertEquals($expected, $bookBlock->getAdditionalAddresses());
+        if (!empty($customerId)) {
+            $this->currentCustomer->setCustomerId($customerId);
+        }
+        $this->assertEquals($expected, $this->_block->getAdditionalAddresses());
     }
 
     public function getAdditionalAddressesDataProvider()
     {
-        return ['5' => [5, false]];
+        return ['0' => [0, false], '5' => [5, false]];
     }
 
     /**
@@ -120,24 +122,18 @@ public function getAdditionalAddressesDataProvider()
      */
     public function testGetAddressHtml()
     {
-        $bookBlock = $this->createBlockForCustomer(1);
         $expected = "John Smith<br />\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM,  Alabama, 75477<br />" .
             "\nUnited States<br />\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
         $address = Bootstrap::getObjectManager()->get(
             \Magento\Customer\Api\AddressRepositoryInterface::class
         )->getById(1);
-        $html = $bookBlock->getAddressHtml($address);
+        $html = $this->_block->getAddressHtml($address);
         $this->assertEquals($expected, $html);
     }
 
-    /**
-     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-     * @magentoAppIsolation enabled
-     */
     public function testGetAddressHtmlWithoutAddress()
     {
-        $bookBlock = $this->createBlockForCustomer(5);
-        $this->assertEquals('', $bookBlock->getAddressHtml(null));
+        $this->assertEquals('', $this->_block->getAddressHtml(null));
     }
 
     /**
@@ -146,16 +142,22 @@ public function testGetAddressHtmlWithoutAddress()
      */
     public function testGetCustomer()
     {
-        $bookBlock = $this->createBlockForCustomer(1);
         /** @var CustomerRepositoryInterface $customerRepository */
         $customerRepository = Bootstrap::getObjectManager()->get(
             \Magento\Customer\Api\CustomerRepositoryInterface::class
         );
         $customer = $customerRepository->getById(1);
-        $object = $bookBlock->getCustomer();
+
+        $this->currentCustomer->setCustomerId(1);
+        $object = $this->_block->getCustomer();
         $this->assertEquals($customer, $object);
     }
 
+    public function testGetCustomerMissingCustomer()
+    {
+        $this->assertNull($this->_block->getCustomer());
+    }
+
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
@@ -165,13 +167,13 @@ public function testGetCustomer()
      */
     public function testGetDefaultBilling($customerId, $expected)
     {
-        $bookBlock = $this->createBlockForCustomer($customerId);
-        $this->assertEquals($expected, $bookBlock->getDefaultBilling());
+        $this->currentCustomer->setCustomerId($customerId);
+        $this->assertEquals($expected, $this->_block->getDefaultBilling());
     }
 
     public function getDefaultBillingDataProvider()
     {
-        return ['1' => [1, 1], '5' => [5, null]];
+        return ['0' => [0, null], '1' => [1, 1], '5' => [5, null]];
     }
 
     /**
@@ -183,40 +185,24 @@ public function getDefaultBillingDataProvider()
      */
     public function testGetDefaultShipping($customerId, $expected)
     {
-        $bookBlock = $this->createBlockForCustomer($customerId);
-        $this->currentCustomer->setCustomerId($customerId);
-        $this->assertEquals($expected, $bookBlock->getDefaultShipping());
+        if (!empty($customerId)) {
+            $this->currentCustomer->setCustomerId($customerId);
+        }
+        $this->assertEquals($expected, $this->_block->getDefaultShipping());
     }
 
     public function getDefaultShippingDataProvider()
     {
-        return ['1' => [1, 1], '5' => [5, null]];
+        return ['0' => [0, null], '1' => [1, 1], '5' => [5, null]];
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoAppIsolation enabled
      */
     public function testGetAddressById()
     {
-        $bookBlock = $this->createBlockForCustomer(1);
-        $this->assertInstanceOf(\Magento\Customer\Api\Data\AddressInterface::class, $bookBlock->getAddressById(1));
-    }
-
-    /**
-     * Create address book block for customer
-     *
-     * @param int $customerId
-     * @return \Magento\Framework\View\Element\BlockInterface
-     */
-    private function createBlockForCustomer($customerId)
-    {
-        $this->currentCustomer->setCustomerId($customerId);
-        return $this->layout->createBlock(
-            \Magento\Customer\Block\Address\Book::class,
-            '',
-            ['currentCustomer' => $this->currentCustomer]
-        );
+        $this->assertInstanceOf(\Magento\Customer\Api\Data\AddressInterface::class, $this->_block->getAddressById(1));
+        $this->assertNull($this->_block->getAddressById(5));
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php
new file mode 100644
index 0000000000000..ccf6f3b3a4bf7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Block\Address;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Integration tests for the \Magento\Customer\Block\Address\Grid class
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class GridTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Framework\View\LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @var \Magento\Customer\Helper\Session\CurrentCustomer
+     */
+    protected $currentCustomer;
+
+    protected function setUp()
+    {
+        /** @var \PHPUnit_Framework_MockObject_MockObject $blockMock */
+        $blockMock = $this->getMockBuilder(
+            \Magento\Framework\View\Element\BlockInterface::class
+        )->disableOriginalConstructor()->setMethods(
+            ['setTitle', 'toHtml']
+        )->getMock();
+        $blockMock->expects($this->any())->method('setTitle');
+
+        $this->currentCustomer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Customer\Helper\Session\CurrentCustomer::class);
+        $this->layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
+        $this->layout->setBlock('head', $blockMock);
+    }
+
+    protected function tearDown()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Customer\Model\CustomerRegistry $customerRegistry */
+        $customerRegistry = $objectManager->get(\Magento\Customer\Model\CustomerRegistry::class);
+        // Cleanup customer from registry
+        $customerRegistry->remove(1);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoAppIsolation enabled
+     */
+    public function testGetAddressEditUrl()
+    {
+        $gridBlock = $this->createBlockForCustomer(1);
+
+        $this->assertEquals(
+            'http://localhost/index.php/customer/address/edit/id/1/',
+            $gridBlock->getAddressEditUrl(1)
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoAppIsolation enabled
+     */
+    public function testGetAdditionalAddresses()
+    {
+        $gridBlock = $this->createBlockForCustomer(1);
+        $this->assertNotNull($gridBlock->getAdditionalAddresses());
+        $this->assertCount(1, $gridBlock->getAdditionalAddresses());
+        $this->assertInstanceOf(
+            \Magento\Customer\Api\Data\AddressInterface::class,
+            $gridBlock->getAdditionalAddresses()[0]
+        );
+        $this->assertEquals(2, $gridBlock->getAdditionalAddresses()[0]->getId());
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+     * @dataProvider getAdditionalAddressesDataProvider
+     * @magentoAppIsolation enabled
+     */
+    public function testGetAdditionalAddressesNegative($customerId, $expected)
+    {
+        $gridBlock = $this->createBlockForCustomer($customerId);
+        $this->currentCustomer->setCustomerId($customerId);
+        $this->assertEquals($expected, $gridBlock->getAdditionalAddresses());
+    }
+
+    public function getAdditionalAddressesDataProvider()
+    {
+        return ['5' => [5, false]];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+     * @magentoAppIsolation enabled
+     */
+    public function testGetAddressHtmlWithoutAddress()
+    {
+        $gridBlock = $this->createBlockForCustomer(5);
+        $this->assertEquals('', $gridBlock->getAddressHtml(null));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoAppIsolation enabled
+     */
+    public function testGetCustomer()
+    {
+        $gridBlock = $this->createBlockForCustomer(1);
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = Bootstrap::getObjectManager()->get(
+            \Magento\Customer\Api\CustomerRepositoryInterface::class
+        );
+        $customer = $customerRepository->getById(1);
+        $object = $gridBlock->getCustomer();
+        $this->assertEquals($customer, $object);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+     * @dataProvider getDefaultBillingDataProvider
+     * @magentoAppIsolation enabled
+     */
+    public function testGetDefaultBilling($customerId, $expected)
+    {
+        $gridBlock = $this->createBlockForCustomer($customerId);
+        $this->assertEquals($expected, $gridBlock->getDefaultBilling());
+    }
+
+    public function getDefaultBillingDataProvider()
+    {
+        return ['1' => [1, 1], '5' => [5, null]];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+     * @dataProvider getDefaultShippingDataProvider
+     * @magentoAppIsolation enabled
+     */
+    public function testGetDefaultShipping($customerId, $expected)
+    {
+        $gridBlock = $this->createBlockForCustomer($customerId);
+        $this->currentCustomer->setCustomerId($customerId);
+        $this->assertEquals($expected, $gridBlock->getDefaultShipping());
+    }
+
+    public function getDefaultShippingDataProvider()
+    {
+        return ['1' => [1, 1], '5' => [5, null]];
+    }
+
+    /**
+     * Create address book block for customer
+     *
+     * @param int $customerId
+     * @return \Magento\Framework\View\Element\BlockInterface
+     */
+    private function createBlockForCustomer($customerId)
+    {
+        $this->currentCustomer->setCustomerId($customerId);
+        return $this->layout->createBlock(
+            \Magento\Customer\Block\Address\Grid::class,
+            '',
+            ['currentCustomer' => $this->currentCustomer]
+        );
+    }
+}

From 4762727b9e373e2d4d03e46361ee43abc339e9ad Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Thu, 3 Jan 2019 21:41:36 -0600
Subject: [PATCH 472/932] magento-engcom/magento2ce#2445: Fixed code style
 issues

---
 .../Controller/Adminhtml/Promo/Quote/Generate.php        | 7 +++++--
 app/code/Magento/SalesRule/Model/Coupon.php              | 4 ++++
 app/code/Magento/SalesRule/Model/Data/Rule.php           | 8 ++++++--
 .../Model/Plugin/QuoteConfigProductAttributes.php        | 3 +++
 .../SalesRule/Model/ResourceModel/ReadHandler.php        | 3 +++
 .../SalesRule/Model/ResourceModel/SaveHandler.php        | 3 +++
 .../SalesRule/Model/Rule/Action/Discount/CartFixed.php   | 2 ++
 app/code/Magento/SalesRule/Model/RuleRepository.php      | 6 +++---
 .../Setup/Patch/Data/ConvertSerializedDataToJson.php     | 7 ++++---
 .../Patch/Data/FillSalesRuleProductAttributeTable.php    | 9 +++++----
 .../Setup/Patch/Data/PrepareRuleModelSerializedData.php  | 9 +++++----
 .../Magento/Shipping/Block/Adminhtml/Order/Packaging.php | 1 +
 app/code/Magento/Usps/Model/Carrier.php                  | 2 ++
 13 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
index 1a3828ea08c48..da05fd98e609b 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
@@ -1,14 +1,17 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\SalesRule\Model\CouponGenerator;
 
-class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
+/**
+ * Generate promo quote
+ */
+class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote implements HttpPostActionInterface
 {
     /**
      * @var CouponGenerator
diff --git a/app/code/Magento/SalesRule/Model/Coupon.php b/app/code/Magento/SalesRule/Model/Coupon.php
index 3c579e29a4264..3c96d08a38dd9 100644
--- a/app/code/Magento/SalesRule/Model/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/Coupon.php
@@ -190,6 +190,8 @@ public function getTimesUsed()
     }
 
     /**
+     * Set Times Used
+     *
      * @param int $timesUsed
      * @return $this
      */
@@ -273,6 +275,8 @@ public function getType()
     }
 
     /**
+     * Set type
+     *
      * @param int $type
      * @return $this
      */
diff --git a/app/code/Magento/SalesRule/Model/Data/Rule.php b/app/code/Magento/SalesRule/Model/Data/Rule.php
index e9a70ade04be2..58520831c016b 100644
--- a/app/code/Magento/SalesRule/Model/Data/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Data/Rule.php
@@ -270,6 +270,8 @@ public function getIsAdvanced()
     }
 
     /**
+     * Set Is Advanced
+     *
      * @param bool $isAdvanced
      * @return $this
      */
@@ -373,6 +375,8 @@ public function getSortOrder()
     }
 
     /**
+     * Set Sort Order
+     *
      * @param int $sortOrder
      * @return $this
      */
@@ -616,7 +620,7 @@ public function setSimpleFreeShipping($simpleFreeShipping)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\SalesRule\Api\Data\RuleExtensionInterface|null
      */
@@ -626,7 +630,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\SalesRule\Api\Data\RuleExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
index 9eb7f21ed1374..b9d461037a230 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
@@ -7,6 +7,9 @@
 
 use Magento\SalesRule\Model\ResourceModel\Rule as RuleResource;
 
+/**
+ * Quote Config Product Attributes Class
+ */
 class QuoteConfigProductAttributes
 {
     /**
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
index 1d76bb11e3ce1..22d8b8446538c 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
@@ -36,11 +36,14 @@ public function __construct(
     }
 
     /**
+     * Read handler
+     *
      * @param string $entityType
      * @param array $entityData
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
index e59a1217f7d0e..d4ef15f1801bc 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
@@ -36,11 +36,14 @@ public function __construct(
     }
 
     /**
+     * Save handler
+     *
      * @param string $entityType
      * @param array $entityData
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
index cdf2351ef076b..2ae1c1c7ac63a 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
@@ -49,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Fixed discount for cart calculation
+     *
      * @param \Magento\SalesRule\Model\Rule $rule
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
      * @param float $qty
diff --git a/app/code/Magento/SalesRule/Model/RuleRepository.php b/app/code/Magento/SalesRule/Model/RuleRepository.php
index ce34e86ba7f6b..2cff0d64dba01 100644
--- a/app/code/Magento/SalesRule/Model/RuleRepository.php
+++ b/app/code/Magento/SalesRule/Model/RuleRepository.php
@@ -106,7 +106,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(\Magento\SalesRule\Api\Data\RuleInterface $rule)
     {
@@ -118,7 +118,7 @@ public function save(\Magento\SalesRule\Api\Data\RuleInterface $rule)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getById($id)
     {
@@ -135,7 +135,7 @@ public function getById($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getList(SearchCriteriaInterface $searchCriteria)
     {
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
index ea8a0a551760c..e863f2af3354d 100644
--- a/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -11,6 +11,7 @@
 
 /**
  * Class ConvertSerializedDataToJson
+ *
  * @package Magento\SalesRule\Setup\Patch
  */
 class ConvertSerializedDataToJson implements DataPatchInterface, PatchVersionInterface
@@ -58,7 +59,7 @@ public function apply()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -68,7 +69,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -76,7 +77,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
index fe6b1eea7a4d7..22cf4fe6b1075 100644
--- a/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/FillSalesRuleProductAttributeTable.php
@@ -12,6 +12,7 @@
 
 /**
  * Class FillSalesRuleProductAttributeTable
+ *
  * @package Magento\SalesRule\Setup\Patch
  */
 class FillSalesRuleProductAttributeTable implements DataPatchInterface, PatchVersionInterface
@@ -64,7 +65,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -101,7 +102,7 @@ public function fillSalesRuleProductAttributeTable()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -111,7 +112,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -119,7 +120,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
index 651b2c0e8a9e2..cad83b6f5d1dd 100644
--- a/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
+++ b/app/code/Magento/SalesRule/Setup/Patch/Data/PrepareRuleModelSerializedData.php
@@ -12,6 +12,7 @@
 
 /**
  * Class PrepareRuleModelSerializedData
+ *
  * @package Magento\SalesRule\Setup\Patch
  */
 class PrepareRuleModelSerializedData implements DataPatchInterface, PatchVersionInterface
@@ -32,7 +33,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -58,7 +59,7 @@ public function apply()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -66,7 +67,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -74,7 +75,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
index c561a0982dce2..e5e419328eea4 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
@@ -74,6 +74,7 @@ public function getShipment()
      * Configuration for popup window for packaging
      *
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getConfigDataJson()
     {
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 8e1462375e7a4..e46257452b27f 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -366,6 +366,7 @@ public function getResult()
 
     /**
      * @inheritdoc
+     *
      * Starting from 23.02.2018 USPS doesn't allow to create free shipping labels via their API.
      */
     public function isShippingLabelsAvailable()
@@ -1167,6 +1168,7 @@ public function getAllowedMethods()
 
     /**
      * Return USPS county name by country ISO 3166-1-alpha-2 code
+     *
      * Return false for unknown countries
      *
      * @param string $countryId

From 3f04ae1a1394bc4058ff262a4dc2c527d3b4072f Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Thu, 3 Jan 2019 22:00:24 -0600
Subject: [PATCH 473/932] magento-engcom/magento2ce#2445: Skip test that cause
 integration job failure

---
 .../Magento/CatalogImportExport/Model/ProductTest.php     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
index 186c6b8a92bb1..11cc73e2cf944 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
@@ -10,6 +10,14 @@
  */
 class ProductTest extends AbstractProductExportImportTestCase
 {
+    /**
+     * Set up
+     */
+    protected function setUp()
+    {
+        $this->markTestSkipped('MAGETWO-97378');
+    }
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */

From 69eaa77c837ac8a19fb7f2f3dccd9d60dd286b41 Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Fri, 4 Jan 2019 12:00:55 +0300
Subject: [PATCH 474/932] MAGETWO-94556: Undefined variables during product
 save

- Fixed js unit test;
---
 .../view/adminhtml/web/js/variations/variations.test.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
index c3bb90f79a495..6b68978380ea4 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/variations.test.js
@@ -164,8 +164,8 @@ define([
 
             variation.serializeData();
 
-            expect(variation.source.data['configurable-matrix']).toBeUndefined();
-            expect(variation.source.data['associated_product_ids']).toBeUndefined();
+            expect(variation.source.data['configurable-matrix']).toEqual(matrix);
+            expect(variation.source.data['associated_product_ids']).toEqual(ids);
             expect(variation.source.data['configurable-matrix-serialized']).toEqual(resultMatrix);
             expect(variation.source.data['associated_product_ids_serialized']).toEqual(resultIds);
 

From 96852f6dca2452bd0a3cd9862de7ee1acf01a69a Mon Sep 17 00:00:00 2001
From: Wilko Nienhaus <wilko.nienhaus@vaimo.com>
Date: Fri, 4 Jan 2019 10:29:33 +0100
Subject: [PATCH 475/932] Fix code style issues in my change

---
 app/code/Magento/WebapiAsync/Model/Config.php                | 2 +-
 app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php  | 5 +++--
 .../AsynchronousOperations/Model/MassScheduleTest.php        | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/WebapiAsync/Model/Config.php b/app/code/Magento/WebapiAsync/Model/Config.php
index cfb9ebe0c40ea..e80ecbabdbd43 100644
--- a/app/code/Magento/WebapiAsync/Model/Config.php
+++ b/app/code/Magento/WebapiAsync/Model/Config.php
@@ -150,8 +150,8 @@ private function generateLookupKeyByRouteData($routeUrl, $httpMethod)
      * self::TOPIC_PREFIX + Magento\Catalog\Api\ProductRepositoryInterface + save + POST
      *   => async.magento.catalog.api.productrepositoryinterface.save.POST
      *
-     * @param string $serviceMethod
      * @param string $serviceInterface
+     * @param string $serviceMethod
      * @param string $httpMethod
      * @return string
      */
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
index 563af162c6f89..47b75b2057316 100644
--- a/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ConfigTest.php
@@ -61,7 +61,7 @@ public function testGetServicesSetsTopicFromServiceContractName()
                 '/V1/products' => [
                     'POST' => [
                         'service' => [
-                            'class' => 'Magento\Catalog\Api\ProductRepositoryInterface',
+                            'class' => \Magento\Catalog\Api\ProductRepositoryInterface::class,
                             'method' => 'save',
                         ]
                     ]
@@ -87,4 +87,5 @@ public function testGetServicesSetsTopicFromServiceContractName()
         $lookupKey = 'async.V1.products.POST';
         $this->assertArrayHasKey($lookupKey, $result);
         $this->assertEquals($result[$lookupKey]['topic'], $expectedTopic);
-    }}
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
index c43db401da208..c0cc1763b2654 100644
--- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
@@ -128,7 +128,10 @@ public function sendBulk($products)
         }
         $this->clearProducts();
 
-        $result = $this->massSchedule->publishMass('async.magento.catalog.api.productrepositoryinterface.save.post', $products);
+        $result = $this->massSchedule->publishMass(
+            'async.magento.catalog.api.productrepositoryinterface.save.post',
+            $products
+        );
 
         //assert bulk accepted with no errors
         $this->assertFalse($result->isErrors());

From eb1d10ca43d5ead63dbad7fe2674153a043d88b4 Mon Sep 17 00:00:00 2001
From: Oleg Onufer <linkedddd@gmail.com>
Date: Fri, 4 Jan 2019 11:55:19 +0200
Subject: [PATCH 476/932] MAGETWO-96719: [Staging] Cart Price Rule >> Assign to
 the existing Update

---
 ...erDefaultShippingAddressForVirtualQuoteTest.xml | 14 ++++----------
 .../Customer/Test/Mftf/Data/AddressData.xml        |  9 +++++++++
 .../Customer/Test/Mftf/Data/CustomerData.xml       | 12 ++++++++++++
 ...nInShoppingCartForCustomerPhysicalQuoteTest.xml |  4 ++--
 ...onInShoppingCartForCustomerVirtualQuoteTest.xml |  4 ++--
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
index 70f950f6f6c35..b0e1dead1fff9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml
@@ -19,18 +19,12 @@
             <group value="checkout"/>
         </annotations>
         <before>
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="defaultVirtualProduct" stepKey="createVirtualProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-            <createData entity="Simple_US_Customer_CA" stepKey="createCustomer">
-                <field key="group_id">1</field>
-            </createData>
+            <createData entity="VirtualProduct" stepKey="createVirtualProduct"/>
+            <createData entity="Customer_With_Different_Default_Billing_Shipping_Addresses" stepKey="createCustomer"/>
         </before>
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
             <deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
         </after>
         <!-- Steps -->
@@ -48,8 +42,8 @@
         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingcart"/>
         <!-- Step 4: Open Estimate Tax section -->
         <click selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" stepKey="openEstimateTaxSection"/>
-        <see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCountry"/>
-        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCountry"/>
+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
         <scrollTo selector="{{CheckoutCartSummarySection.postcode}}" stepKey="scrollToPostCodeField"/>
         <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
         <assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index c7335f9024218..ed385d164e132 100755
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -95,6 +95,7 @@
         <data key="city">Los Angeles</data>
         <data key="state">California</data>
         <data key="country_id">US</data>
+        <data key="country">United States</data>
         <data key="postcode">90001</data>
         <data key="telephone">512-345-6789</data>
         <data key="default_billing">Yes</data>
@@ -148,4 +149,12 @@
         </array>
         <data key="state">California</data>
     </entity>
+    <entity name="US_Default_Billing_Address_TX" type="address" extends="US_Address_TX">
+        <data key="default_billing">false</data>
+        <data key="default_shipping">true</data>
+    </entity>
+    <entity name="US_Default_Shipping_Address_CA" type="address" extends="US_Address_CA">
+        <data key="default_billing">true</data>
+        <data key="default_shipping">false</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index 44ac0981d9577..e44f9c21c6e75 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -142,4 +142,16 @@
         <data key="website_id">0</data>
         <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
     </entity>
+    <entity name="Customer_With_Different_Default_Billing_Shipping_Addresses" type="customer">
+        <data key="group_id">1</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Default_Billing_Address_TX</requiredEntity>
+        <requiredEntity type="address">US_Default_Shipping_Address_CA</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
index 1cb96b37cc760..aa44593400a89 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
@@ -89,8 +89,8 @@
         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
         <!--  Step 4: Open Estimate Shipping and Tax section -->
         <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
-        <see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCustomerCountry" />
-        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country}}" stepKey="checkCustomerCountry" />
+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkCustomerRegion" />
         <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
         <assertEquals  message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
             <expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
index 190263efb2469..ac090fd4fe9c0 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxInformationInShoppingCartForCustomerVirtualQuoteTest.xml
@@ -61,8 +61,8 @@
         <actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingCartFromMinicart"/>
         <!--  Step 4: Open Estimate Shipping and Tax section -->
         <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
-        <see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country_id}}" stepKey="checkCustomerCountry" />
-        <see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_NY.country}}" stepKey="checkCustomerCountry" />
+        <seeOptionIsSelected selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_NY.state}}" stepKey="checkCustomerRegion" />
         <grabValueFrom  selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
         <assertEquals  message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
             <expectedResult type="string">{{US_Address_NY.postcode}}</expectedResult>

From 49667ee7ee1a1e66cabc7ef7018156310099d3ce Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 4 Jan 2019 13:37:51 +0200
Subject: [PATCH 477/932] ENGCOM-3782: Static test fix.

---
 lib/internal/Magento/Framework/Serialize/Serializer/Json.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index ddcbf86614583..7ce9756ff243d 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -16,7 +16,7 @@
 class Json implements SerializerInterface
 {
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      * @since 100.2.0
      */
     public function serialize($data)
@@ -29,7 +29,7 @@ public function serialize($data)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      * @since 100.2.0
      */
     public function unserialize($string)

From 14a56fd17625a901f0dd6828faff3e45d3c6abe2 Mon Sep 17 00:00:00 2001
From: Wilko Nienhaus <wilko.nienhaus@vaimo.com>
Date: Fri, 4 Jan 2019 13:55:58 +0100
Subject: [PATCH 478/932] Fix code style from earlier code

---
 app/code/Magento/WebapiAsync/Model/Config.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/WebapiAsync/Model/Config.php b/app/code/Magento/WebapiAsync/Model/Config.php
index e80ecbabdbd43..16c24643ba355 100644
--- a/app/code/Magento/WebapiAsync/Model/Config.php
+++ b/app/code/Magento/WebapiAsync/Model/Config.php
@@ -15,6 +15,9 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Webapi\Model\Config\Converter;
 
+/**
+ * Class for accessing to Webapi_Async configuration.
+ */
 class Config implements \Magento\AsynchronousOperations\Model\ConfigInterface
 {
     /**
@@ -55,7 +58,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getServices()
     {
@@ -73,7 +76,7 @@ public function getServices()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTopicName($routeUrl, $httpMethod)
     {
@@ -93,6 +96,10 @@ public function getTopicName($routeUrl, $httpMethod)
     }
 
     /**
+     * Generate topic data for all defined services
+     *
+     * Topic data is indexed by a lookup key that is derived from route data
+     *
      * @return array
      */
     private function generateTopicsDataFromWebapiConfig()

From dd1cdec75208b695bf50428d04c2c1183c632d6d Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Fri, 4 Jan 2019 14:11:38 +0100
Subject: [PATCH 479/932] Fix Swagger caching issue, caused that Async Swagger
 and Usual Swagger are using the same cache key

---
 .../Magento/Webapi/Model/ServiceMetadata.php  | 21 +++++++++++++++++--
 .../WebapiAsync/Plugin/ServiceMetadata.php    | 16 ++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Webapi/Model/ServiceMetadata.php b/app/code/Magento/Webapi/Model/ServiceMetadata.php
index b56aa84b94651..54b8557214c55 100644
--- a/app/code/Magento/Webapi/Model/ServiceMetadata.php
+++ b/app/code/Magento/Webapi/Model/ServiceMetadata.php
@@ -79,6 +79,11 @@ class ServiceMetadata
      */
     private $serializer;
 
+    /**
+     * @var string
+     */
+    private $routesConfigCacheId;
+
     /**
      * Initialize dependencies.
      *
@@ -100,6 +105,7 @@ public function __construct(
         $this->classReflector = $classReflector;
         $this->typeProcessor = $typeProcessor;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
+        $this->routesConfigCacheId = self::ROUTES_CONFIG_CACHE_ID;
     }
 
     /**
@@ -267,7 +273,7 @@ public function getRouteMetadata($serviceName)
     public function getRoutesConfig()
     {
         if (null === $this->routes) {
-            $routesConfig = $this->cache->load(self::ROUTES_CONFIG_CACHE_ID);
+            $routesConfig = $this->cache->load($this->routesConfigCacheId);
             $typesData = $this->cache->load(self::REFLECTED_TYPES_CACHE_ID);
             if ($routesConfig && is_string($routesConfig) && $typesData && is_string($typesData)) {
                 $this->routes = $this->serializer->unserialize($routesConfig);
@@ -276,7 +282,7 @@ public function getRoutesConfig()
                 $this->routes = $this->initRoutesMetadata();
                 $this->cache->save(
                     $this->serializer->serialize($this->routes),
-                    self::ROUTES_CONFIG_CACHE_ID
+                    $this->routesConfigCacheId
                 );
                 $this->cache->save(
                     $this->serializer->serialize($this->typeProcessor->getTypesData()),
@@ -287,6 +293,17 @@ public function getRoutesConfig()
         return $this->routes;
     }
 
+    /**
+     * Set Routes Config Cache ID
+     *
+     * @param string $routesConfigCacheId
+     */
+    public function setRoutesConfigCacheId($routesConfigCacheId){
+
+        $this->routesConfigCacheId = $routesConfigCacheId;
+
+    }
+
     /**
      * Collect the list of services with routes and request types for use in REST.
      *
diff --git a/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php b/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
index c4e5b572b80f9..fdd320e4a5764 100644
--- a/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
+++ b/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
@@ -15,6 +15,9 @@
 
 class ServiceMetadata
 {
+
+    const ASYNC_ROUTES_CONFIG_CACHE_ID = 'async-routes-services-config';
+
     /**
      * @var \Magento\Webapi\Model\Config
      */
@@ -272,4 +275,17 @@ private function getResponseDefinitionReplacement()
 
         return $this->responseDefinitionReplacement;
     }
+
+    /**
+     * Plugin to change config cache id for Asynchronous operations
+     *
+     * @return null
+     */
+    public function beforeGetRoutesConfig(\Magento\Webapi\Model\ServiceMetadata $subject)
+    {
+        if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)) {
+            $subject->setRoutesConfigCacheId(self::ASYNC_ROUTES_CONFIG_CACHE_ID);
+        }
+        return null;
+    }
 }

From b3a40584b3bf53a9d2dd06340f6b820563a4eba3 Mon Sep 17 00:00:00 2001
From: Patrick McLain <pat@pmclain.com>
Date: Fri, 4 Jan 2019 09:14:43 -0500
Subject: [PATCH 480/932] Change return type to float

---
 .../Product/Edit/Action/Attribute/Tab/Inventory.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
index 824d0ae37ea56..f73c3a11857dd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -104,17 +104,17 @@ public function getDefaultConfigValue($field)
     /**
      * Returns min_sale_qty configuration for the ALL Customer Group
      *
-     * @return int
+     * @return float
      */
     public function getDefaultMinSaleQty()
     {
         $default = $this->stockConfiguration->getDefaultConfigValue('min_sale_qty');
         if (!is_numeric($default)) {
             $default = $this->serializer->unserialize($default);
-            $default = isset($default[GroupInterface::CUST_GROUP_ALL]) ? $default[GroupInterface::CUST_GROUP_ALL] : 1;
+            $default = $default[GroupInterface::CUST_GROUP_ALL] ?? 1;
         }
 
-        return (int) $default;
+        return (float) $default;
     }
 
     /**

From e2b200fdbc4d5be3bc13540f6ca6d9045e5ce82d Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 4 Jan 2019 08:28:21 -0600
Subject: [PATCH 481/932] MC-6281: [Backend]: Create Controller to getToken
 from PayPal

- get payment method working with new controller
---
 .../Controller/Express/GetTokenData.php       | 189 ++++++++++++++++++
 .../Paypal/Model/ExpressConfigProvider.php    |   3 +-
 .../express-checkout-smart-buttons.js         |  21 +-
 3 files changed, 203 insertions(+), 10 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Controller/Express/GetTokenData.php

diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
new file mode 100644
index 0000000000000..23e550dad31ec
--- /dev/null
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Controller\Express;
+
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Webapi\Exception;
+use Magento\Paypal\Model\Express\Checkout;
+use Magento\Framework\App\ObjectManager;
+
+class GetTokenData extends GetToken
+{
+    /**
+     * @var \Psr\Log\LoggerInterface
+     */
+    private $logger;
+    private $quoteRepository;
+    private $customerRepository;
+    private $quoteIdMaskFactory;
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Sales\Model\OrderFactory $orderFactory
+     * @param \Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory
+     * @param \Magento\Framework\Session\Generic $paypalSession
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
+     * @param \Magento\Customer\Model\Url $customerUrl
+     * @param \Psr\Log\LoggerInterface|null $logger
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Sales\Model\OrderFactory $orderFactory,
+        \Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory,
+        \Magento\Framework\Session\Generic $paypalSession,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
+        \Magento\Customer\Model\Url $customerUrl,
+        \Psr\Log\LoggerInterface $logger = null,
+        \Magento\Quote\Api\CartRepositoryInterface $quoteRepository = null,
+        \Magento\Customer\Model\ResourceModel\CustomerRepository $customerRepository = null,
+        \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory = null
+    ) {
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
+        $this->quoteRepository = $quoteRepository ?: ObjectManager::getInstance()->get(\Magento\Quote\Api\CartRepositoryInterface::class);
+        $this->customerRepository = $customerRepository ?: ObjectManager::getInstance()->get(\Magento\Customer\Model\ResourceModel\CustomerRepository::class);
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory ?: ObjectManager::getInstance()->get(\Magento\Quote\Model\QuoteIdMaskFactory::class);
+        parent::__construct(
+            $context,
+            $customerSession,
+            $checkoutSession,
+            $orderFactory,
+            $checkoutFactory,
+            $paypalSession,
+            $urlHelper,
+            $customerUrl
+        );
+    }
+    /**
+     * @return \Magento\Framework\App\ResponseInterface|ResultInterface
+     */
+    public function execute()
+    {
+        $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        try {
+            $token = $this->getToken();
+            if ($token === null) {
+                $token = false;
+            }
+            $this->_initToken($token);
+            $controllerResult->setData(['token' => $token]);
+        } catch (LocalizedException $exception) {
+            $this->logger->critical($exception);
+            $controllerResult->setData([
+                'message' => [
+                    'text' => $exception->getMessage(),
+                    'type' => 'error'
+                ]
+            ]);
+        } catch (\Exception $exception) {
+            $this->messageManager->addExceptionMessage(
+                $exception,
+                __('We can\'t start Express Checkout.')
+            );
+            return $this->getErrorResponse($controllerResult);
+        }
+        return $controllerResult;
+    }
+    /**
+     * @return string|null
+     * @throws LocalizedException
+     */
+//    protected function getToken()
+//    {
+//        $quoteId = $this->getRequest()->getParam('quote_id');
+//        $customerId = $this->getRequest()->getParam('customer_id');
+//        $hasButton = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_BUTTON) == 1;
+//
+//        if(!$customerId) {
+//            $quoteIdMask = $this->quoteIdMaskFactory->create()->load($quoteId, 'masked_id');
+//            $quoteId = $quoteIdMask->getQuoteId();
+//        }
+//        $quote = $this->quoteRepository->get((int)$quoteId);
+//        $this->initCheckout($quote);
+//
+//        if ($quote->getIsMultiShipping()) {
+//            $quote->setIsMultiShipping(false);
+//            $quote->removeAllAddresses();
+//        }
+//
+//        if ($customerId) {
+//            $customerData = $this->customerRepository->getById((int)$customerId);
+//
+//            $this->_checkout->setCustomerWithAddressChange(
+//                $customerData,
+//                $quote->getBillingAddress(),
+//                $quote->getShippingAddress()
+//            );
+//
+//            // billing agreement
+//            $isBaRequested = (bool)$this->getRequest()
+//                ->getParam(Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT);
+//            $this->_checkout->setIsBillingAgreementRequested($isBaRequested);
+//        }
+//
+//        // Bill Me Later
+//        $this->_checkout->setIsBml((bool)$this->getRequest()->getParam('bml'));
+//
+//        // giropay
+//        $this->_checkout->prepareGiropayUrls(
+//            $this->_url->getUrl('checkout/onepage/success'),
+//            $this->_url->getUrl('paypal/express/cancel'),
+//            $this->_url->getUrl('checkout/onepage/success')
+//        );
+//        return $this->_checkout->start(
+//            $this->_url->getUrl('*/*/return'),
+//            $this->_url->getUrl('*/*/cancel'),
+//            $hasButton
+//        );
+//    }
+    /**
+     * Instantiate quote and checkout
+     *
+     * @param $quote
+     * @throws LocalizedException
+     */
+//    private function initCheckout($quote)
+//    {
+//        if (!$quote->hasItems() || $quote->getHasError()) {
+//            $this->getResponse()->setStatusHeader(403, '1.1', 'Forbidden');
+//            throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t initialize Express Checkout.'));
+//        }
+//        if (!(float)$quote->getGrandTotal()) {
+//            throw new \Magento\Framework\Exception\LocalizedException(
+//                __(
+//                    'PayPal can\'t process orders with a zero balance due. '
+//                    . 'To finish your purchase, please go through the standard checkout process.'
+//                )
+//            );
+//        }
+//        if (!isset($this->_checkoutTypes[$this->_checkoutType])) {
+//            $parameters = [
+//                'params' => [
+//                    'quote' => $quote,
+//                    'config' => $this->_config,
+//                ],
+//            ];
+//            $this->_checkoutTypes[$this->_checkoutType] = $this->_checkoutFactory
+//                ->create($this->_checkoutType, $parameters);
+//        }
+//        $this->_checkout = $this->_checkoutTypes[$this->_checkoutType];
+//    }
+    /**
+     * @param ResultInterface $controllerResult
+     * @return ResultInterface
+     */
+    private function getErrorResponse(ResultInterface $controllerResult)
+    {
+        $controllerResult->setHttpResponseCode(Exception::HTTP_BAD_REQUEST);
+        $controllerResult->setData(['message' => __('Sorry, but something went wrong')]);
+        return $controllerResult;
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index eb98df07b05f2..7d4d2e0b26c45 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -132,7 +132,8 @@ public function getConfig()
                     ],
                     'allowedFunding' => [],
                     'disallowedFunding' => $this->getDisallowedFunding(),
-                    'styles' => $this->getButtonStyles()
+                    'styles' => $this->getButtonStyles(),
+                    'startUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData')
                 ],
             ];
         }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 41086318c3108..a4506cc19c36b 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -41,15 +41,18 @@ define([
 
             // Set up a payment
             payment: function (data, actions) {
-                return new paypal.Promise(function (resolve, reject) {
-                    var customConfig = {
-                        'quote_id': clientConfig.quoteId,
-                        'customer_id': clientConfig.customerId,
-                        'button': clientConfig.button
-                    };
-                    $.post(clientConfig.startUrl, customConfig, function (data) {
-                        resolve(data.token);
-                    });
+                var params = {
+                    quote_id: clientConfig.quoteId,
+                    customer_id: clientConfig.customerId || "",
+                    button: clientConfig.button,
+                    form_key: clientConfig.formKey
+                }
+                return paypal.request.post(clientConfig.startUrl, params)
+                    .then(function (res) {
+                        //add logic to process negative cases
+                        // 3. Return res.id from the response
+                        return res.token;
+
                 });
             },
             // Execute the payment

From 9199a02d8e50bcf2dac4c1d78d0532fbfc79106f Mon Sep 17 00:00:00 2001
From: Oksana_Kremen <Oksana_Kremen@epam.com>
Date: Thu, 13 Dec 2018 13:22:03 +0200
Subject: [PATCH 482/932] MAGETWO-96342: MySQL connection issue

- Added handling MySQL server connection close error on Message Procssing level retry to process transaction
---
 .../MessageQueue/MessageProcessor.php         | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php b/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
index d71a527c9cbb1..ad0201cf56e77 100644
--- a/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageProcessor.php
@@ -12,6 +12,11 @@
  */
 class MessageProcessor implements MessageProcessorInterface
 {
+    /**
+     * Maximum number of transaction retries
+     */
+    const MAX_TRANSACTION_RETRIES = 10;
+
     /**
      * @var \Magento\Framework\MessageQueue\MessageStatusProcessor
      */
@@ -22,6 +27,11 @@ class MessageProcessor implements MessageProcessorInterface
      */
     private $resource;
 
+    /**
+     * @var int
+     */
+    private $retryCount = 0;
+
     /**
      * @param MessageStatusProcessor $messageStatusProcessor
      * @param ResourceConnection $resource
@@ -53,8 +63,19 @@ public function process(
         } catch (ConnectionLostException $e) {
             $this->resource->getConnection()->rollBack();
         } catch (\Exception $e) {
+            $retry = false;
             $this->resource->getConnection()->rollBack();
-            $this->messageStatusProcessor->rejectMessages($queue, $messages);
+            if (strpos($e->getMessage(), 'Error while sending QUERY packet') !== false
+                && $this->retryCount < self::MAX_TRANSACTION_RETRIES
+            ) {
+                $retry = true;
+                $this->retryCount++;
+                $this->resource->closeConnection();
+                $this->process($queue, $configuration, $messages, $messagesToAcknowledge, $mergedMessages);
+            }
+            if (!$retry) {
+                $this->messageStatusProcessor->rejectMessages($queue, $messages);
+            }
         }
     }
 

From 37bda719e55f7921943409c36b2ebe2e07956e62 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Fri, 4 Jan 2019 10:54:30 -0600
Subject: [PATCH 483/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 .../Magento/Customer/Block/Address/Book.php   | 28 ++++++---
 .../Magento/Customer/Block/Address/Grid.php   | 63 +++++++++----------
 .../Customer/Block/Address/GridTest.php       | 39 +-----------
 3 files changed, 48 insertions(+), 82 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index b157dbb8e5e4a..d392b9bbd81b7 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -93,7 +93,8 @@ protected function _prepareLayout()
      * Generate and return "New Address" URL
      *
      * @return string
-     * @deprecated not used in this block (new block for additional addresses: \Magento\Customer\Block\Address\Grid
+     * @deprecated not used in this block
+     * @see \Magento\Customer\Block\Address\Grid::getAddAddressUrl
      */
     public function getAddAddressUrl()
     {
@@ -117,7 +118,8 @@ public function getBackUrl()
      * Generate and return "Delete" URL
      *
      * @return string
-     * @deprecated not used in this block (new block for additional addresses: \Magento\Customer\Block\Address\Grid
+     * @deprecated not used in this block
+     * @see \Magento\Customer\Block\Address\Grid::getDeleteUrl
      */
     public function getDeleteUrl()
     {
@@ -131,7 +133,8 @@ public function getDeleteUrl()
      *
      * @param int $addressId
      * @return string
-     * @deprecated not used in this block (new block for additional addresses: \Magento\Customer\Block\Address\Grid
+     * @deprecated not used in this block
+     * @see \Magento\Customer\Block\Address\Grid::getAddressEditUrl
      */
     public function getAddressEditUrl($addressId)
     {
@@ -156,11 +159,16 @@ public function hasPrimaryAddress()
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @deprecated not used in this block (new block for additional addresses: \Magento\Customer\Block\Address\Grid
+     * @deprecated not used in this block
+     * @see \Magento\Customer\Block\Address\Grid::getAdditionalAddresses
      */
     public function getAdditionalAddresses()
     {
-        return $this->addressesGrid->getAdditionalAddresses();
+        try {
+            $addresses = $this->addressesGrid->getAdditionalAddresses();
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        }
+        return empty($addresses) ? false : $addresses;
     }
 
     /**
@@ -182,14 +190,16 @@ public function getAddressHtml(\Magento\Customer\Api\Data\AddressInterface $addr
     /**
      * Get current customer
      *
-     * Check if customer is stored in current object and return it
-     * or get customer by current customer ID through repository
-     *
      * @return \Magento\Customer\Api\Data\CustomerInterface|null
      */
     public function getCustomer()
     {
-        return $this->addressesGrid->getCustomer();
+        $customer = null;
+        try {
+            $customer = $this->currentCustomer->getCustomer();
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        }
+        return $customer;
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index c944bfb6550aa..3eaed8886010c 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -58,14 +59,13 @@ public function __construct(
     /**
      * Prepare the Address Book section layout
      *
-     * @return $this
+     * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function _prepareLayout()
+    protected function _prepareLayout(): void
     {
         parent::_prepareLayout();
         $this->preparePager();
-        return $this;
     }
 
     /**
@@ -73,7 +73,7 @@ protected function _prepareLayout()
      *
      * @return string
      */
-    public function getAddAddressUrl()
+    public function getAddAddressUrl(): string
     {
         return $this->getUrl('customer/address/new', ['_secure' => true]);
     }
@@ -83,7 +83,7 @@ public function getAddAddressUrl()
      *
      * @return string
      */
-    public function getDeleteUrl()
+    public function getDeleteUrl(): string
     {
         return $this->getUrl('customer/address/delete');
     }
@@ -96,7 +96,7 @@ public function getDeleteUrl()
      * @param int $addressId
      * @return string
      */
-    public function getAddressEditUrl($addressId)
+    public function getAddressEditUrl($addressId): string
     {
         return $this->getUrl('customer/address/edit', ['_secure' => true, 'id' => $addressId]);
     }
@@ -106,42 +106,35 @@ public function getAddressEditUrl($addressId)
      *
      * Will return array of address interfaces if customer have additional addresses and false in other case.
      *
-     * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
+     * @return \Magento\Customer\Api\Data\AddressInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws NoSuchEntityException
      */
-    public function getAdditionalAddresses()
+    public function getAdditionalAddresses(): array
     {
-        try {
-            $addresses = $this->getAddressCollection();
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-            return false;
-        }
+        $additional = [];
+        $addresses = $this->getAddressCollection();
         $primaryAddressIds = [$this->getDefaultBilling(), $this->getDefaultShipping()];
         foreach ($addresses as $address) {
-            if (!in_array($address->getId(), $primaryAddressIds)) {
+            if (!in_array((int)$address->getId(), $primaryAddressIds, true)) {
                 $additional[] = $address->getDataModel();
             }
         }
-        return empty($additional) ? false : $additional;
+        return $additional;
     }
 
     /**
      * Get current customer
      *
-     * Check if customer is stored in current object and return it
-     * or get customer by current customer ID through repository
+     * Return stored customer or get it from session
      *
-     * @return \Magento\Customer\Api\Data\CustomerInterface|null
+     * @return \Magento\Customer\Api\Data\CustomerInterface
      */
-    public function getCustomer()
+    public function getCustomer(): \Magento\Customer\Api\Data\CustomerInterface
     {
         $customer = $this->getData('customer');
         if ($customer === null) {
-            try {
-                $customer = $this->currentCustomer->getCustomer();
-            } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-                return null;
-            }
+            $customer = $this->currentCustomer->getCustomer();
             $this->setData('customer', $customer);
         }
         return $customer;
@@ -153,7 +146,7 @@ public function getCustomer()
      * @param string|array $street
      * @return string
      */
-    public function getStreetAddress($street)
+    public function getStreetAddress($street): string
     {
         if (is_array($street)) {
             $street = implode(', ', $street);
@@ -169,7 +162,7 @@ public function getStreetAddress($street)
      * @param string $countryCode
      * @return string
      */
-    public function getCountryByCode($countryCode)
+    public function getCountryByCode($countryCode): string
     {
         /** @var \Magento\Directory\Model\Country $country */
         $country = $this->countryFactory->create();
@@ -181,14 +174,14 @@ public function getCountryByCode($countryCode)
      * Get default billing address
      * Return address string if address found and null of not
      *
-     * @return string
+     * @return int
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function getDefaultBilling()
+    private function getDefaultBilling(): int
     {
         $customer = $this->getCustomer();
 
-        return $customer->getDefaultBilling();
+        return (int)$customer->getDefaultBilling();
     }
 
 
@@ -196,23 +189,23 @@ private function getDefaultBilling()
      * Get default shipping address
      * Return address string if address found and null of not
      *
-     * @return string
+     * @return int
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function getDefaultShipping()
+    private function getDefaultShipping(): int
     {
         $customer = $this->getCustomer();
 
-        return $customer->getDefaultShipping();
+        return (int)$customer->getDefaultShipping();
     }
 
     /**
      * Get pager layout
      *
-     * @return void
+     * @return f
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function preparePager()
+    private function preparePager(): void
     {
         $addressCollection = $this->getAddressCollection();
         if (null !== $addressCollection) {
@@ -232,7 +225,7 @@ private function preparePager()
      * @return \Magento\Customer\Model\ResourceModel\Address\Collection
      * @throws NoSuchEntityException
      */
-    private function getAddressCollection()
+    private function getAddressCollection(): \Magento\Customer\Model\ResourceModel\Address\Collection
     {
         if (null === $this->addressCollection && $this->getCustomer()) {
             /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php
index ccf6f3b3a4bf7..ac11c6c08bd62 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/GridTest.php
@@ -94,7 +94,7 @@ public function testGetAdditionalAddressesNegative($customerId, $expected)
 
     public function getAdditionalAddressesDataProvider()
     {
-        return ['5' => [5, false]];
+        return ['5' => [5, []]];
     }
 
     /**
@@ -123,43 +123,6 @@ public function testGetCustomer()
         $this->assertEquals($customer, $object);
     }
 
-    /**
-     * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-     * @dataProvider getDefaultBillingDataProvider
-     * @magentoAppIsolation enabled
-     */
-    public function testGetDefaultBilling($customerId, $expected)
-    {
-        $gridBlock = $this->createBlockForCustomer($customerId);
-        $this->assertEquals($expected, $gridBlock->getDefaultBilling());
-    }
-
-    public function getDefaultBillingDataProvider()
-    {
-        return ['1' => [1, 1], '5' => [5, null]];
-    }
-
-    /**
-     * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
-     * @dataProvider getDefaultShippingDataProvider
-     * @magentoAppIsolation enabled
-     */
-    public function testGetDefaultShipping($customerId, $expected)
-    {
-        $gridBlock = $this->createBlockForCustomer($customerId);
-        $this->currentCustomer->setCustomerId($customerId);
-        $this->assertEquals($expected, $gridBlock->getDefaultShipping());
-    }
-
-    public function getDefaultShippingDataProvider()
-    {
-        return ['1' => [1, 1], '5' => [5, null]];
-    }
-
     /**
      * Create address book block for customer
      *

From 5acaa05a5a51f1d8aac8886474f1ea3a61f6fc74 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Fri, 4 Jan 2019 22:36:17 +0530
Subject: [PATCH 484/932] Updated module.xml

---
 app/code/Magento/Backend/etc/module.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Backend/etc/module.xml b/app/code/Magento/Backend/etc/module.xml
index 3a5cd8226753d..03976396f6fd5 100644
--- a/app/code/Magento/Backend/etc/module.xml
+++ b/app/code/Magento/Backend/etc/module.xml
@@ -9,6 +9,7 @@
     <module name="Magento_Backend">
         <sequence>
             <module name="Magento_Directory"/>
+            <module name="Magento_Theme"/>
         </sequence>
     </module>
 </config>

From 7f61b321ae06e7b816cd9f7a09080276abd252d7 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Fri, 4 Jan 2019 11:06:45 -0600
Subject: [PATCH 485/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 app/code/Magento/Customer/Block/Address/Grid.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index 3eaed8886010c..4a6d92196facf 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -227,14 +227,15 @@ private function preparePager(): void
      */
     private function getAddressCollection(): \Magento\Customer\Model\ResourceModel\Address\Collection
     {
-        if (null === $this->addressCollection && $this->getCustomer()) {
+        if (null === $this->addressCollection) {
+            if (null === $this->getCustomer()) {
+                throw new NoSuchEntityException(__('Customer not logged in'));
+            }
             /** @var \Magento\Customer\Model\ResourceModel\Address\Collection $collection */
             $collection = $this->addressCollectionFactory->create();
             $collection->setOrder('entity_id', 'desc')
                 ->setCustomerFilter([$this->getCustomer()->getId()]);
             $this->addressCollection = $collection;
-        } elseif (null === $this->getCustomer()) {
-            throw new NoSuchEntityException(__('Customer not logged in'));
         }
         return $this->addressCollection;
     }

From de744eda3e35d324364f68519fd7c695d226b468 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Fri, 4 Jan 2019 22:37:16 +0530
Subject: [PATCH 486/932] Updated design_config_listing.xml

---
 .../view/adminhtml/ui_component/design_config_listing.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml
index 93309c9a22ef2..b0abec3aa9bec 100644
--- a/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml
+++ b/app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml
@@ -6,6 +6,7 @@
  */
 -->
 <listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top" />
     <columns name="design_config_columns">
         <column name="theme_theme_id" component="Magento_Ui/js/grid/columns/select" sortOrder="40">
             <settings>

From 3be047a2d463f56bd200baf11ccce5e5a0d1942c Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Fri, 4 Jan 2019 22:55:35 +0530
Subject: [PATCH 487/932] function name changed

---
 app/code/Magento/Config/Block/System/Config/Form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 374e7b94cd93b..e7e46919f86f6 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -369,7 +369,7 @@ protected function _initElement(
 
         $sharedClass = $this->_getSharedCssClass($field);
         $requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
-        $isReadOnly = $this->getReadOnly($field, $path);
+        $isReadOnly = $this->isReadOnly($field, $path);
 
         $formField = $fieldset->addField(
             $elementId,
@@ -806,7 +806,7 @@ private function getAppConfig()
      * @param string $path
      * @return boolean
      */
-    private function getReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
+    private function isReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
     {
         $isReadOnly = $this->settingChecker->isReadOnly(
             $path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT

From 912e569b018706af62e57a06f8f3a9ae791788e3 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Fri, 4 Jan 2019 09:57:47 -0600
Subject: [PATCH 488/932] MC-10850: Remove PayPal credit config setting

---
 .../Magento/Paypal/Model/Express/Checkout.php |  8 ++
 .../ExpressButtons/DisableFundingOptions.php  | 15 +++-
 .../Patch/Data/UpdatePaypalCreditOption.php   | 90 +++++++++++++++++++
 .../etc/adminhtml/system/express_checkout.xml | 15 +++-
 .../template/payment/paypal-express-bml.html  | 52 -----------
 .../paypal-express-abstract.test.js           |  2 +-
 6 files changed, 125 insertions(+), 57 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
 delete mode 100644 app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html

diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 856e01f7353f2..88e5ccc40f24b 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -49,6 +49,14 @@ class Checkout
      */
     const PAYMENT_INFO_BUTTON = 'button';
 
+    /**
+     * When multiple funding sources are available to the buyer, PayPal automatically determines which additional
+     * buttons are appropriate to display. It is available opt of displaying specific funding sources
+     */
+    const PAYPAL_FUNDING_CREDIT = 'CREDIT';
+    const PAYPAL_FUNDING_CARD = 'CARD';
+    const PAYPAL_FUNDING_ELV = 'ELV';
+
     /**
      * @var \Magento\Quote\Model\Quote
      */
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php
index 0914f9afb7151..0ec3813162742 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php
@@ -15,9 +15,18 @@ class DisableFundingOptions
     public function toOptionArray(): array
     {
         return [
-            ['value' => 'paypal.FUNDING.CREDIT', 'label' => 'PayPal Credit'],
-            ['value' => 'paypal.FUNDING.CARD', 'label' => 'PayPal Guest Checkout Credit Card Icons'],
-            ['value' => 'paypal.FUNDING.ELV', 'label' => 'Elektronisches Lastschriftverfahren - German ELV']
+            [
+                'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CREDIT,
+                'label' => 'PayPal Credit'
+            ],
+            [
+                'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CARD,
+                'label' => 'PayPal Guest Checkout Credit Card Icons'
+            ],
+            [
+                'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_ELV,
+                'label' => 'Elektronisches Lastschriftverfahren - German ELV'
+            ]
         ];
     }
 }
diff --git a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
new file mode 100644
index 0000000000000..977623c4d9b38
--- /dev/null
+++ b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+
+/**
+ * Class AddPaypalOrderStates
+ * @package Magento\Paypal\Setup\Patch
+ */
+class UpdatePaypalCreditOption implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * PrepareInitialConfig constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        $this->moduleDataSetup->getConnection()->startSetup();
+        $connection = $this->moduleDataSetup->getConnection();
+        $select = $connection->select()->from(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            ['scope', 'scope_id', 'value']
+        )->where(
+            'path = ?',
+            'payment/paypal_express_bml/active'
+        );
+        foreach ($connection->fetchAll($select) as $pair) {
+            if (!$pair['value']) {
+                $this->moduleDataSetup->getConnection()->insert(
+                    $this->moduleDataSetup->getTable('core_config_data'),
+                    [
+                        'scope' => $pair['scope'],
+                        'scope_id' => $pair['scope_id'],
+                        'path' => 'payment/paypal_express/disable_funding_options',
+                        'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CREDIT
+                    ]
+                );
+
+            }
+        }
+        $this->moduleDataSetup->getConnection()->endSetup();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.3.1';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 87cd9008de2b2..8b2cc88dbd523 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -158,7 +158,20 @@
                 </depends>
                 <validate>required-entry</validate>
             </field>
-            <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
+            <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="0" showInWebsite="0">
+                <label>Enable PayPal Credit</label>
+                <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
+                        You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
+                        <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
+                </comment>
+                <config_path>payment/paypal_express_bml/active</config_path>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\BmlApi</frontend_model>
+                <requires>
+                    <field id="enable_express_checkout"/>
+                </requires>
+            </field>
+            <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="0" showInWebsite="0" showInStore="0">
                 <label>Sort Order PayPal Credit</label>
                 <config_path>payment/paypal_express_bml/sort_order</config_path>
                 <frontend_class>validate-number</frontend_class>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
deleted file mode 100644
index 0f042824fe898..0000000000000
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
-    <div class="payment-method-title field choice">
-        <input type="radio"
-               name="payment[method]"
-               class="radio"
-               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
-        <label data-bind="attr: {'for': getCode()}" class="label">
-            <!-- PayPal Logo -->
-            <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/ppc-acceptance-medium.png"
-                 data-bind="attr: {alt: $t('Acceptance Mark')}"
-                 class="payment-icon"/>
-            <!-- PayPal Logo -->
-            <span data-bind="text: getTitle()"></span>
-            <a href="https://www.securecheckout.billmelater.com/paycapture-content/fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html"
-               data-bind="click: showAcceptanceWindow"
-               class="action action-help">
-                <!-- ko i18n: 'See terms' --><!-- /ko -->
-            </a>
-        </label>
-    </div>
-    <div class="payment-method-content">
-        <!-- ko foreach: getRegion('messages') -->
-        <!-- ko template: getTemplate() --><!-- /ko -->
-        <!--/ko-->
-        <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
-            <div class="payment-method-note">
-                <!-- ko i18n: 'You will be redirected to the PayPal website when you place an order.' --><!-- /ko -->
-            </div>
-        </fieldset>
-        <div class="checkout-agreements-block">
-            <!-- ko foreach: $parent.getRegion('before-place-order') -->
-                <!-- ko template: getTemplate() --><!-- /ko -->
-            <!--/ko-->
-        </div>
-        <div class="actions-toolbar">
-            <div class="primary">
-                <button class="action primary checkout"
-                        type="submit"
-                        data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
-                        disabled>
-                    <span data-bind="i18n: 'Continue to PayPal'"></span>
-                </button>
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
index 9950c89ce3c9d..29a2e8db914a7 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/paypal-express-abstract.test.js
@@ -65,7 +65,7 @@ define([
                         name: 'test',
                         index: 'test',
                         item: {
-                            method: 'paypal_express_bml'
+                            method: 'payflow_express_bml'
                         }
                     });
 

From 9dd5671bfa900074a1c927de449c377aa4caf68b Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Fri, 4 Jan 2019 14:31:19 -0600
Subject: [PATCH 489/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 ...ustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml | 8 ++++++--
 .../Mftf/Section/StorefrontCustomerAddressesSection.xml   | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
index cc5e723c72ea0..8537e10ce5a03 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -79,8 +79,12 @@
 
         <!--Verify New addresses in Customer's Address Book-->
         <amOnPage url="{{StorefrontCustomerAddressesPage.url}}" stepKey="goToCustomerAddressBook"/>
-        <see userInput="{{UK_Not_Default_Address.street[0]}} {{UK_Not_Default_Address.city}}, {{UK_Not_Default_Address.postcode}}"
-             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddresses"/>
+        <see userInput="{{UK_Not_Default_Address.street[0]}}"
+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesStreet"/>
+        <see userInput="{{UK_Not_Default_Address.city}}"
+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesCity"/>
+        <see userInput="{{UK_Not_Default_Address.postcode}}"
+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesPostcode"/>
         <!--Order review page has address that was created during checkout-->
         <amOnPage url="{{StorefrontCustomerOrderViewPage.url({$grabOrderNumber})}}" stepKey="goToOrderReviewPage"/>
         <see userInput="{{UK_Not_Default_Address.street[0]}} {{UK_Not_Default_Address.city}}, {{UK_Not_Default_Address.postcode}}"
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
index 05bbc559defac..892c3d190f349 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerAddressesSection">
-        <element name="addressesList" type="text" selector=".block-addresses-list" />
-        <element name="deleteAdditionalAddress" type="button" selector="//ol[@class='items addresses']/li[@class='item'][{{var}}]//a[@class='action delete']" parameterized="true"/>
+        <element name="addressesList" type="text" selector=".additional-addresses" />
+        <element name="deleteAdditionalAddress" type="button" selector="//tbody//tr[{{var}}]//a[@class='action delete']" parameterized="true"/>
     </section>
 </sections>

From a8d8acec6c32d93c0ab498d5f95ed3f3c9139873 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Fri, 4 Jan 2019 15:04:58 -0600
Subject: [PATCH 490/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 app/code/Magento/Customer/Block/Address/Book.php          | 4 ++++
 app/code/Magento/Customer/Block/Address/Grid.php          | 8 +++++---
 .../Magento/Customer/Test/Unit/Block/Address/GridTest.php | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index d392b9bbd81b7..04669446ffee9 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -203,6 +203,8 @@ public function getCustomer()
     }
 
     /**
+     * Get customer's default billing address
+     *
      * @return int|null
      */
     public function getDefaultBilling()
@@ -232,6 +234,8 @@ public function getAddressById($addressId)
     }
 
     /**
+     * Get customer's default shipping address
+     *
      * @return int|null
      */
     public function getDefaultShipping()
diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index 4a6d92196facf..5a268114830bb 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -12,6 +12,8 @@
 
 /**
  * Customer address grid
+ *
+ * @api
  */
 class Grid extends \Magento\Framework\View\Element\Template
 {
@@ -169,9 +171,9 @@ public function getCountryByCode($countryCode): string
         return $country->loadByCode($countryCode)->getName();
     }
 
-
     /**
      * Get default billing address
+     *
      * Return address string if address found and null of not
      *
      * @return int
@@ -184,9 +186,9 @@ private function getDefaultBilling(): int
         return (int)$customer->getDefaultBilling();
     }
 
-
     /**
      * Get default shipping address
+     *
      * Return address string if address found and null of not
      *
      * @return int
@@ -202,7 +204,7 @@ private function getDefaultShipping(): int
     /**
      * Get pager layout
      *
-     * @return f
+     * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function preparePager(): void
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
index 0e5b43d38b009..65a72ae1adeba 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -9,6 +9,7 @@
 
 /**
  * Unit tests for \Magento\Customer\Block\Address\Grid class
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GridTest extends \PHPUnit\Framework\TestCase
 {

From 52ff75be4310f2d60cf86d0e6be3c7f4f44758e0 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 4 Jan 2019 15:39:06 -0600
Subject: [PATCH 491/932] MC-10822: Update GB country name in USPS API

---
 app/code/Magento/Usps/Model/Carrier.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 1e8faf3cc9614..afe34cac575ac 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -1246,7 +1246,7 @@ protected function _getCountryName($countryId)
             'FO' => 'Faroe Islands',
             'FR' => 'France',
             'GA' => 'Gabon',
-            'GB' => 'Great Britain and Northern Ireland',
+            'GB' => 'United Kingdom of Great Britain and Northern Ireland',
             'GD' => 'Grenada',
             'GE' => 'Georgia, Republic of',
             'GF' => 'French Guiana',
@@ -1364,7 +1364,7 @@ protected function _getCountryName($countryId)
             'ST' => 'Sao Tome and Principe',
             'SV' => 'El Salvador',
             'SY' => 'Syrian Arab Republic',
-            'SZ' => 'Swaziland',
+            'SZ' => 'Eswatini',
             'TC' => 'Turks and Caicos Islands',
             'TD' => 'Chad',
             'TG' => 'Togo',

From 8b0b760907a56f3875200083a8c1b3f2f71c4757 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Fri, 4 Jan 2019 15:58:03 -0600
Subject: [PATCH 492/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 app/code/Magento/Customer/Block/Address/Grid.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index 5a268114830bb..0b5062b25f54f 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -38,17 +38,17 @@ class Grid extends \Magento\Framework\View\Element\Template
     private $countryFactory;
 
     /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param AddressCollectionFactory $addressCollectionFactory
      * @param CountryFactory $countryFactory
-     * @param \Magento\Framework\View\Element\Template\Context $context
      * @param array $data
      */
     public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
         AddressCollectionFactory $addressCollectionFactory,
         CountryFactory $countryFactory,
-        \Magento\Framework\View\Element\Template\Context $context,
         array $data = []
     ) {
         $this->currentCustomer = $currentCustomer;

From 30b3280ff1d6aac7e3d7cbff94a3e2500698ab2e Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 4 Jan 2019 17:42:23 -0600
Subject: [PATCH 493/932] MAGETWO-95945: Add a code mess rule for improper
 session and cookies usages

---
 .../Rule/Design/CookieAndSessionMisuse.php                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
index f95eeeb5640e1..e6acef87d3638 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
@@ -78,8 +78,8 @@ private function isControllerPlugin(\ReflectionClass $class): bool
             if (preg_match('/^(after|around|before).+/i', $method->getName())) {
                 try {
                     $argument = $method->getParameters()[0]->getClass();
-                } catch (\ReflectionException $exception) {
-                    //Non-existing class (autogenerated perhaps)
+                } catch (\Throwable $exception) {
+                    //Non-existing class (autogenerated perhaps) or doesn't have an argument.
                     continue;
                 }
                 $isAction = $argument->isSubclassOf(\Magento\Framework\App\ActionInterface::class)
@@ -105,8 +105,8 @@ private function isBlockPlugin(\ReflectionClass $class): bool
             if (preg_match('/^(after|around|before).+/i', $method->getName())) {
                 try {
                     $argument = $method->getParameters()[0]->getClass();
-                } catch (\ReflectionException $exception) {
-                    //Non-existing class (autogenerated perhaps)
+                } catch (\Throwable $exception) {
+                    //Non-existing class (autogenerated perhaps) or doesn't have an argument.
                     continue;
                 }
                 $isBlock = $argument->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class)

From 3d038fe8441c51c029de35d8e037a41c6b1687aa Mon Sep 17 00:00:00 2001
From: Aditya Yadav <adityayadav@cedcoss.com>
Date: Sat, 5 Jan 2019 18:39:46 +0530
Subject: [PATCH 494/932] Fixed Error for Duplication of Variable Name

---
 .../Catalog/Test/Unit/Model/ProductTest.php    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index 9ec5369f8d7c0..f7c2c25d743c4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -200,7 +200,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     /**
      * @var ProductExtensionInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $extensionAttributes;
+    private $productExtAttributes;
 
     /**
      * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
@@ -372,13 +372,13 @@ protected function setUp()
         $this->mediaConfig = $this->createMock(\Magento\Catalog\Model\Product\Media\Config::class);
         $this->eavConfig = $this->createMock(\Magento\Eav\Model\Config::class);
 
-        $this->extensionAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
+        $this->productExtAttributes = $this->getMockBuilder(ProductExtensionInterface::class)
             ->setMethods(['getStockItem'])
             ->getMockForAbstractClass();
         $this->extensionAttributesFactory
             ->expects($this->any())
             ->method('create')
-            ->willReturn($this->extensionAttributes);
+            ->willReturn($this->productExtAttributes);
 
         $this->filterCustomAttribute = $this->createTestProxy(
             \Magento\Catalog\Model\FilterProductCustomAttribute::class
@@ -549,6 +549,7 @@ public function testSetCategoryCollection()
 
     public function testGetCategory()
     {
+        $this->model->setData('category_ids', [10]);
         $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
         $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
         $this->categoryRepository->expects($this->any())->method('get')->will($this->returnValue($this->category));
@@ -557,7 +558,8 @@ public function testGetCategory()
 
     public function testGetCategoryId()
     {
-        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
+        $this->model->setData('category_ids', [10]);
+        $this->category->expects($this->any())->method('getId')->will($this->returnValue(10));
 
         $this->registry->expects($this->at(0))->method('registry');
         $this->registry->expects($this->at(1))->method('registry')->will($this->returnValue($this->category));
@@ -565,6 +567,14 @@ public function testGetCategoryId()
         $this->assertEquals(10, $this->model->getCategoryId());
     }
 
+    public function testGetCategoryIdWhenProductNotInCurrentCategory()
+    {
+        $this->model->setData('category_ids', [12]);
+        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
+        $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
+        $this->assertFalse($this->model->getCategoryId());
+    }
+
     public function testGetIdBySku()
     {
         $this->resource->expects($this->once())->method('getIdBySku')->will($this->returnValue(5));

From 823111672f41a18c273783f1e18c484061e1bdb6 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Sun, 6 Jan 2019 09:31:03 -0600
Subject: [PATCH 495/932] magento-engcom/magento2ce#2447: Fixed code style
 issue

---
 .../Magento/Framework/Mail/Message.php        | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index bc7193f107bb5..71da6e673bf29 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -8,6 +8,9 @@
 use Zend\Mime\Mime;
 use Zend\Mime\Part;
 
+/**
+ * Class Message for email transportation
+ */
 class Message implements MailMessageInterface
 {
     /**
@@ -34,7 +37,7 @@ public function __construct($charset = 'utf-8')
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @deprecated
      * @see \Magento\Framework\Mail\Message::setBodyText
@@ -47,7 +50,7 @@ public function setMessageType($type)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @deprecated
      * @see \Magento\Framework\Mail\Message::setBodyText
@@ -63,7 +66,7 @@ public function setBody($body)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSubject($subject)
     {
@@ -72,7 +75,7 @@ public function setSubject($subject)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSubject()
     {
@@ -80,7 +83,7 @@ public function getSubject()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getBody()
     {
@@ -88,7 +91,7 @@ public function getBody()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @deprecated This function is missing the from name. The
      * setFromAddress() function sets both from address and from name.
@@ -101,7 +104,7 @@ public function setFrom($fromAddress)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFromAddress($fromAddress, $fromName = null)
     {
@@ -110,7 +113,7 @@ public function setFromAddress($fromAddress, $fromName = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addTo($toAddress)
     {
@@ -119,7 +122,7 @@ public function addTo($toAddress)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addCc($ccAddress)
     {
@@ -128,7 +131,7 @@ public function addCc($ccAddress)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addBcc($bccAddress)
     {
@@ -137,7 +140,7 @@ public function addBcc($bccAddress)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setReplyTo($replyToAddress)
     {
@@ -146,7 +149,7 @@ public function setReplyTo($replyToAddress)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRawMessage()
     {
@@ -170,7 +173,7 @@ private function createHtmlMimeFromString($htmlBody)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBodyHtml($html)
     {
@@ -179,7 +182,7 @@ public function setBodyHtml($html)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBodyText($text)
     {

From 53943f8db1b8a13817249335c52b8f8695d930a2 Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal.solanki@krishtechnolabs.com>
Date: Thu, 22 Nov 2018 17:58:34 +0530
Subject: [PATCH 496/932] Fix issue 19052- Position order showing before the
 text box

---
 .../backend/Magento_Catalog/web/css/source/_module.less   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
index 3355950254072..ffbbaeb084162 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
@@ -15,6 +15,14 @@
     }
 }
 
+.catalog-category-edit {
+    .admin__grid-control {
+        .admin__grid-control-value {
+            display: none;
+        }
+    }  
+}
+
 .product-composite-configure-inner {
     .admin__control-text {
         &.qty {

From 0edcd206c7ed18a3cae4332488d1cf52a877d181 Mon Sep 17 00:00:00 2001
From: NazarKlovanych <nazarn96@gmail.com>
Date: Mon, 5 Nov 2018 18:39:01 +0200
Subject: [PATCH 497/932] Fix issue - Image custom attribute type could not
 display on frontend.

---
 app/code/Magento/Eav/Model/Entity/Attribute.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index c605f3ce17e30..998a2d208c4e7 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -295,6 +295,12 @@ public function beforeSave()
             }
         }
 
+        if ($this->getFrontendInput() == 'media_image') {
+            if (!$this->getFrontendModel()) {
+                $this->setFrontendModel(\Magento\Catalog\Model\Product\Attribute\Frontend\Image::class);
+            }
+        }
+
         if ($this->getBackendType() == 'gallery') {
             if (!$this->getBackendModel()) {
                 $this->setBackendModel(\Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend::class);

From dad84f4f02283b6b43fccf4e56fd7f4faa5f0409 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Mon, 7 Jan 2019 14:09:35 +0100
Subject: [PATCH 498/932] Change implementation to use Plugins for Cache
 instances

---
 .../Magento/Webapi/Model/ServiceMetadata.php     | 10 ++--------
 .../WebapiAsync/Plugin/ServiceMetadata.php       | 16 ----------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Webapi/Model/ServiceMetadata.php b/app/code/Magento/Webapi/Model/ServiceMetadata.php
index 54b8557214c55..ccb1faae5a5e1 100644
--- a/app/code/Magento/Webapi/Model/ServiceMetadata.php
+++ b/app/code/Magento/Webapi/Model/ServiceMetadata.php
@@ -79,11 +79,6 @@ class ServiceMetadata
      */
     private $serializer;
 
-    /**
-     * @var string
-     */
-    private $routesConfigCacheId;
-
     /**
      * Initialize dependencies.
      *
@@ -105,7 +100,6 @@ public function __construct(
         $this->classReflector = $classReflector;
         $this->typeProcessor = $typeProcessor;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
-        $this->routesConfigCacheId = self::ROUTES_CONFIG_CACHE_ID;
     }
 
     /**
@@ -273,7 +267,7 @@ public function getRouteMetadata($serviceName)
     public function getRoutesConfig()
     {
         if (null === $this->routes) {
-            $routesConfig = $this->cache->load($this->routesConfigCacheId);
+            $routesConfig = $this->cache->load(self::ROUTES_CONFIG_CACHE_ID);
             $typesData = $this->cache->load(self::REFLECTED_TYPES_CACHE_ID);
             if ($routesConfig && is_string($routesConfig) && $typesData && is_string($typesData)) {
                 $this->routes = $this->serializer->unserialize($routesConfig);
@@ -282,7 +276,7 @@ public function getRoutesConfig()
                 $this->routes = $this->initRoutesMetadata();
                 $this->cache->save(
                     $this->serializer->serialize($this->routes),
-                    $this->routesConfigCacheId
+                    self::ROUTES_CONFIG_CACHE_ID
                 );
                 $this->cache->save(
                     $this->serializer->serialize($this->typeProcessor->getTypesData()),
diff --git a/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php b/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
index fdd320e4a5764..c4e5b572b80f9 100644
--- a/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
+++ b/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
@@ -15,9 +15,6 @@
 
 class ServiceMetadata
 {
-
-    const ASYNC_ROUTES_CONFIG_CACHE_ID = 'async-routes-services-config';
-
     /**
      * @var \Magento\Webapi\Model\Config
      */
@@ -275,17 +272,4 @@ private function getResponseDefinitionReplacement()
 
         return $this->responseDefinitionReplacement;
     }
-
-    /**
-     * Plugin to change config cache id for Asynchronous operations
-     *
-     * @return null
-     */
-    public function beforeGetRoutesConfig(\Magento\Webapi\Model\ServiceMetadata $subject)
-    {
-        if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)) {
-            $subject->setRoutesConfigCacheId(self::ASYNC_ROUTES_CONFIG_CACHE_ID);
-        }
-        return null;
-    }
 }

From 56f35807cb36ca741ed1057197052caf793535d3 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Mon, 7 Jan 2019 14:11:10 +0100
Subject: [PATCH 499/932] Add Plugin

---
 .../WebapiAsync/Plugin/Cache/Webapi.php       | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php

diff --git a/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php b/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php
new file mode 100644
index 0000000000000..3d6492a8be347
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Plugin\Cache;
+
+use Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor;
+use Magento\Framework\Webapi\Rest\Request;
+
+/**
+ * Class Webapi
+ */
+class Webapi
+{
+    /**
+     * Cache key for Async Routes
+     */
+    const ASYNC_ROUTES_CONFIG_CACHE_ID = 'async-routes-services-config';
+
+    /**
+     * @var AsynchronousSchemaRequestProcessor
+     */
+    private $asynchronousSchemaRequestProcessor;
+
+    /**
+     * @var \Magento\Framework\Webapi\Rest\Request
+     */
+    private $request;
+
+    /**
+     * ServiceMetadata constructor.
+     *
+     * @param Request $request
+     * @param AsynchronousSchemaRequestProcessor $asynchronousSchemaRequestProcessor
+     */
+    public function __construct(
+        \Magento\Framework\Webapi\Rest\Request $request,
+        AsynchronousSchemaRequestProcessor $asynchronousSchemaRequestProcessor
+    ) {
+        $this->request = $request;
+        $this->asynchronousSchemaRequestProcessor = $asynchronousSchemaRequestProcessor;
+    }
+
+    /**
+     * Change identifier in case if Async request before cache load
+     *
+     * @param \Magento\Webapi\Model\Cache\Type\Webapi $subject
+     * @param string $identifier
+     * @return null|string
+     */
+    public function beforeLoad(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $identifier)
+    {
+        if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)
+            && $identifier === \Magento\Webapi\Model\ServiceMetadata::ROUTES_CONFIG_CACHE_ID) {
+            return self::ASYNC_ROUTES_CONFIG_CACHE_ID;
+        }
+        return null;
+    }
+
+    /**
+     * Change identifier in case if Async request before cache save
+     *
+     * @param \Magento\Webapi\Model\Cache\Type\Webapi $subject
+     * @param $data
+     * @param string $identifier
+     * @param array $tags
+     * @param null $lifeTime
+     * @return array|null
+     */
+    public function beforeSave(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $data, $identifier, array $tags = [], $lifeTime = null)
+    {
+        if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)
+            && $identifier === \Magento\Webapi\Model\ServiceMetadata::ROUTES_CONFIG_CACHE_ID) {
+            return [$data, self::ASYNC_ROUTES_CONFIG_CACHE_ID, $tags, $lifeTime];
+        }
+        return null;
+    }
+
+    /**
+     * Change identifier in case if Async request before remove cache
+     *
+     * @param \Magento\Webapi\Model\Cache\Type\Webapi $subject
+     * @param string $identifier
+     * @return null|string
+     */
+    public function beforeRemove(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $identifier)
+    {
+        if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)
+            && $identifier === \Magento\Webapi\Model\ServiceMetadata::ROUTES_CONFIG_CACHE_ID) {
+            return self::ASYNC_ROUTES_CONFIG_CACHE_ID;
+        }
+        return null;
+    }
+}

From cbcc5e805acf1df26de81b4784138528484061a2 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Mon, 7 Jan 2019 14:12:19 +0100
Subject: [PATCH 500/932] Declate Plugin for WebApi cache and remove not used
 methods

---
 app/code/Magento/Webapi/Model/ServiceMetadata.php | 11 -----------
 app/code/Magento/WebapiAsync/etc/di.xml           |  3 +++
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Webapi/Model/ServiceMetadata.php b/app/code/Magento/Webapi/Model/ServiceMetadata.php
index ccb1faae5a5e1..b56aa84b94651 100644
--- a/app/code/Magento/Webapi/Model/ServiceMetadata.php
+++ b/app/code/Magento/Webapi/Model/ServiceMetadata.php
@@ -287,17 +287,6 @@ public function getRoutesConfig()
         return $this->routes;
     }
 
-    /**
-     * Set Routes Config Cache ID
-     *
-     * @param string $routesConfigCacheId
-     */
-    public function setRoutesConfigCacheId($routesConfigCacheId){
-
-        $this->routesConfigCacheId = $routesConfigCacheId;
-
-    }
-
     /**
      * Collect the list of services with routes and request types for use in REST.
      *
diff --git a/app/code/Magento/WebapiAsync/etc/di.xml b/app/code/Magento/WebapiAsync/etc/di.xml
index 83f1d6a78f227..7411ec0561d24 100755
--- a/app/code/Magento/WebapiAsync/etc/di.xml
+++ b/app/code/Magento/WebapiAsync/etc/di.xml
@@ -10,6 +10,9 @@
     <type name="Magento\Webapi\Model\ServiceMetadata">
         <plugin name="webapiServiceMetadataAsync" type="Magento\WebapiAsync\Plugin\ServiceMetadata" />
     </type>
+    <type name="Magento\Webapi\Model\Cache\Type\Webapi">
+        <plugin name="webapiCacheAsync" type="Magento\WebapiAsync\Plugin\Cache\Webapi" />
+    </type>
     <virtualType name="Magento\WebapiAsync\Model\VirtualType\Rest\Config" type="Magento\Webapi\Model\Rest\Config">
         <arguments>
             <argument name="config" xsi:type="object">Magento\WebapiAsync\Model\BulkServiceConfig</argument>

From f79968ebbf92021b5543ab861c5ee724ce47f400 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 7 Jan 2019 15:17:02 +0000
Subject: [PATCH 501/932] MAGETWO-97467: Mainline test failure
 Magento\Ups\Model\CarrierTest

---
 .../integration/testsuite/Magento/Ups/Model/CarrierTest.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
index aa301e8d3e423..fe4067cdc49f5 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
@@ -69,6 +69,7 @@ public function testGetShipConfirmUrlLive()
      */
     public function testCollectFreeRates()
     {
+        $this->markTestSkipped('Test is blocked by MAGETWO-97467.');
         $rateRequest = Bootstrap::getObjectManager()->get(RateRequestFactory::class)->create();
         $rateRequest->setDestCountryId('US');
         $rateRequest->setDestRegionId('CA');

From 5c8e69c48b04c3fffd45baee6479fb4d4a3b3945 Mon Sep 17 00:00:00 2001
From: John S <john00ivy@gmail.com>
Date: Mon, 7 Jan 2019 10:00:02 -0600
Subject: [PATCH 502/932] MQE-1393 - Adding new Action Group so we can edit it
 in B2B

- Adding a new selector for the Customer page.
- Replacing inline selectors with Section references.
---
 .../ActionGroup/AdminUpdateCustomerGroupActionGroup.xml  | 9 ++++-----
 .../Section/AdminCustomerAccountInformationSection.xml   | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
index 50ea92ab91ff7..b1b82fb9fb74c 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminUpdateCustomerGroupActionGroup.xml
@@ -15,7 +15,6 @@
         </arguments>
 
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomerPage01"/>
-        <waitForPageLoad stepKey="waitForPageLoad01"/>
 
         <!-- Start of Action Group: searchAdminDataGridByKeyword -->
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters0"/>
@@ -27,13 +26,13 @@
         <click selector="{{AdminGridRow.editByValue(emailAddress)}}" stepKey="clickOnCustomer01"/>
         <waitForPageLoad stepKey="waitForPageLoad03"/>
 
-        <conditionalClick selector="#tab_customer" dependentSelector="#tab_customer" visible="true" stepKey="clickOnAccountInformation01"/>
+        <conditionalClick selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" dependentSelector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" visible="true" stepKey="clickOnAccountInformation01"/>
         <waitForPageLoad stepKey="waitForPageLoad04"/>
 
-        <click selector=".admin__control-select[name='customer[group_id]']" stepKey="clickOnCustomerGroup01"/>
-        <selectOption selector=".admin__control-select[name='customer[group_id]']" userInput="{{customerGroup}}" stepKey="selectCustomerGroup01"/>
+        <click selector="{{AdminCustomerAccountInformationSection.group}}" stepKey="clickOnCustomerGroup01"/>
+        <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="{{customerGroup}}" stepKey="selectCustomerGroup01"/>
 
-        <click selector="#save" stepKey="clickOnSave01"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickOnSave01"/>
         <waitForPageLoad stepKey="waitForPageLoad05"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
index d5a410164a6f1..6a3687bb77c8f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerAccountInformationSection">
+        <element name="accountInformationTab" type="button" selector="#tab_customer"/>
         <element name="statusInactive" type="button" selector=".admin__actions-switch-label"/>
         <element name="accountInformationTitle" type="text" selector=".admin__page-nav-title"/>
         <element name="accountInformationButton" type="text" selector="//a/span[text()='Account Information']"/>

From c423d9557b997a50989a27282ec1763afc8648d0 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Mon, 7 Jan 2019 12:10:57 -0600
Subject: [PATCH 503/932] MC-4394: Convert CreateVirtualProductEntityTest to
 MFTF

---
 .../ActionGroup/AdminProductActionGroup.xml   |   3 -
 .../ActionGroup/CustomOptionsActionGroup.xml  |   8 -
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  68 ++++++++
 .../Catalog/Test/Mftf/Data/TierPriceData.xml  |  22 ++-
 .../Mftf/Data/VirtualProductOptionData.xml    |  60 +++++++
 .../AdminCategoryProductsGridSection.xml      |   4 +
 .../AdminProductCategoryCreationSection.xml   |   4 +-
 ...AdminProductCustomizableOptionsSection.xml |  24 +--
 ...minProductFormAdvancedInventorySection.xml |   4 +-
 .../Mftf/Section/AdminProductFormSection.xml  |  32 ++--
 .../Section/AdminProductGridFilterSection.xml |   3 +-
 .../StorefrontProductInfoMainSection.xml      |  15 +-
 ...alProductFillingRequiredFieldsOnlyTest.xml |  51 ++++++
 ...tualProductOutOfStockWithTierPriceTest.xml |  95 +++++++++++
 ...CustomOptionsSuiteAndImportOptionsTest.xml | 156 ++++++++++++++++++
 ...roductWithTierPriceForGeneralGroupTest.xml | 124 ++++++++++++++
 ...nCreateVirtualProductWithTierPriceTest.xml | 115 +++++++++++++
 ...teVirtualProductWithoutManageStockTest.xml |  85 ++++++++++
 .../CreateVirtualProductEntityTest.xml        |  54 +++---
 19 files changed, 853 insertions(+), 74 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Data/VirtualProductOptionData.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 01b31430793cc..0499a5d6bb772 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -157,14 +157,11 @@
         <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
         <fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-
         <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection"/>
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
-        <fillField userInput="option1" selector="{{AdminProductCustomizableOptionsSection.optionTitleInput}}" stepKey="fillOptionTitle"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeOpenDropDown}}" stepKey="openTypeDropDown"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeTextField}}" stepKey="selectTypeTextField"/>
         <fillField userInput="20" selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput}}" stepKey="fillMaxChars"/>
-
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
         <seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
index 7373d5baea0c5..04114b33291e4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -15,7 +15,6 @@
             <argument name="productOption"/>
             <argument name="productOption2"/>
         </arguments>
-
         <click stepKey="clickAddOptions" selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}"/>
         <waitForPageLoad stepKey="waitForAddProductPageLoad"/>
 
@@ -27,12 +26,9 @@
 
         <!-- Add three radio options based on the parameter -->
         <click stepKey="clickAddValue" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
-
         <fillField stepKey="fillInValueTitle" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{productOption.title}}"/>
         <fillField stepKey="fillInValuePrice" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{productOption.price}}"/>
-
         <click stepKey="clickAddValue2" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
-
         <fillField stepKey="fillInValueTitle2" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{productOption2.title}}"/>
         <fillField stepKey="fillInValuePrice2" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{productOption2.price}}"/>
     </actionGroup>
@@ -49,9 +45,5 @@
         <click selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}" stepKey="openTypeSelect"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionType('File')}}" stepKey="selectTypeFile"/>
         <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" stepKey="waitForElements"/>
-        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" userInput="{{option.price}}" stepKey="fillPrice"/>
-        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
-        <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
     </actionGroup>
-
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index e5b23fe3a3c34..7a6ea5e380c4f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -477,4 +477,72 @@
         <requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="virtualProductWithRequiredFields" type="product">
+        <data key="name" unique="suffix">virtualProduct</data>
+        <data key="sku" unique="suffix">virtualsku</data>
+        <data key="price">10</data>
+        <data key="visibility">Catalog, Search</data>
+        <data key="urlKey" unique="suffix">virtualproduct</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="virtualProductBigQty" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">100</data>
+        <data key="quantity">999</data>
+        <data key="status">In Stock</data>
+        <data key="visibility">Catalog, Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="virtualProductGeneralGroup" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">100.00</data>
+        <data key="quantity">999</data>
+        <data key="status">In Stock</data>
+        <data key="visibility">Catalog, Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="virtualProductCustomImportOptions" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">9,000.00</data>
+        <data key="quantity">999</data>
+        <data key="status">In Stock</data>
+        <data key="visibility">Catalog, Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="storefrontStatus">IN STOCK</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="virtualProductWithoutManageStock" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">100.00</data>
+        <data key="quantity">999</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="special_price">90.00</data>
+        <data key="storefrontStatus">IN STOCK</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="virtualProductOutOfStock" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">9,000.00</data>
+        <data key="quantity">999</data>
+        <data key="status">Out of Stock</data>
+        <data key="visibility">Catalog, Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="storefrontStatus">OUT OF STOCK</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="virtualProductAssignToCategory" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">10.00</data>
+        <data key="quantity">999</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
index 0aec1244d2650..cedcbe8cd3fec 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.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="testDataTierPrice" type="data">
         <data key="goldenPrice1">$676.50</data>
         <data key="goldenPrice2">$615.00</data>
@@ -20,4 +20,24 @@
         <data key="name">secondStoreView</data>
         <data key="code">second_store_view</data>
     </entity>
+    <entity name="tierPriceOnVirtualProduct" type="data">
+        <data key="price">90.00</data>
+        <data key="qty">2</data>
+    </entity>
+    <entity name="tierPriceOnGeneralGroup" type="data">
+        <data key="website">All Websites [USD]</data>
+        <data key="customer_group">General</data>
+        <data key="price">80.00</data>
+        <data key="qty">2</data>
+    </entity>
+    <entity name="tierPriceOnDefault" type="data">
+        <data key="website_0">All Websites [USD]</data>
+        <data key="customer_group_0">ALL GROUPS</data>
+        <data key="price_0">15.00</data>
+        <data key="qty_0">3</data>
+        <data key="website_1">All Websites [USD]</data>
+        <data key="customer_group_1">ALL GROUPS</data>
+        <data key="price_1">24.00</data>
+        <data key="qty_1">15</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/VirtualProductOptionData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/VirtualProductOptionData.xml
new file mode 100644
index 0000000000000..fe1d49e4daadd
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/VirtualProductOptionData.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="virtualProductCustomizableOption1">
+        <data key="title" unique="suffix">Test1 option </data>
+        <data key="is_required">1</data>
+        <data key="type">Field</data>
+        <data key="option_0_price">120.03</data>
+        <data key="option_0_price_type">Fixed</data>
+        <data key="option_0_sku" unique="suffix">sku1_</data>
+        <data key="option_0_max_characters">45</data>
+    </entity>
+    <entity name="virtualProductCustomizableOption2">
+        <data key="title" unique="suffix">Test2 option </data>
+        <data key="is_required">1</data>
+        <data key="type">Field</data>
+        <data key="option_0_price">120.03</data>
+        <data key="option_0_price_type">Fixed</data>
+        <data key="option_0_sku" unique="suffix">sku2_</data>
+        <data key="option_0_max_characters">45</data>
+    </entity>
+    <entity name="virtualProductCustomizableOption3">
+        <data key="title" unique="suffix">Test3 option </data>
+        <data key="is_required">1</data>
+        <data key="type">Drop-down</data>
+        <data key="option_0_title" unique="suffix">Test3-1 </data>
+        <data key="option_0_price">110.01</data>
+        <data key="option_0_expected_price">9,900.90</data>
+        <data key="option_0_price_type">Percent</data>
+        <data key="option_0_sku" unique="suffix">sku3-1_</data>
+        <data key="option_0_sort_order">0</data>
+        <data key="option_1_title" unique="suffix">Test3-2 </data>
+        <data key="option_1_price">210.02</data>
+        <data key="option_1_price_type">Fixed</data>
+        <data key="option_1_sku" unique="suffix">sku3-2_</data>
+        <data key="option_1_sort_order">1</data>
+    </entity>
+    <entity name="virtualProductCustomizableOption4">
+        <data key="title" unique="suffix">Test4 option </data>
+        <data key="is_required">1</data>
+        <data key="type">Drop-down</data>
+        <data key="option_0_title" unique="suffix">Test4-1 </data>
+        <data key="option_0_price">10.01</data>
+        <data key="option_0_price_type">Percent</data>
+        <data key="option_0_sku" unique="suffix">sku4-1_</data>
+        <data key="option_0_sort_order">0</data>
+        <data key="option_1_title" unique="suffix">Test4-2 </data>
+        <data key="option_1_price">20.02</data>
+        <data key="option_1_price_type">Fixed</data>
+        <data key="option_1_sku" unique="suffix">sku4-2_</data>
+        <data key="option_1_sort_order">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
index 40ea919226d6e..5092e80e9307a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
@@ -15,5 +15,9 @@
         <element name="rowPrice" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-price" parameterized="true"/>
         <element name="rowPosition" type="input" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-position .position input" timeout="30" parameterized="true"/>
         <element name="productGridNameProduct" type="text" selector="//table[@id='catalog_category_products_table']//td[contains(., '{{productName}}')]" parameterized="true"/>
+        <element name="searchCategory" type="input" selector="//*[@data-index='category_ids']//input[contains(@class, 'multiselect-search')]"/>
+        <element name="selectCategory" type="input" selector="//*[@data-index='category_ids']//label[contains(., '$$categoryEntity.name$$')]"/>
+        <element name="done" type="button" selector="//*[@data-index='category_ids']//button[@data-action='close-advanced-select']" timeout="30"/>
+        <element name="selectMultipleCategories" type="input" selector="//*[@data-index='container_category_ids']//*[contains(@class, '_selected')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
index 337cf0527dd4e..755add18ec1c0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCategoryCreationSection.xml
@@ -11,12 +11,10 @@
     <section name="AdminProductCategoryCreationSection">
         <element name="firstExampleProduct" type="button" selector=".data-row:nth-of-type(1)"/>
         <element name="newCategory" type="button" selector="//button/span[text()='New Category']"/>
-
         <element name="nameInput" type="input" selector="input[name='name']"/>
-
         <element name="parentCategory" type="block" selector=".product_form_product_form_create_category_modal div[data-role='selected-option']"/>
         <element name="parentSearch" type="input" selector="aside input[data-role='advanced-select-text']"/>
         <element name="parentSearchResult" type="block" selector="aside .admin__action-multiselect-menu-inner"/>
-        <element name="createCategory" type="button" selector="#save"/>
+        <element name="createCategory" type="button" selector="#save" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
index 052195ec1aaa7..422b4c07f7c5b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -13,13 +13,14 @@
         <element name="customizableOptions" type="text" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Customizable Options']"/>
         <element name="useDefaultOptionTitle" type="text" selector="[data-index='options'] tr.data-row [data-index='title'] [name^='options_use_default']"/>
         <element name="useDefaultOptionTitleByIndex" type="text" selector="[data-index='options'] [data-index='values'] tr[data-repeat-index='{{var1}}'] [name^='options_use_default']" parameterized="true"/>
-        <element name="addOptionBtn" type="button" selector="button[data-index='button_add']"/>
+        <element name="addOptionBtn" type="button" selector="button[data-index='button_add']" timeout="30"/>
         <element name="fillOptionTitle" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Title']/parent::label/parent::div/parent::div//input[@class='admin__control-text']" parameterized="true"/>
-        <element name="optionTitleInput" type="input" selector="input[name='product[options][0][title]']"/>
-        <element name="optionTypeOpenDropDown" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-select"/>
-        <element name="optionTypeTextField" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-menu._active li li"/>
+        <element name="optionTitleInput" type="input" selector="input[name='product[options][{{index}}][title]']" parameterized="true"/>
+        <element name="optionTypeOpenDropDown" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-select" timeout="30"/>
+        <element name="optionTypeTextField" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-menu._active li li" timeout="30"/>
         <element name="maxCharactersInput" type="input" selector="input[name='product[options][0][max_characters]']"/>
-
+        <element name="optionTypeDropDown" type="select" selector="//table[@data-index='options']//tr[{{index}}]//div[@data-index='type']//div[contains(@class, 'action-select-wrap')]" parameterized="true" />
+        <element name="optionTypeItem" type="select" selector="//table[@data-index='options']//tr[{{index}}]//div[@data-index='type']//*[contains(@class, 'action-menu-item')]//*[contains(., '{{optionValue}}')]" parameterized="true" />
         <element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Type']/parent::label/parent::div/parent::div//div[@data-role='selected-option']" parameterized="true"/>
         <element name="checkDropDown" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//parent::label/parent::div/parent::div//li[@class='admin__action-multiselect-menu-inner-item']//label[text()='Drop-down']" parameterized="true"/>
         <element name="clickAddValue" type="button" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tfoot//button" parameterized="true"/>
@@ -28,19 +29,20 @@
         <element name="clickSelectPriceType" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody//tr[@data-repeat-index='{{var2}}']//span[text()='Price Type']/parent::label/parent::div/parent::div//select" parameterized="true"/>
         <element name="checkboxUseDefaultTitle" type="checkbox" selector="//span[text()='Option Title']/parent::label/parent::div/parent::div/div//input[@type='checkbox']"/>
         <element name="checkboxUseDefaultOption" type="checkbox" selector="//table[@data-index='values']//tbody//tr[@data-repeat-index='{{var1}}']//div[@class='admin__field-control']//input[@type='checkbox']" parameterized="true"/>
+        <element name="requiredCheckBox" type="checkbox" selector="input[name='product[options][{{index}}][is_require]']" parameterized="true" />
+        <element name="fillOptionValueSku" type="input" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//tbody/tr[@data-repeat-index='{{var2}}']//span[text()='SKU']/parent::label/parent::div/parent::div//div[@class='admin__field-control']/input" parameterized="true"/>
 
         <!-- Elements that make it easier to select the most recently added element -->
         <element name="lastOptionTitle" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, '_required')]//input" />
         <element name="lastOptionTypeParent" type="block" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__action-multiselect-text')]" />
         <!-- var 1 represents the option type that you want to select, i.e "radio buttons" -->
         <element name="optionType" type="block" selector="//*[@data-index='custom_options']//label[text()='{{var1}}'][ancestor::*[contains(@class, '_active')]]" parameterized="true" />
-        <element name="addValue" type="button" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@data-action='add_new_row']" />
+        <element name="addValue" type="button" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@data-action='add_new_row']" timeout="30"/>
         <element name="valueTitle" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='title']//input" />
         <element name="valuePrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='price']//input" />
-
-        <element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price]']"/>
-        <element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][price_type]']"/>
-        <element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][sku]']"/>
-        <element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][0][file_extension]']"/>
+        <element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{index}}][price]']" parameterized="true"/>
+        <element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{var}}][price_type]']" parameterized="true"/>
+        <element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{index}}][sku]']" parameterized="true"/>
+        <element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{index}}][file_extension]']" parameterized="true"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
index 0314534dcddfb..71dd49fd77e49 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
@@ -16,7 +16,9 @@
         <element name="qtyUsesDecimalsOptions" type="select" selector="//*[@name='product[stock_data][is_qty_decimal]']//option[contains(@value, '{{var1}}')]" parameterized="true"/>
         <element name="qtyIncrements" type="input" selector="//input[@name='product[stock_data][qty_increments]']"/>
         <element name="qtyIncrementsUseConfigSettings" type="checkbox" selector="//input[@name='product[stock_data][use_config_qty_increments]']"/>
-        <element name="doneButton" type="button" selector="//aside[contains(@class,'product_form_product_form_advanced_inventory_modal')]//button[contains(@data-role,'action')]" timeout="5"/>
+        <element name="doneButton" type="button" selector="//aside[contains(@class,'product_form_product_form_advanced_inventory_modal')]//button[contains(@data-role,'action')]" timeout="30"/>
+        <element name="useConfigSettings" type="checkbox" selector="//input[@name='product[stock_data][use_config_manage_stock]']"/>
+        <element name="manageStock" type="select" selector="//*[@name='product[stock_data][manage_stock]']"/>
     </section>
 </sections>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 249610568aec7..1ac9de4dbacee 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -25,11 +25,12 @@
         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
         <element name="productTaxClass" type="select" selector="//*[@name='product[tax_class_id]']"/>
         <element name="productTaxClassUseDefault" type="checkbox" selector="input[name='use_default[tax_class_id]']"/>
-        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/>
+        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']" timeout="30"/>
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
         <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]"/>
         <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']"/>
+        <element name="stockStatus" type="select" selector="[data-index='product-details'] select[name='product[quantity_and_stock_status][is_in_stock]']"/>
         <element name="productWeight" type="input" selector=".admin__field[data-index=weight] input"/>
         <element name="productWeightSelect" type="select" selector="select[name='product[product_has_weight]']"/>
         <element name="contentTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Content']"/>
@@ -37,7 +38,8 @@
         <element name="priceFieldError" type="text" selector="//input[@name='product[price]']/parent::div/parent::div/label[@class='admin__field-error']"/>
         <element name="addAttributeBtn" type="button" selector="#addAttribute"/>
         <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
-        <element name="save" type="button" selector="#save"/>
+        <element name="save" type="button" selector="#save-button" timeout="30"/>
+        <element name="successMessage" type="text" selector="#messages"/>
         <element name="attributeTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Attributes']"/>
         <element name="attributeLabel" type="input" selector="//input[@name='frontend_label[0]']"/>
         <element name="frontendInput" type="select" selector="select[name = 'frontend_input']"/>
@@ -78,19 +80,19 @@
         <element name="TextArea" type ="text" selector="//div[@data-index='{{var1}}']//textarea" parameterized="true"/>
         <element name="showHideBtn" type="button" selector="//button[contains(@id,'{{var1}}')]" parameterized="true"/>
         <element name="InsertImageBtn" type="button" selector="//div[contains(@id, '{{var1}}')]//span[text()='Insert Image...']" parameterized="true"/>
-        <element name="Style" type="button" selector="//div[contains(@id, '{{var1}}')]//span[text()='Paragraph']" parameterized="true"/>
-        <element name="Bold" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true"/>
-        <element name="Italic" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true"/>
-        <element name="Underline" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-underline']" parameterized="true"/>
-        <element name="AlignLeft" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignleft']" parameterized="true"/>
-        <element name="AlignCenter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-aligncenter']" parameterized="true"/>
-        <element name="AlignRight" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignright']" parameterized="true"/>
-        <element name="Numlist" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bullist']" parameterized="true"/>
-        <element name="Bullet" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-numlist']" parameterized="true"/>
-        <element name="InsertLink" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-link']" parameterized="true"/>
-        <element name="InsertImageIcon" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-image']" parameterized="true"/>
-        <element name="InsertTable" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-table']" parameterized="true"/>
-        <element name="SpecialCharacter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-charmap']" parameterized="true"/>
+        <element name="Style" type="button" selector="//div[contains(@id, '{{var1}}')]//span[text()='Paragraph']" parameterized="true" timeout="30"/>
+        <element name="Bold" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true" timeout="30"/>
+        <element name="Italic" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true" timeout="30"/>
+        <element name="Underline" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-underline']" parameterized="true" timeout="30"/>
+        <element name="AlignLeft" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignleft']" parameterized="true" timeout="30"/>
+        <element name="AlignCenter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-aligncenter']" parameterized="true" timeout="30"/>
+        <element name="AlignRight" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignright']" parameterized="true" timeout="30"/>
+        <element name="Numlist" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bullist']" parameterized="true" timeout="30"/>
+        <element name="Bullet" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-numlist']" parameterized="true" timeout="30"/>
+        <element name="InsertLink" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-link']" parameterized="true" timeout="30"/>
+        <element name="InsertImageIcon" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-image']" parameterized="true" timeout="30"/>
+        <element name="InsertTable" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-table']" parameterized="true" timeout="30"/>
+        <element name="SpecialCharacter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-charmap']" parameterized="true" timeout="30"/>
         <element name="TinyMCE4" type="text" selector="//div[contains(@id, '{{var1}}')]//div[@class='mce-branding-powered-by']" parameterized="true"/>
     </section>
     <section name="ProductDescriptionWYSIWYGToolbarSection">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index 611f12a39b510..f606884183855 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -21,7 +21,7 @@
         <element name="resetGridColumns" type="button" selector="//div[contains(@class, '_active')]//div[contains(@class, 'admin__data-grid-action-columns-menu')]//button[text()='Reset']"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
-        <element name="cancelFilters" type="button" selector="button[data-action='grid-filter-cancel']"/>
+        <element name="cancelFilters" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
         <element name="nameFilter" type="input" selector="input.admin__control-text[name='name']"/>
         <element name="skuFilter" type="input" selector="input.admin__control-text[name='sku']"/>
         <element name="priceFilterFrom" type="input" selector="input.admin__control-text[name='price[from]']"/>
@@ -31,5 +31,6 @@
         <element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
         <element name="keywordSearch" type="input" selector="input#fulltext"/>
         <element name="keywordSearchButton" type="button" selector=".data-grid-search-control-wrap button.action-submit" timeout="30"/>
+        <element name="nthRow" type="block" selector=".data-row:nth-of-type(1)"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index b93a70559fc4a..07aafa1fbe7f5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -16,10 +16,11 @@
         <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
         <element name="qty" type="input" selector="#qty"/>
         <element name="specialPrice" type="text" selector=".special-price"/>
+        <element name="specialPriceAmount" type="text" selector=".special-price span.price"/>
         <element name="updatedPrice" type="text" selector="div.price-box.price-final_price [data-price-type='finalPrice'] .price"/>
         <element name="oldPrice" type="text" selector=".old-price"/>
         <element name="oldPriceTag" type="text" selector=".old-price .price-label"/>
-        <element name="oldPriceAmount" type="text" selector=".old-price .price"/>
+        <element name="oldPriceAmount" type="text" selector=".old-price span.price"/>
         <element name="productStockStatus" type="text" selector=".stock[title=Availability]>span"/>
         <element name="productImage" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[@class='fotorama__img']"/>
         <element name="productImageSrc" type="text" selector="//*[@id='maincontent']//div[@class='gallery-placeholder']//img[contains(@src, '{{src}}')]" parameterized="true"/>
@@ -28,14 +29,13 @@
         <element name="productOptionAreaInput" type="textarea" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//textarea" parameterized="true"/>
         <element name="productOptionFile" type="file" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'OptionFile')]/../div[@class='control']//input[@type='file']" parameterized="true"/>
         <element name="productOptionSelect" type="select" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//select" parameterized="true"/>
-
+        <element name="asLowAs" type="input" selector="span[class='price-wrapper '] "/>
 
         <!-- The parameter is the nth custom option that you want to get -->
         <element name="nthCustomOption" type="block" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]" parameterized="true" />
         <!-- The 1st parameter is the nth custom option, the 2nd parameter is the nth value in the option -->
         <element name="nthCustomOptionInput" type="radio" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]//*[contains(@class, 'admin__field-option')][{{customOptionValueNum}}]//input" parameterized="true" />
         <element name="productOptionRadioButtonsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@price='{{var2}}']" parameterized="true"/>
-
         <element name="productOptionDataMonth" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='month']" parameterized="true"/>
         <element name="productOptionDataDay" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='day']" parameterized="true"/>
         <element name="productOptionDataYear" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='year']" parameterized="true"/>
@@ -49,7 +49,6 @@
 
         <!-- Only one of Upload/Url Inputs are available for File and Sample depending on the value of the corresponding TypeSelector -->
         <element name="addLinkFileUploadFile" type="file" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@type='file']" parameterized="true" />
-
         <element name="productShortDescription" type="text" selector="//div[@class='product attribute overview']//div[@class='value']"/>
         <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
         <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
@@ -66,8 +65,16 @@
         <element name="productOptionDropDownOptionTitle" type="text" selector="//label[contains(.,'{{var1}}')]/../div[@class='control']//select//option[contains(.,'{{var2}}')]" parameterized="true"/>
 
         <!-- Tier price selectors -->
+        <element name="tierPriceText" type="text" selector=".prices-tier li[class='item']" />
         <element name="productTierPriceByForTextLabel" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}][contains(text(),'Buy {{var2}} for')]" parameterized="true"/>
         <element name="productTierPriceAmount" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}]//span[contains(text(), '{{var2}}')]" parameterized="true"/>
         <element name="productTierPriceSavePercentageAmount" type="text" selector="//ul[contains(@class, 'prices-tier')]//li[{{var1}}]//span[contains(@class, 'percent')][contains(text(), '{{var2}}')]" parameterized="true"/>
+
+        <!-- Customizable Option selectors -->
+        <element name="allCustomOptionLabels" type="text" selector="#product-options-wrapper label"/>
+        <element name="customOptionLabel" type="text" selector="//label[contains(., '{{customOptionTitle}}')]" parameterized="true"/>
+        <element name="customSelectOptions" type="select" selector="#{{selectId}} option" parameterized="true"/>
+        <element name="requiredCustomInput" type="text" selector="//div[contains(.,'{{customOptionTitle}}') and contains(@class, 'required') and .//input[@aria-required='true']]" parameterized="true"/>
+        <element name="requiredCustomSelect" type="select" selector="//div[contains(.,'{{customOptionTitle}}') and contains(@class, 'required') and .//select[@aria-required='true']]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
new file mode 100644
index 0000000000000..80a6e5bc4d5e1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
@@ -0,0 +1,51 @@
+<?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="AdminCreateVirtualProductFillingRequiredFieldsOnlyTest">
+        <annotations>
+            <stories value="Create virtual product"/>
+            <title value="Create virtual product filling required fields only"/>
+            <description value="Test log in to Create virtual product and Create virtual product filling required fields only"/>
+            <testCaseId value="MC-6031"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
+
+        <!-- Create virtual product with required fields only -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductWithRequiredFields.price}}" stepKey="fillProductPrice"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved" />
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
+
+        <!-- Verify we see created virtual product(from the above step) on the product grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickSelector"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName1"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickSearch2"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow}}" stepKey="clickFirstRowToVerifyCreatedVirtualProductAvailableInGrid"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
new file mode 100644
index 0000000000000..56e0533460afe
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
@@ -0,0 +1,95 @@
+<?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="AdminCreateVirtualProductOutOfStockWithTierPriceTest">
+        <annotations>
+            <stories value="Create virtual product"/>
+            <title value="Create virtual product out of stock with tier price"/>
+            <description value="Test log in to Create virtual product and Create virtual product out of stock with tier price"/>
+            <testCaseId value="MC-6036"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
+        </after>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
+
+        <!-- Create virtual product out of stock with tier price -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductOutOfStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductOutOfStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductOutOfStock.price}}" stepKey="fillProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnDefault.website_0}}" stepKey="selectProductTierPriceWebsite"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnDefault.customer_group_0}}" stepKey="selectProductTierPriceCustGroup"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnDefault.qty_0}}" stepKey="fillProductTierPriceQuantityInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnDefault.price_0}}" stepKey="selectProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButtonToAddAnotherRow"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('1')}}" userInput="{{tierPriceOnDefault.website_1}}" stepKey="clickProductTierPriceWebsite1"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('1')}}" userInput="{{tierPriceOnDefault.customer_group_1}}" stepKey="clickProductTierPriceCustGroup1"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" userInput="{{tierPriceOnDefault.qty_1}}" stepKey="fillProductTierPriceQuantityInput1"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('1')}}" userInput="{{tierPriceOnDefault.price_1}}" stepKey="selectProductTierPriceFixedPrice1"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductOutOfStock.quantity}}" stepKey="fillVirtualProductQuantity"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{virtualProductOutOfStock.status}}" stepKey="selectStockStatusOutOfStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
+
+        <!-- Verify we see created virtual product out of stock with tier price on the storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(virtualProductOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+
+        <!--  Verify customer see product tier price on product page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', tierPriceOnDefault.qty_0)}}" stepKey="firstTierPriceText"/>
+        <assertEquals stepKey="assertTierPriceTextOnProductPage1">
+            <expectedResult type="string">Buy {{tierPriceOnDefault.qty_0}} for ${{tierPriceOnDefault.price_0}} each and save 100%</expectedResult>
+            <actualResult type="variable">firstTierPriceText</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', tierPriceOnDefault.qty_1)}}" stepKey="secondTierPriceText"/>
+        <assertEquals stepKey="assertTierPriceTextOnProductPage2">
+            <expectedResult type="string">Buy {{tierPriceOnDefault.qty_1}} for ${{tierPriceOnDefault.price_1}} each and save 100%</expectedResult>
+            <actualResult type="variable">secondTierPriceText</actualResult>
+        </assertEquals>
+
+        <!--  Verify customer see product out of stock status on product page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{virtualProductOutOfStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{virtualProductOutOfStock.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
new file mode 100644
index 0000000000000..f983a80da84ca
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -0,0 +1,156 @@
+<?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="AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest">
+        <annotations>
+            <stories value="Create virtual product"/>
+            <title value="Create virtual product with custom options suite and import options"/>
+            <description value="Test log in to Create virtual product and Create virtual product with custom options suite and import options"/>
+            <testCaseId value="MC-6034"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
+        </after>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
+
+        <!-- Create virtual product with custom options suite and import options -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductCustomImportOptions.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductCustomImportOptions.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductCustomImportOptions.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductCustomImportOptions.quantity}}" stepKey="fillProductQuantity"/>
+        <click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <click selector="{{AdminProductFormSection.visibility}}" stepKey="clickVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductCustomImportOptions.urlKey}}" stepKey="fillUrlKey"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
+        <!-- Create virtual product with customizable options dataSet1 -->
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButton"/>
+        <waitForPageLoad stepKey="waitForFirstOption"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="{{virtualProductCustomizableOption1.title}}" stepKey="fillOptionTitleForFirstDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('1')}}" stepKey="selectOptionTypeDropDownFirstDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('1', virtualProductCustomizableOption1.type)}}" stepKey="selectOptionFieldFromDropDownForFirstDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('0')}}" stepKey="checkRequiredCheckBoxForFirstDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price}}" stepKey="fillOptionPriceForFirstDataSet"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price_type}}" stepKey="selectOptionPriceTypeForFirstDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_sku}}" stepKey="fillOptionSkuForFirstDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForFirstDataSet"/>
+        <!-- Create virtual product with customizable options dataSet2 -->
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForSecondDataSet"/>
+        <waitForPageLoad stepKey="waitForSecondDataSetToLoad"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('1')}}" userInput="{{virtualProductCustomizableOption2.title}}" stepKey="fillOptionTitleForSecondDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('2')}}" stepKey="selectOptionTypeDropDownSecondDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('2', virtualProductCustomizableOption2.type)}}" stepKey="selectOptionFieldFromDropDownForSecondDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('1')}}" stepKey="checkRequiredCheckBoxForSecondDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price}}" stepKey="fillOptionPriceForSecondDataSet"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price_type}}" stepKey="selectOptionPriceTypeForSecondDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_sku}}" stepKey="fillOptionSkuForSecondDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForSecondDataSet"/>
+        <!-- Create virtual product with customizable options dataSet3 -->
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForThirdSetOfData"/>
+        <waitForPageLoad stepKey="waitForThirdSetOfDataToLoad"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('2')}}" userInput="{{virtualProductCustomizableOption3.title}}" stepKey="fillOptionTitleForThirdDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('3')}}" stepKey="selectOptionTypeDropDownForThirdDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('3', virtualProductCustomizableOption3.type)}}" stepKey="selectOptionFieldFromDropDownForThirdDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('2')}}" stepKey="checkRequiredCheckBoxForThirdDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForThirdDataSetToAddFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_title}}" stepKey="fillOptionTitleForThirdDataSetFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price}}" stepKey="fillOptionPriceForThirdDataSetFirstRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price_type}}" stepKey="selectOptionPriceTypeForThirdDataSetFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_sku}}" stepKey="fillOptionSkuForThirdDataSetFirstRow"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForThirdDataSetToAddSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_title}}" stepKey="fillOptionTitleForThirdDataSetSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price}}" stepKey="fillOptionPriceForThirdDataSetSecondRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price_type}}" stepKey="selectOptionPriceTypeForThirdDataSetSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_sku}}" stepKey="fillOptionSkuForThirdDataSetSecondRow"/>
+        <!-- Create virtual product with customizable options dataSet4 -->
+        <scrollToTopOfPage stepKey="scrollToAddOptionButton"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForFourthDataSet"/>
+        <waitForPageLoad stepKey="waitForFourthDataSetToLoad"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('3')}}" userInput="{{virtualProductCustomizableOption4.title}}" stepKey="fillOptionTitleForFourthDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('4')}}" stepKey="selectOptionTypeDropDownForFourthSetOfData"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('4', virtualProductCustomizableOption4.type)}}" stepKey="selectOptionFieldFromDropDownForFourthDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('3')}}" stepKey="checkRequiredCheckBoxForFourthDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForFourthDataSetToAddFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_title}}" stepKey="fillOptionTitleForFourthDataSetFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price}}" stepKey="fillOptionPriceForFourthDataSetFirstRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_sku}}" stepKey="fillOptionSkuForFourthDataSetFirstRow"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForFourthDataSetToAddSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_title}}" stepKey="fillOptionTitleForFourthDataSetSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price}}" stepKey="fillOptionPriceForFourthDataSetSecondRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="fillOptionSkuForFourthDataSetSecondRow"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
+
+        <!-- Verify customer see created virtual product with custom options suite and import options(from above step) on category page and is searchable by sku -->
+        <amOnPage url="{{StorefrontProductPage.url(virtualProductCustomImportOptions.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{virtualProductCustomImportOptions.sku}}" stepKey="fillVirtualProductName"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{virtualProductCustomImportOptions.name}}" stepKey="seeVirtualProductName"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.productLink}}" stepKey="openSearchedProduct"/>
+
+        <!-- Verify we see created virtual product with custom options suite and import options on the storefront page -->
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductCustomImportOptions.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductCustomImportOptions.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{virtualProductCustomImportOptions.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{virtualProductCustomImportOptions.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+
+        <!--Verify we see customizable options are Required -->
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFistCustomOptionIsRequired" />
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption2.title)}}" stepKey="verifySecondCustomOptionIsRequired" />
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption3.title)}}" stepKey="verifyThirdCustomOptionIsRequired" />
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption4.title)}}" stepKey="verifyFourthCustomOptionIsRequired" />
+
+        <!--Verify we see customizable option titles and prices -->
+        <grabMultiple selector="{{StorefrontProductInfoMainSection.allCustomOptionLabels}}" stepKey="allCustomOptionLabels" />
+        <assertEquals stepKey="verifyLabels">
+            <actualResult type="variable">allCustomOptionLabels</actualResult>
+            <expectedResult type="array">[{{virtualProductCustomizableOption1.title}} + ${{virtualProductCustomizableOption1.option_0_price}}, {{virtualProductCustomizableOption2.title}} + ${{virtualProductCustomizableOption2.option_0_price}}, {{virtualProductCustomizableOption3.title}}, {{virtualProductCustomizableOption4.title}}]</expectedResult>
+        </assertEquals>
+        <grabAttributeFrom userInput="for" selector="{{StorefrontProductInfoMainSection.customOptionLabel(virtualProductCustomizableOption4.title)}}" stepKey="fourthOptionId" />
+        <grabMultiple selector="{{StorefrontProductInfoMainSection.customSelectOptions({$fourthOptionId})}}" stepKey="grabFourthOptions" />
+        <assertEquals stepKey="assertFourthSelectOptions">
+            <actualResult type="variable">grabFourthOptions</actualResult>
+            <expectedResult type="array">['-- Please Select --', {{virtualProductCustomizableOption4.option_0_title}} +$900.90, {{virtualProductCustomizableOption4.option_1_title}} +$20.02]</expectedResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
new file mode 100644
index 0000000000000..531c99285934f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
@@ -0,0 +1,124 @@
+<?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="AdminCreateVirtualProductWithTierPriceForGeneralGroupTest">
+        <annotations>
+            <stories value="Create virtual product"/>
+            <title value="Create virtual product with tier price for General group"/>
+            <description value="Test log in to Create virtual product and Create virtual product with tier price for General group"/>
+            <testCaseId value="MC-6033"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+            <createData entity="Simple_US_CA_Customer" stepKey="customer" />
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
+            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
+        </after>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
+
+        <!-- Create virtual product with tier price for general group -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductGeneralGroup.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductGeneralGroup.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductGeneralGroup.quantity}}" stepKey="fillProductQuantity"/>
+        <click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.website}}" stepKey="selectProductTierPriceWebsite"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.customer_group}}" stepKey="selectProductTierPriceGroup"/>
+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnGeneralGroup.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnGeneralGroup.price}}" stepKey="fillProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <click selector="{{AdminProductFormSection.visibility}}" stepKey="clickVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSectionHeader"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductGeneralGroup.urlKey}}" stepKey="fillUrlKeyInput"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="checkRetailCustomerTaxClass" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="fillVirtualProductName"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+        <!-- Verify we see created virtual product with tier price for general group(from the above step) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductGeneralGroup.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductGeneralGroup.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductGeneralGroup.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{virtualProductGeneralGroup.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminCategoryProductsGridSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeOptionIsSelected selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.website}}" stepKey="seeProductTierPriceWebsite"/>
+        <seeOptionIsSelected selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.customer_group}}" stepKey="seeProductTierPriceGroup"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnGeneralGroup.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnGeneralGroup.price}}" stepKey="seeProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductGeneralGroup.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductGeneralGroup.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!-- Verify customer see created virtual product with tier price for general group(from above step) in category page  -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$customer$$" />
+        </actionGroup>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="fillVirtualProductNameInSearchTextBox"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeVirtualProductName"/>
+        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnCategoryPage"/>
+        <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
+            <expectedResult type="string">As low as ${{tierPriceOnGeneralGroup.price}}</expectedResult>
+            <actualResult type="variable">tierPriceTextOnCategoryPage</actualResult>
+        </assertEquals>
+        <click selector="{{StorefrontQuickSearchResultsSection.productLink}}" stepKey="openSearchedProduct"/>
+        <waitForPageLoad stepKey="waitForProductPageToBeLoaded"/>
+
+        <!-- Verify customer see created virtual product with tier price for general group on product page with customer -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
+            <expectedResult type="string">Buy {{tierPriceOnGeneralGroup.qty}} for ${{tierPriceOnGeneralGroup.price}} each and save 20%</expectedResult>
+            <actualResult type="variable">tierPriceText</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
new file mode 100644
index 0000000000000..b9c52267fb0c7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -0,0 +1,115 @@
+<?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="AdminCreateVirtualProductWithTierPriceTest">
+        <annotations>
+            <stories value="Create virtual product"/>
+            <title value="Create virtual product with tier price"/>
+            <description value="Test log in to Create virtual product and Create virtual product with tier price"/>
+            <testCaseId value="MC-6032"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
+        </after>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
+
+        <!-- Create virtual product with tier price -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductBigQty.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductBigQty.price}}" stepKey="fillProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductBigQty.quantity}}" stepKey="fillProductQuantity"/>
+        <click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <click selector="{{AdminProductFormSection.visibility}}" stepKey="clickVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="checkRetailCustomerTaxClass" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName1"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened" />
+        <!-- Verify we see created virtual product with tier price(from the above step) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductBigQty.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductBigQty.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductBigQty.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{virtualProductBigQty.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminCategoryProductsGridSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductBigQty.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!-- Verify customer see created virtual product with tier price(from above step) on category page and is searchable by sku -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{virtualProductBigQty.sku}}" stepKey="fillVirtualProductName"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductName"/>
+        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnCategoryPage"/>
+        <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
+            <expectedResult type="string">As low as ${{tierPriceOnVirtualProduct.price}}</expectedResult>
+            <actualResult type="variable">tierPriceTextOnCategoryPage</actualResult>
+        </assertEquals>
+        <click selector="{{StorefrontQuickSearchResultsSection.productLink}}" stepKey="openSearchedProduct"/>
+        <waitForPageLoad stepKey="waitForProductPageToBeLoaded" />
+
+        <!-- Verify customer see product tier price on product page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 10%</expectedResult>
+            <actualResult type="variable">tierPriceText</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
new file mode 100644
index 0000000000000..ef821b0af2e4f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -0,0 +1,85 @@
+<?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="AdminCreateVirtualProductWithoutManageStockTest">
+        <annotations>
+            <stories value="Create virtual product"/>
+            <title value="Create virtual product without manage stock"/>
+            <description value="Test log in to Create virtual product and Create virtual product without manage stock"/>
+            <testCaseId value="MC-6035"/>
+            <severity value="CRITICAL"/>
+            <group value="tax"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
+        </after>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
+        <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
+
+        <!-- Create virtual product without manage stock  -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithoutManageStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductWithoutManageStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductWithoutManageStock.price}}" stepKey="fillProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{virtualProductWithoutManageStock.special_price}}" stepKey="fillSpecialPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductWithoutManageStock.quantity}}" stepKey="fillProductQuantity"/>
+        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickAdvancedInventoryLink"/>
+        <click selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" stepKey="clickManageStock"/>
+        <checkOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="CheckUseConfigSettingsCheckBox"/>
+        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickDoneButtonOnAdvancedInventorySection"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductWithoutManageStock.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
+
+        <!-- Verify customer see created virtual product without manage stock on the storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(virtualProductWithoutManageStock.urlKey)}}" stepKey="goToProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductWithoutManageStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductWithoutManageStock.sku}}" stepKey="seeVirtualProductSku"/>
+
+        <!-- Verify customer see product special price on the storefront page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
+        <assertEquals stepKey="assertSpecialPriceTextOnProductPage">
+            <expectedResult type="string">${{virtualProductWithoutManageStock.special_price}}</expectedResult>
+            <actualResult type="variable">specialPriceAmount</actualResult>
+        </assertEquals>
+        <!-- Verify customer see product old price on the storefront page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" stepKey="oldPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{virtualProductWithoutManageStock.price}}</expectedResult>
+            <actualResult type="variable">oldPriceAmount</actualResult>
+        </assertEquals>
+
+        <!-- Verify customer see product in stock status on the storefront page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{virtualProductWithoutManageStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
index 1449e7df0ce61..258a490fa16fb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
@@ -36,20 +36,20 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
         </variation>
-        <variation name="CreateVirtualProductEntityTestVariation3">
-            <data name="description" xsi:type="string">Create product with out of stock</data>
-            <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
-            <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-            <data name="product/data/price/value" xsi:type="string">10</data>
-            <data name="product/data/tax_class_id/dataset" xsi:type="string">taxable_goods</data>
-            <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
-            <data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
-            <data name="product/data/price/dataset" xsi:type="string">MAGETWO-23030</data>
-            <data name="product/data/visibility" xsi:type="string">Search</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSkuAutoGenerated" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
-        </variation>
+        <!--<variation name="CreateVirtualProductEntityTestVariation3">-->
+            <!--<data name="description" xsi:type="string">Create product with out of stock</data>-->
+            <!--<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>-->
+            <!--<data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>-->
+            <!--<data name="product/data/price/value" xsi:type="string">10</data>-->
+            <!--<data name="product/data/tax_class_id/dataset" xsi:type="string">taxable_goods</data>-->
+            <!--<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>-->
+            <!--<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>-->
+            <!--<data name="product/data/price/dataset" xsi:type="string">MAGETWO-23030</data>-->
+            <!--<data name="product/data/visibility" xsi:type="string">Search</data>-->
+            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />-->
+            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductSkuAutoGenerated" />-->
+            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />-->
+        <!--</variation>-->
         <variation name="CreateVirtualProductEntityTestVariation4">
             <data name="description" xsi:type="string">Create product with tier price for "General" group</data>
             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
@@ -115,18 +115,18 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
         </variation>
-        <variation name="CreateVirtualProductEntityTestVariation8" summary="Create Virtual Product with Required Fields Only and Assign It to the Category" ticketId="MAGETWO-13593">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-            <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
-            <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
-            <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
-            <data name="product/data/price/value" xsi:type="string">10</data>
-            <data name="product/data/category" xsi:type="string">category_%isolation%</data>
-            <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-        </variation>
+        <!--<variation name="CreateVirtualProductEntityTestVariation8" summary="Create Virtual Product with Required Fields Only and Assign It to the Category" ticketId="MAGETWO-13593">-->
+            <!--<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>-->
+            <!--<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>-->
+            <!--<data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>-->
+            <!--<data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>-->
+            <!--<data name="product/data/price/value" xsi:type="string">10</data>-->
+            <!--<data name="product/data/category" xsi:type="string">category_%isolation%</data>-->
+            <!--<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>-->
+            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />-->
+            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />-->
+            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />-->
+            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />-->
+        <!--</variation>-->
     </testCase>
 </config>

From f949d91e36adca70fb5a99f97fc79863c3d63426 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Mon, 7 Jan 2019 14:50:44 -0600
Subject: [PATCH 504/932] MC-4393: Convert CreateFlatCatalogProduct to MFTF

---
 .../AdminCategoryProductsGridSection.xml      |   1 +
 ...StorefrontCategoryBottomToolbarSection.xml |  15 ++
 .../AdminCheckPaginationInStorefrontTest.xml  | 155 ++++++++++++++++++
 .../Test/Mftf/Section/CatalogSection.xml      |   4 +
 ...t.php => CreateFlatCatalogProductTest.php} |   2 +-
 ...t.xml => CreateFlatCatalogProductTest.xml} |   2 +-
 6 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
 rename dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/{CreateFlatCatalogProduct.php => CreateFlatCatalogProductTest.php} (98%)
 rename dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/{CreateFlatCatalogProduct.xml => CreateFlatCatalogProductTest.xml} (89%)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
index a449836fa08f4..df79ec61ef736 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
@@ -16,5 +16,6 @@
         <element name="rowPosition" type="input" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-position .position input" timeout="30" parameterized="true"/>
         <element name="productGridNameProduct" type="text" selector="//table[@id='catalog_category_products_table']//td[contains(., '{{productName}}')]" parameterized="true"/>
         <element name="productVisibility" type="select" selector="//*[@name='product[visibility]']"/>
+        <element name="productSelectAll" type="checkbox" selector="input.admin__control-checkbox"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
new file mode 100644
index 0000000000000..1143a29546b0a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryBottomToolbarSection">
+        <element name="nextPage" type="button" selector=".//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'next')]" timeout="30"/>
+        <element name="previousPage" type="button" selector=".//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'previous')]" timeout="30"/>
+        <element name="pageNumber" type="text" selector="//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'page')]//span[2][contains(text() ,'{{var1}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
new file mode 100644
index 0000000000000..0818e2d67100b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
@@ -0,0 +1,155 @@
+<?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="AdminCheckPaginationInStorefrontTest">
+        <annotations>
+            <stories value="Create flat catalog product"/>
+            <title value="Verify that pagination works when Flat Category is enabled"/>
+            <description value="Login as admin, create flat catalog product and check pagination"/>
+            <testCaseId value="MC-6051"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+            <group value="Catalog"/>
+            <group value="banana"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct1" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct2" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct3" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct4" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct5" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct6" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct7" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct8" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct9" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct10" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct11" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct12" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct13" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct14" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct15" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct16" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct17" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct18" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct19" />
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct20" />
+        </before>
+        <after>
+            <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="getCatalogEditPage1"/>
+            <waitForPageLoad stepKey="waitForPageToLoad"/>
+            <click selector="{{CatalogSection.storefront}}" stepKey="clickOnStoreFront2"/>
+            <scrollTo selector="{{CatalogSection.flatCatalogCategoryCheckBox}}" x="0" y="-80" stepKey="scrollToFlatCatalogCategory1"/>
+            <checkOption selector="{{CatalogSection.flatCatalogCategoryCheckBox}}" stepKey="checkTheflatCategoryCheckBox"/>
+            <selectOption selector="{{CatalogSection.flatCatalogProduct}}"  userInput="No" stepKey="selectFlatCatalogProduct1"/>
+            <scrollToTopOfPage stepKey="scrollToTopOfThePage3"/>
+            <click selector="{{CatalogSection.storefront}}" stepKey="clickOnStoreFront3"/>
+            <click selector="{{CatalogSection.save}}" stepKey="clickOnSaveButton2"/>
+            <see selector="{{CatalogSection.successMessage}}" userInput="You saved the configuration." stepKey="seeSuccessSaveMessage1"/>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
+            <deleteData  createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData  createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData  createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData  createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
+            <deleteData  createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
+            <deleteData  createDataKey="simpleProduct6" stepKey="deleteSimpleProduct6"/>
+            <deleteData  createDataKey="simpleProduct7" stepKey="deleteSimpleProduct7"/>
+            <deleteData  createDataKey="simpleProduct8" stepKey="deleteSimpleProduct8"/>
+            <deleteData  createDataKey="simpleProduct9" stepKey="deleteSimpleProduct9"/>
+            <deleteData  createDataKey="simpleProduct10" stepKey="deleteSimpleProduct10"/>
+            <deleteData  createDataKey="simpleProduct11" stepKey="deleteSimpleProduct11"/>
+            <deleteData  createDataKey="simpleProduct12" stepKey="deleteSimpleProduct12"/>
+            <deleteData  createDataKey="simpleProduct13" stepKey="deleteSimpleProduct13"/>
+            <deleteData  createDataKey="simpleProduct14" stepKey="deleteSimpleProduct14"/>
+            <deleteData  createDataKey="simpleProduct15" stepKey="deleteSimpleProduct15"/>
+            <deleteData  createDataKey="simpleProduct16" stepKey="deleteSimpleProduct16"/>
+            <deleteData  createDataKey="simpleProduct17" stepKey="deleteSimpleProduct17"/>
+            <deleteData  createDataKey="simpleProduct18" stepKey="deleteSimpleProduct18"/>
+            <deleteData  createDataKey="simpleProduct19" stepKey="deleteSimpleProduct19"/>
+            <deleteData  createDataKey="simpleProduct20" stepKey="deleteSimpleProduct20"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Select Catalog Configuration Page-->
+        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="getCatalogEditPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{CatalogSection.storefront}}" stepKey="clickOnStoreFront"/>
+        <scrollTo selector="{{CatalogSection.flatCatalogCategoryCheckBox}}" x="0" y="-80" stepKey="scrollToFlatCatalogCategory"/>
+        <uncheckOption selector="{{CatalogSection.flatCatalogCategoryCheckBox}}" stepKey="uncheckTheflatCategoryCheckBox"/>
+        <selectOption selector="{{CatalogSection.flatCatalogCategory}}"  userInput="Yes" stepKey="selectFlatCatalogCategory"/>
+        <selectOption selector="{{CatalogSection.flatCatalogProduct}}"  userInput="Yes" stepKey="selectFlatCatalogProduct"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
+        <click selector="{{CatalogSection.storefront}}" stepKey="clickOnStoreFront1"/>
+        <!--Save the updated catalog -->
+        <click selector="{{CatalogSection.save}}" stepKey="clickOnSaveButton"/>
+        <waitForPageLoad stepKey="waitForPageToSave"/>
+        <see selector="{{CatalogSection.successMessage}}" userInput="You saved the configuration." stepKey="seeSuccessSaveMessage"/>
+        <!-- Select Created Category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded2"/>
+        <!--Select Products in Category and save-->
+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
+        <scrollTo selector="{{CatalogProductsSection.resetFilter}}" stepKey="scrollToResetFilter"/>
+        <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
+        <!--Go to the Store Front-->
+        <amOnPage url="{{_defaultCategory.name}}.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
+        <!--Verify products in First Page -->
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage"/>
+        <!--Verify products Second Page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage"/>
+        <!--Verify products third  Page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage"/>
+        <!--Verify products, use Previous Page selector-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad5"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage1"/>
+        <!--Verify Products, use Previous Page selector-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage1"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad6"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage1"/>
+        <!--Select Pages by using page Number and verify products-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage2"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad7"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage2"/>
+        <!--Select Third Page using page number-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage3"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('3')}}" stepKey="clickOnThirdPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad8"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage2"/>
+        <!--Select First Page using page number-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage4"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad9"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsFirstPage2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
index c48f33ba06b3b..e999dbc42a6af 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection.xml
@@ -17,5 +17,9 @@
         <element name="catalogPriceScopeValue" type="select" selector="//select[@id='catalog_price_scope']/option[text()='{{args}}']" parameterized="true"/>
         <element name="defaultProductPrice" type="input" selector="#catalog_price_default_product_price"/>
         <element name="save" type="button" selector="#save"/>
+        <element name="flatCatalogCategoryCheckBox" type="checkbox" selector="#catalog_frontend_flat_catalog_category_inherit"/>
+        <element name="flatCatalogCategory" type="select" selector="#catalog_frontend_flat_catalog_category"/>
+        <element name="flatCatalogProduct" type="select" selector="#catalog_frontend_flat_catalog_product"/>
+        <element name="successMessage" type="text" selector="#messages"/>
     </section>
 </sections>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.php
similarity index 98%
rename from dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.php
rename to dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.php
index cb5ad93ee429b..8f11f31a6dff7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.php
@@ -26,7 +26,7 @@
  *
  * @ZephyrId MAGETWO-67570
  */
-class CreateFlatCatalogProduct extends Injectable
+class CreateFlatCatalogProductTest extends Injectable
 {
     /* tags */
     const MVP = 'yes';
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml
similarity index 89%
rename from dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.xml
rename to dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml
index 17d362f35ec57..e38bd8a31932d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml
@@ -6,7 +6,7 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
-    <testCase name="Magento\Catalog\Test\TestCase\Product\CreateFlatCatalogProduct" summary="Create flat catalog Product" ticketId="MAGETWO-67570">
+    <testCase name="Magento\Catalog\Test\TestCase\Product\CreateFlatCatalogProductTest" summary="Create flat catalog Product" ticketId="MAGETWO-67570">
         <variation name="CheckPaginationInStorefront"  ticketId="MAGETWO-67570">
             <data name="configData" xsi:type="string">category_flat,product_flat</data>
             <data name="productsCount" xsi:type="number">19</data>

From 89c5bfea5bbdb8dfa5fe84ed580e10bc3f4ad728 Mon Sep 17 00:00:00 2001
From: vprohorov <prohorov.vital@gmail.com>
Date: Fri, 21 Dec 2018 04:31:17 +0300
Subject: [PATCH 505/932] MAGETWO-96412: [2.3.x] Not possible to drag specified
 Related/Upsell/Cross-sell products to new positions in Windows 10 machine

- Fixed js
---
 .../Ui/view/base/web/js/dynamic-rows/dnd.js   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
index 51a748cbb9414..583e97b7e9449 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dnd.js
@@ -120,13 +120,13 @@ define([
          * @param {Object} event - key down event
          */
         mousedownHandler: function (data, elem, event) {
-            this.disableScroll();
             var recordNode = this.getRecordNode(elem),
                 originRecord = $(elem).parents('tr').eq(0),
                 drEl = this.draggableElement,
                 $table = $(elem).parents('table').eq(0),
                 $tableWrapper = $table.parent();
 
+            this.disableScroll();
             $(recordNode).addClass(this.draggableElementClass);
             $(originRecord).addClass(this.draggableElementClass);
             this.step = this.step === 'auto' ? originRecord.height() / 2 : this.step;
@@ -178,12 +178,12 @@ define([
          * Mouse up handler
          */
         mouseupHandler: function (event) {
-            this.enableScroll();
             var depElementCtx,
                 drEl = this.draggableElement,
                 pageY = this.getPageY(event),
                 positionY = pageY - drEl.eventMousedownY;
 
+            this.enableScroll();
             drEl.depElement = this.getDepElement(drEl.instance, positionY, this.draggableElement.originRow);
 
             drEl.instance.remove();
@@ -385,14 +385,16 @@ define([
 
             return this.recordsCache()[index];
         },
+
         /**
          * Get correct page Y
          *
          * @param {Object} event - current event
          * @returns {integer}
          */
-        getPageY: function(event) {
-            let pageY;
+        getPageY: function (event) {
+            var pageY;
+
             if (event.type.indexOf('touch') >= 0) {
                 if (event.originalEvent.touches[0]) {
                     pageY = event.originalEvent.touches[0].pageY;
@@ -402,6 +404,7 @@ define([
             } else {
                 pageY = event.pageY;
             }
+
             return pageY;
         },
 
@@ -409,14 +412,18 @@ define([
          * Disable page scrolling
          */
         disableScroll: function () {
-            document.body.addEventListener('touchmove', this.preventDefault, { passive: false });
+            document.body.addEventListener('touchmove', this.preventDefault, {
+                passive: false
+            });
         },
 
         /**
          * Enable page scrolling
          */
         enableScroll: function () {
-            document.body.removeEventListener('touchmove', this.preventDefault, { passive: false });
+            document.body.removeEventListener('touchmove', this.preventDefault, {
+                passive: false
+            });
         },
 
         /**

From cb005564594a540c85addf6d4aa3701994376a96 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Tue, 8 Jan 2019 12:39:32 +0200
Subject: [PATCH 506/932] MAGETWO-96440: Import - Amount is not specified

---
 .../Magento/CatalogImportExport/Model/Export/Product.php    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 345d323e6e129..c047e9c9bef21 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -1158,7 +1158,7 @@ protected function collectMultiselectValues($item, $attrCode, $storeId)
     }
 
     /**
-     * Check attribute is valid
+     * Check attribute is valid.
      *
      * @param string $code
      * @param mixed $value
@@ -1175,6 +1175,10 @@ protected function isValidAttributeValue($code, $value)
             $isValid = false;
         }
 
+        if (is_array($value)) {
+            $isValid = false;
+        }
+
         return $isValid;
     }
 

From d62149824075b462e1d0d1506fa6e83beaaa1653 Mon Sep 17 00:00:00 2001
From: Govind Sharma <govindpokhrelsharma@cedcoss.com>
Date: Tue, 8 Jan 2019 15:59:03 +0530
Subject: [PATCH 507/932] Fixed issue #20113

Updated css file
---
 app/design/adminhtml/Magento/backend/web/css/styles-old.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 26381367c72f5..6324625a56846 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -2739,6 +2739,7 @@
 
     #widget_instace_tabs_properties_section_content .widget-option-label {
         margin-top: 6px;
+        display: inline-block;
     }
 
     //

From 82e51caf89389c9ffbfb1d85b33421a65b491012 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 8 Jan 2019 12:57:30 +0200
Subject: [PATCH 508/932] Fix static test.

---
 .../Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
index 6fcce20eb3152..07c9c2eaa2491 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Catalog\Model\Layer\Filter\Item;
+
 /**
  * Item Data Builder
  */
-namespace Magento\Catalog\Model\Layer\Filter\Item;
-
 class DataBuilder
 {
     /**

From 3462108f4e509b562d4687e52fa62666d16c4c11 Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Tue, 8 Jan 2019 13:05:31 +0200
Subject: [PATCH 509/932] MAGETWO-61006: [FT]
 Magento\Ui\Test\TestCase\GridSortingTest fails randomly on CI

---
 .../tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml   | 1 -
 .../tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php      | 2 +-
 .../tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php      | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
index 6ae9d19a898bc..28894ed6cc158 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/GridSortingTest.xml
@@ -9,7 +9,6 @@
     <testCase name="Magento\Ui\Test\TestCase\GridSortingTest" summary="Grid UI Component Sorting" ticketId="MAGETWO-41328">
         <variation name="SalesOrderGridSorting">
             <data name="tag" xsi:type="string">severity:S2</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="description" xsi:type="string">Verify sales order grid storting</data>
             <data name="steps" xsi:type="array">
                 <item name="0" xsi:type="string">-</item>
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
index 235b0d096533f..03476add669be 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
@@ -181,7 +181,7 @@ public function resetFilter()
      *
      * @return void
      */
-    protected function waitFilterToLoad()
+    public function waitFilterToLoad()
     {
         $this->getTemplateBlock()->waitLoader();
         $browser = $this->_rootElement;
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
index af4ccfdac9d30..0574fc8dc55fc 100644
--- a/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
+++ b/dev/tests/functional/tests/app/Magento/Ui/Test/TestCase/GridSortingTest.php
@@ -89,6 +89,7 @@ public function test(
         $page->open();
         /** @var DataGrid $gridBlock */
         $gridBlock = $page->$gridRetriever();
+        $gridBlock->waitFilterToLoad();
         $gridBlock->resetFilter();
 
         $sortingResults = [];

From eecb01fa884a9cd23883a4f243ebf61bd8e97a51 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Tue, 8 Jan 2019 12:16:17 +0100
Subject: [PATCH 510/932] Fix static tests

---
 .../Magento/WebapiAsync/Plugin/Cache/Webapi.php  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php b/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php
index 3d6492a8be347..ecc929b204843 100644
--- a/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php
+++ b/app/code/Magento/WebapiAsync/Plugin/Cache/Webapi.php
@@ -51,6 +51,7 @@ public function __construct(
      * @param \Magento\Webapi\Model\Cache\Type\Webapi $subject
      * @param string $identifier
      * @return null|string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeLoad(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $identifier)
     {
@@ -65,14 +66,20 @@ public function beforeLoad(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $id
      * Change identifier in case if Async request before cache save
      *
      * @param \Magento\Webapi\Model\Cache\Type\Webapi $subject
-     * @param $data
+     * @param string $data
      * @param string $identifier
      * @param array $tags
-     * @param null $lifeTime
+     * @param int|bool|null $lifeTime
      * @return array|null
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSave(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $data, $identifier, array $tags = [], $lifeTime = null)
-    {
+    public function beforeSave(
+        \Magento\Webapi\Model\Cache\Type\Webapi $subject,
+        $data,
+        $identifier,
+        array $tags = [],
+        $lifeTime = null
+    ) {
         if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)
             && $identifier === \Magento\Webapi\Model\ServiceMetadata::ROUTES_CONFIG_CACHE_ID) {
             return [$data, self::ASYNC_ROUTES_CONFIG_CACHE_ID, $tags, $lifeTime];
@@ -86,6 +93,7 @@ public function beforeSave(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $da
      * @param \Magento\Webapi\Model\Cache\Type\Webapi $subject
      * @param string $identifier
      * @return null|string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeRemove(\Magento\Webapi\Model\Cache\Type\Webapi $subject, $identifier)
     {

From ad2d04b009f93ca7c700dadefb002f70ac471ce4 Mon Sep 17 00:00:00 2001
From: Dmitriy Kogut <kogut.dmitriy@gmail.com>
Date: Tue, 8 Jan 2019 13:17:46 +0200
Subject: [PATCH 511/932] MAGETWO-97026: Check Url Rewrites Correctly Generated
 for Multiple Storeviews During Product Import

---
 .../AdminNewStoreViewActionsSection.xml       |  2 +-
 ...tipleStoreviewsDuringProductImportTest.xml | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
index 1f9832a5d6e9a..0e3a74fccf9f0 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreViewActionsSection.xml
@@ -11,6 +11,6 @@
         <element name="delete" type="button" selector="#delete" timeout="30"/>
         <element name="resetButton" type="button" selector="#reset" timeout="30"/>
         <element name="saveButton" type="button" selector="#save" timeout="60"/>
-        <element name="loadingMask" type="text" selector=".loading-mask" timeout="60"/>
+        <element name="loadingMask" type="text" selector=".loading-mask"/>
     </section>
 </sections>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
index ccfadcf862c01..2c2dd48caeaa9 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest.xml
@@ -10,12 +10,12 @@
     <test name="AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest">
         <annotations>
             <features value="Url Rewrite"/>
-            <stories value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import"/>
+            <stories value="Url Rewrites for Multiple Storeviews"/>
             <title value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import"/>
             <description value="Check Url Rewrites Correctly Generated for Multiple Storeviews During Product Import."/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-68980"/>
-            <group value="urlRewrite123"/>
+            <group value="urlRewrite"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -24,7 +24,7 @@
                 <argument name="customStore" value="customStoreENNotUnique"/>
             </actionGroup>
             <!-- Create Store View NL -->
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewFr">
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewNl">
                 <argument name="customStore" value="customStoreNLNotUnique"/>
             </actionGroup>
             <createData entity="ApiCategory" stepKey="createCategory">
@@ -38,7 +38,13 @@
                 <argument name="name" value="productformagetwo68980"/>
             </actionGroup>
             <actionGroup ref="clearFiltersAdminDataGrid" stepKey="clearFiltersIfSet"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="customStore" value="customStoreENNotUnique"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewNl">
+                <argument name="customStore" value="customStoreNLNotUnique"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <actionGroup ref="switchCategoryStoreView" stepKey="switchToStoreViewEn">
             <argument name="Store" value="customStoreENNotUnique.name"/>
@@ -93,17 +99,17 @@
         <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn2"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn2"/>
 
-        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreViewdfdf"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView1"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton3"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn3"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue('catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn3"/>
 
-        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english/productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreViewdfdefef"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-english/productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView2"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton4"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-english/productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn4"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn4"/>
 
-        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch/productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreViewdfefdefef"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="category-dutch/productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView3"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearchButton5"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.requestPathColumnValue('category-dutch/productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn5"/>
         <seeElement selector="{{AdminUrlRewriteIndexSection.targetPathColumnValue(catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn5"/>

From 37e06131eaf05e7866c41524a25633596216c1e6 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 8 Jan 2019 13:22:43 +0200
Subject: [PATCH 512/932] ENGCOM-3786: Static test fix.

---
 .../Config/Block/System/Config/Form.php       | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index e7e46919f86f6..2a29fa33feb74 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -161,18 +161,6 @@ public function __construct(
         ];
     }
 
-    /**
-     * @deprecated 100.1.2
-     * @return SettingChecker
-     */
-    private function getSettingChecker()
-    {
-        if ($this->settingChecker === null) {
-            $this->settingChecker = ObjectManager::getInstance()->get(SettingChecker::class);
-        }
-        return $this->settingChecker;
-    }
-
     /**
      * Initialize objects required to render config form
      *
@@ -543,7 +531,7 @@ public function getConfigValue($path)
     }
 
     /**
-     * @return \Magento\Backend\Block\Widget\Form|\Magento\Framework\View\Element\AbstractBlock
+     * @inheritdoc
      */
     protected function _beforeToHtml()
     {
@@ -720,6 +708,7 @@ protected function _getAdditionalElementTypes()
      *
      * @TODO delete this methods when {^see above^} is done
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getSectionCode()
     {
@@ -731,6 +720,7 @@ public function getSectionCode()
      *
      * @TODO delete this methods when {^see above^} is done
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getWebsiteCode()
     {
@@ -742,6 +732,7 @@ public function getWebsiteCode()
      *
      * @TODO delete this methods when {^see above^} is done
      * @return string
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getStoreCode()
     {
@@ -801,7 +792,7 @@ private function getAppConfig()
 
     /**
      * Check Path is Readonly
-     * 
+     *
      * @param \Magento\Config\Model\Config\Structure\Element\Field $field
      * @param string $path
      * @return boolean
@@ -809,7 +800,8 @@ private function getAppConfig()
     private function isReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
     {
         $isReadOnly = $this->settingChecker->isReadOnly(
-            $path, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+            $path,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
         );
         if (!$isReadOnly) {
             $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())

From 18a448455e360742770ff018865d4eaba904a2ae Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Tue, 8 Jan 2019 14:13:23 +0200
Subject: [PATCH 513/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Model/Import/Product.php                  | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 9298939791e4b..92971c1818215 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -8,11 +8,11 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Config as CatalogConfig;
 use Magento\Catalog\Model\Product\Visibility;
-use Magento\CatalogImportExport\Model\Import\Product\MediaGalleryProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
+use Magento\CatalogImportExport\Model\Import\Product\MediaGalleryProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
-use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogImportExport\Model\StockItemImporterInterface;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
@@ -1658,7 +1658,7 @@ protected function _saveProducts()
                 if (!empty($rowData[self::URL_KEY])) {
                     // If url_key column and its value were in the CSV file
                     $rowData[self::URL_KEY] = $urlKey;
-                } else if ($this->isNeedToChangeUrlKey($rowData)) {
+                } elseif ($this->isNeedToChangeUrlKey($rowData)) {
                     // If url_key column was empty or even not declared in the CSV file but by the rules it is need to
                     // be setteed. In case when url_key is generating from name column we have to ensure that the bunch
                     // of products will pass for the event with url_key column.
@@ -1670,7 +1670,9 @@ protected function _saveProducts()
                 if (null === $rowSku) {
                     $this->getErrorAggregator()->addRowToSkip($rowNum);
                     continue;
-                } elseif (self::SCOPE_STORE == $rowScope) {
+                }
+
+                if (self::SCOPE_STORE == $rowScope) {
                     // set necessary data from SCOPE_DEFAULT row
                     $rowData[self::COL_TYPE] = $this->skuProcessor->getNewSku($rowSku)['type_id'];
                     $rowData['attribute_set_id'] = $this->skuProcessor->getNewSku($rowSku)['attr_set_id'];
@@ -2495,12 +2497,25 @@ public function validateRow(array $rowData, $rowNum)
             }
         } else {
             // validate new product type and attribute set
-            if (!isset($rowData[self::COL_TYPE]) || !isset($this->_productTypeModels[$rowData[self::COL_TYPE]])) {
-                $this->addRowError(ValidatorInterface::ERROR_INVALID_TYPE, $rowNum);
-            } elseif (!isset($rowData[self::COL_ATTR_SET])
-                || !isset($this->_attrSetNameToId[$rowData[self::COL_ATTR_SET]])
+            if (!isset($rowData[self::COL_TYPE], $this->_productTypeModels[$rowData[self::COL_TYPE]])) {
+                $this->addRowError(
+                    ValidatorInterface::ERROR_INVALID_TYPE,
+                    $rowNum,
+                    null,
+                    null,
+                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL
+                );
+                $this->getErrorAggregator()->addRowToSkip($rowNum);
+            } elseif (!isset($rowData[self::COL_ATTR_SET], $this->_attrSetNameToId[$rowData[self::COL_ATTR_SET]])
             ) {
-                $this->addRowError(ValidatorInterface::ERROR_INVALID_ATTR_SET, $rowNum);
+                $this->addRowError(
+                    ValidatorInterface::ERROR_INVALID_ATTR_SET,
+                    $rowNum,
+                    null,
+                    null,
+                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL
+                );
+                $this->getErrorAggregator()->addRowToSkip($rowNum);
             } elseif ($this->skuProcessor->getNewSku($sku) === null) {
                 $this->skuProcessor->addNewSku(
                     $sku,

From 9aa1aebc0647c85670b58bca7ca8191938016c9c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 8 Jan 2019 14:57:08 +0200
Subject: [PATCH 514/932] ENGCOM-3797: Static test fix.

---
 app/code/Magento/Eav/Model/Entity/Attribute.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 998a2d208c4e7..06a4abb985802 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Eav\Model\Entity;
 
 use Magento\Framework\Api\AttributeValueFactory;
@@ -322,7 +321,7 @@ public function afterSave()
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      * @since 100.0.7
      */
     public function afterDelete()

From d4d34ff830c6d65f8803536f950e3edd51ed36bf Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Tue, 8 Jan 2019 15:31:07 +0200
Subject: [PATCH 515/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Model/Import/Product.php                  | 77 ++++++++++---------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 92971c1818215..f409375d77fd7 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogImportExport\Model\Import;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -307,7 +308,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE => 'Imported resource (image) could not be downloaded from external resource due to timeout or access permissions',
         ValidatorInterface::ERROR_INVALID_WEIGHT => 'Product weight is invalid',
         ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Url key: \'%s\' was already generated for an item with the SKU: \'%s\'. You need to specify the unique URL key manually',
-        ValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES => "Value for multiselect attribute %s contains duplicated values",
+        ValidatorInterface::ERROR_DUPLICATE_MULTISELECT_VALUES => 'Value for multiselect attribute %s contains duplicated values',
         ValidatorInterface::ERROR_NEW_TO_DATE => 'Make sure new_to_date is later than or the same as new_from_date',
     ];
     //@codingStandardsIgnoreEnd
@@ -913,7 +914,7 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData, $
     {
         if (!$this->validator->isAttributeValid($attrCode, $attrParams, $rowData)) {
             foreach ($this->validator->getMessages() as $message) {
-                $this->addRowError($message, $rowNum, $attrCode);
+                $this->skipRow($rowNum, $message, null, $attrCode);
             }
             return false;
         }
@@ -1808,13 +1809,7 @@ protected function _saveProducts()
                                 $uploadedImages[$columnImage] = $uploadedFile;
                             } else {
                                 unset($rowData[$column]);
-                                $this->addRowError(
-                                    ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
-                                    $rowNum,
-                                    null,
-                                    null,
-                                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL
-                                );
+                                $this->skipRow($rowNum, ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE);
                             }
                         } else {
                             $uploadedFile = $uploadedImages[$columnImage];
@@ -2453,13 +2448,13 @@ public function validateRow(array $rowData, $rowNum)
         // BEHAVIOR_DELETE and BEHAVIOR_REPLACE use specific validation logic
         if (Import::BEHAVIOR_REPLACE == $this->getBehavior()) {
             if (self::SCOPE_DEFAULT == $rowScope && !$this->isSkuExist($sku)) {
-                $this->addRowError(ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE, $rowNum);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE);
                 return false;
             }
         }
         if (Import::BEHAVIOR_DELETE == $this->getBehavior()) {
             if (self::SCOPE_DEFAULT == $rowScope && !$this->isSkuExist($sku)) {
-                $this->addRowError(ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE, $rowNum);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_NOT_FOUND_FOR_DELETE);
                 return false;
             }
             return true;
@@ -2467,18 +2462,18 @@ public function validateRow(array $rowData, $rowNum)
 
         if (!$this->validator->isValid($rowData)) {
             foreach ($this->validator->getMessages() as $message) {
-                $this->addRowError($message, $rowNum, $this->validator->getInvalidAttribute());
+                $this->skipRow($rowNum, $message, null, $this->validator->getInvalidAttribute());
             }
         }
 
         if (null === $sku) {
-            $this->addRowError(ValidatorInterface::ERROR_SKU_IS_EMPTY, $rowNum);
+            $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_IS_EMPTY);
         } elseif (false === $sku) {
-            $this->addRowError(ValidatorInterface::ERROR_ROW_IS_ORPHAN, $rowNum);
+            $this->skipRow($rowNum, ValidatorInterface::ERROR_ROW_IS_ORPHAN);
         } elseif (self::SCOPE_STORE == $rowScope
             && !$this->storeResolver->getStoreCodeToId($rowData[self::COL_STORE])
         ) {
-            $this->addRowError(ValidatorInterface::ERROR_INVALID_STORE, $rowNum);
+            $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_STORE);
         }
 
         // SKU is specified, row is SCOPE_DEFAULT, new product block begins
@@ -2493,29 +2488,15 @@ public function validateRow(array $rowData, $rowNum)
                     $this->prepareNewSkuData($sku)
                 );
             } else {
-                $this->addRowError(ValidatorInterface::ERROR_TYPE_UNSUPPORTED, $rowNum);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_TYPE_UNSUPPORTED);
             }
         } else {
             // validate new product type and attribute set
             if (!isset($rowData[self::COL_TYPE], $this->_productTypeModels[$rowData[self::COL_TYPE]])) {
-                $this->addRowError(
-                    ValidatorInterface::ERROR_INVALID_TYPE,
-                    $rowNum,
-                    null,
-                    null,
-                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL
-                );
-                $this->getErrorAggregator()->addRowToSkip($rowNum);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_TYPE);
             } elseif (!isset($rowData[self::COL_ATTR_SET], $this->_attrSetNameToId[$rowData[self::COL_ATTR_SET]])
             ) {
-                $this->addRowError(
-                    ValidatorInterface::ERROR_INVALID_ATTR_SET,
-                    $rowNum,
-                    null,
-                    null,
-                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL
-                );
-                $this->getErrorAggregator()->addRowToSkip($rowNum);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_ATTR_SET);
             } elseif ($this->skuProcessor->getNewSku($sku) === null) {
                 $this->skuProcessor->addNewSku(
                     $sku,
@@ -2571,8 +2552,11 @@ public function validateRow(array $rowData, $rowNum)
                         ValidatorInterface::ERROR_DUPLICATE_URL_KEY,
                         $rowNum,
                         $rowData[self::COL_NAME],
-                        $message
-                    );
+                        $message,
+                        ProcessingError::ERROR_LEVEL_NOT_CRITICAL
+                    )
+                        ->getErrorAggregator()
+                        ->addRowToSkip($rowNum);
                 }
             }
         }
@@ -2603,8 +2587,8 @@ private function isNeedToValidateUrlKey($rowData)
     {
         return (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME]))
             && (empty($rowData[self::COL_VISIBILITY])
-            || $rowData[self::COL_VISIBILITY]
-            !== (string)Visibility::getOptionArray()[Visibility::VISIBILITY_NOT_VISIBLE]);
+                || $rowData[self::COL_VISIBILITY]
+                !== (string)Visibility::getOptionArray()[Visibility::VISIBILITY_NOT_VISIBLE]);
     }
 
     /**
@@ -3112,4 +3096,25 @@ private function retrieveProductBySku($sku)
         }
         return $product;
     }
+
+    /**
+     * Add row as skipped
+     *
+     * @param @param int $rowNumber
+     * @param string $errorCode Error code or simply column name
+     * @param string $errorLevel
+     * @param string $colName OPTIONAL Column name.
+     * @return $this
+     */
+    private function skipRow(
+        $rowNum,
+        string $errorCode,
+        $errorLevel = ProcessingError::ERROR_LEVEL_NOT_CRITICAL,
+        $colName = null
+    ): self {
+        $this->addRowError($errorCode, $rowNum, $colName, null, $errorLevel)
+            ->getErrorAggregator()
+            ->addRowToSkip($rowNum);
+        return $this;
+    }
 }

From 3b22449a98f9bdb2986093882d4252bd7cd9db48 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 8 Jan 2019 15:44:38 +0200
Subject: [PATCH 516/932] Add integration tests for frontend product and
 identities extender plugins.

---
 .../Model/Plugin/Frontend/ProductTest.php     | 71 ++++++++++++++++++
 .../ProductIdentitiesExtenderTest.php         | 73 +++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/Model/Plugin/Frontend/ProductTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Plugin/Frontend/ProductTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Plugin/Frontend/ProductTest.php
new file mode 100644
index 0000000000000..91dcd5f3e8d5b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Plugin/Frontend/ProductTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\Plugin\Frontend;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Interception\PluginList;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test bundle fronted product plugin adds children products ids to bundle product identities.
+ */
+class ProductTest extends TestCase
+{
+    /**
+     * Check, product plugin is registered for storefront.
+     *
+     * @magentoAppArea frontend
+     * @return void
+     */
+    public function testProductIsRegistered(): void
+    {
+        $pluginInfo = Bootstrap::getObjectManager()->get(PluginList::class)
+            ->get(\Magento\Catalog\Model\Product::class, []);
+        $this->assertSame(Product::class, $pluginInfo['bundle']['instance']);
+    }
+
+    /**
+     * Check plugin will add children ids to bundle product identities on storefront.
+     *
+     * @magentoDataFixture Magento/Bundle/_files/product.php
+     * @magentoAppArea frontend
+     * @return void
+     */
+    public function testGetIdentitiesForBundleProductOnStorefront(): void
+    {
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $bundleProduct = $productRepository->get('bundle-product');
+        $simpleProduct = $productRepository->get('simple');
+        $expectedIdentities = [
+            'cat_p_' . $bundleProduct->getId(),
+            'cat_p',
+            'cat_p_' . $simpleProduct->getId(),
+
+        ];
+        $this->assertEquals($expectedIdentities, $bundleProduct->getIdentities());
+    }
+
+    /**
+     * Check plugin won't add children ids to bundle product identities in admin area.
+     *
+     * @magentoDataFixture Magento/Bundle/_files/product.php
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testGetIdentitiesForBundleProductInAdminArea(): void
+    {
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $bundleProduct = $productRepository->get('bundle-product');
+        $expectedIdentities = [
+            'cat_p_' . $bundleProduct->getId(),
+        ];
+        $this->assertEquals($expectedIdentities, $bundleProduct->getIdentities());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
new file mode 100644
index 0000000000000..1fffd701c509f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Plugin/Frontend/ProductIdentitiesExtenderTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Plugin\Frontend;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Interception\PluginList;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test configurable fronted product plugin will add children products ids to configurable product identities.
+ */
+class ProductIdentitiesExtenderTest extends TestCase
+{
+    /**
+     * Check, product identities extender plugin is registered for storefront.
+     *
+     * @magentoAppArea frontend
+     * @return void
+     */
+    public function testIdentitiesExtenderIsRegistered(): void
+    {
+        $pluginInfo = Bootstrap::getObjectManager()->get(PluginList::class)
+            ->get(\Magento\Catalog\Model\Product::class, []);
+        $this->assertSame(ProductIdentitiesExtender::class, $pluginInfo['product_identities_extender']['instance']);
+    }
+
+    /**
+     * Check plugin will add children ids to configurable product identities on storefront.
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoAppArea frontend
+     * @return void
+     */
+    public function testGetIdentitiesForConfigurableProductOnStorefront(): void
+    {
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $configurableProduct = $productRepository->get('configurable');
+        $simpleProduct1 = $productRepository->get('simple_10');
+        $simpleProduct2 = $productRepository->get('simple_20');
+        $expectedIdentities = [
+            'cat_p_' . $configurableProduct->getId(),
+            'cat_p',
+            'cat_p_' . $simpleProduct1->getId(),
+            'cat_p_' . $simpleProduct2->getId(),
+
+        ];
+        $this->assertEquals($expectedIdentities, $configurableProduct->getIdentities());
+    }
+
+    /**
+     * Check plugin won't add children ids to configurable product identities in admin area.
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoAppArea adminhtml
+     * @return void
+     */
+    public function testGetIdentitiesForConfigurableProductInAdminArea(): void
+    {
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $configurableProduct = $productRepository->get('configurable');
+        $expectedIdentities = [
+            'cat_p_' . $configurableProduct->getId(),
+        ];
+        $this->assertEquals($expectedIdentities, $configurableProduct->getIdentities());
+    }
+}

From 85607c85ee1a3a90e8c7a577167f2c1b22c8717d Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 8 Jan 2019 16:44:05 +0200
Subject: [PATCH 517/932] Typo corrected Acstract -> Abstract

---
 .../Catalog/view/adminhtml/web/js/form/element/input.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
index 2f6703cc92eac..4bbdea066b762 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/form/element/input.js
@@ -5,10 +5,10 @@
 define([
     'underscore',
     'Magento_Ui/js/form/element/abstract'
-], function (_, Acstract) {
+], function (_, Abstract) {
     'use strict';
 
-    return Acstract.extend({
+    return Abstract.extend({
         defaults: {
             prefixName: '',
             prefixElementName: '',

From 1f78b97464d650ae712480c2bb05358c6705d5fa Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <horytsky@adobe.com>
Date: Tue, 8 Jan 2019 17:46:22 +0200
Subject: [PATCH 518/932] MAGETWO-97495: [Magento Cloud] Price Filters include
 ranges that have no products

---
 .../Elasticsearch/SearchAdapter/Dynamic/DataProvider.php | 1 +
 .../Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
index cfdab2463311e..496a77e4c5ac3 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
@@ -212,6 +212,7 @@ public function getAggregation(
                 'histogram' => [
                     'field' => $fieldName,
                     'interval' => (float)$range,
+                    'min_doc_count' => 1,
                 ],
             ],
         ];
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
index 9c717ea240a5d..6258a4a20d694 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
@@ -321,8 +321,15 @@ public function testGetAggregation()
         $this->clientMock->expects($this->once())
             ->method('query')
             ->with($this->callback(function ($query) {
+                $histogramParams = $query['body']['aggregations']['prices']['histogram'];
                 // Assert the interval is queried as a float. See MAGETWO-95471
-                return $query['body']['aggregations']['prices']['histogram']['interval'] === 10.0;
+                if ($histogramParams['interval'] !== 10.0) {
+                    return false;
+                }
+                if (!isset($histogramParams['min_doc_count']) || $histogramParams['min_doc_count'] !== 1) {
+                    return false;
+                }
+                return true;
             }))
             ->willReturn([
                 'aggregations' => [

From 6130ea3b56a457e5507d4e3743293588d6b5f545 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Tue, 8 Jan 2019 09:28:45 -0600
Subject: [PATCH 519/932] MC-6282: [Backend]: Create Place Order Controller

---
 .../Controller/Express/AbstractExpress.php    |   4 +-
 .../Controller/Express/OnAuthorization.php    | 189 ++++++++++++++++++
 app/code/Magento/Paypal/Model/Config.php      |   2 -
 .../Magento/Paypal/Model/Express/Checkout.php |   5 +-
 .../Paypal/Model/ExpressConfigProvider.php    |   3 +-
 .../express-checkout-smart-buttons.js         |  58 +++++-
 .../in-context/checkout-express.js            |  31 ++-
 .../payment/paypal-express-in-context.html    |   2 +-
 8 files changed, 275 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Controller/Express/OnAuthorization.php

diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
index fa131f9591fa9..db337fc2749ba 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
@@ -135,9 +135,9 @@ public function __construct(
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function _initCheckout()
+    protected function _initCheckout(\Magento\Quote\Model\Quote $quoteObject = null)
     {
-        $quote = $this->_getQuote();
+        $quote = $quoteObject ? $quoteObject : $this->_getQuote();
         if (!$quote->hasItems() || $quote->getHasError()) {
             $this->getResponse()->setStatusHeader(403, '1.1', 'Forbidden');
             throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t initialize Express Checkout.'));
diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
new file mode 100644
index 0000000000000..f8f1f33e99838
--- /dev/null
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+
+namespace Magento\Paypal\Controller\Express;
+
+use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
+use Magento\Framework\Controller\ResultFactory;
+
+class OnAuthorization
+    extends \Magento\Paypal\Controller\Express\AbstractExpress
+    implements \Magento\Framework\App\Action\HttpPostActionInterface
+{
+    /**
+     * @var \Magento\Checkout\Api\AgreementsValidatorInterface
+     */
+    protected $agreementsValidator;
+
+    /**
+     * @var \Magento\Sales\Api\PaymentFailuresInterface
+     */
+    private $paymentFailures;
+
+    /**
+     * Config mode type
+     *
+     * @var string
+     */
+    protected $_configType = \Magento\Paypal\Model\Config::class;
+
+    /**
+     * Config method type
+     *
+     * @var string
+     */
+    protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
+
+    /**
+     * Checkout mode type
+     *
+     * @var string
+     */
+    protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
+
+    /**
+     * @var \Magento\Checkout\Api\PaymentInformationManagementInterface
+     */
+    private $paymentInformationService;
+
+    /**
+     * @var \Magento\Quote\Model\Quote\PaymentFactory
+     */
+    protected $cartRepository;
+
+    /**
+     * @var \Magento\Quote\Api\CartManagementInterface
+     */
+    private $quoteManagement;
+
+    /**
+     * Url Builder
+     *
+     * @var \Magento\Framework\UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Sales\Model\OrderFactory $orderFactory
+     * @param \Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory
+     * @param \Magento\Framework\Session\Generic $paypalSession
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
+     * @param \Magento\Customer\Model\Url $customerUrl
+     * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
+     * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Sales\Model\OrderFactory $orderFactory,
+        \Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory,
+        \Magento\Framework\Session\Generic $paypalSession,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
+        \Magento\Customer\Model\Url $customerUrl,
+        \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator,
+        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null,
+        \Magento\Checkout\Api\PaymentInformationManagementInterface $paymentInformationService,
+        \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
+        \Magento\Quote\Api\CartManagementInterface $quoteManagement,
+        \Magento\Framework\UrlInterface $urlBuilder
+    ) {
+        parent::__construct(
+            $context,
+            $customerSession,
+            $checkoutSession,
+            $orderFactory,
+            $checkoutFactory,
+            $paypalSession,
+            $urlHelper,
+            $customerUrl
+        );
+
+        $this->agreementsValidator = $agreementValidator;
+        $this->paymentFailures = $paymentFailures ? : $this->_objectManager->get(
+            \Magento\Sales\Api\PaymentFailuresInterface::class
+        );
+        $this->paymentInformationService = $paymentInformationService;
+        $this->cartRepository = $cartRepository;
+        $this->quoteManagement = $quoteManagement;
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute()
+    {
+        $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $params = $this->getRequest()->getParams();
+        $quoteId = $params['quoteId'];
+        $payerId = $params['payerId'];
+        $tokenId = $params['paymentToken'];
+        /** @var \Magento\Quote\Api\Data\CartInterface $quote */
+        //@todo add logic  or separate controller to load quote for quest
+        $quote = $this->cartRepository->get($quoteId);
+
+        $responseContent = [
+            'success' => true,
+            'error_message' => '',
+        ];
+
+        try {
+            //populate checkout object with new data
+            $this->_initCheckout($quote);
+            $this->_checkout->returnFromPaypal($tokenId, $payerId);
+            if ($this->_checkout->canSkipOrderReviewStep()) {
+                //$this->_checkout->place($tokenId);
+                /**  Populate quote  with information about billing and shipping addresses*/
+                $this->_checkout->returnFromPaypal($tokenId);
+                /** we are using quoteManagement::submit here to prevent billing address/shipping validation if we return from PayPal  */
+                $order = $this->quoteManagement->submit($quote);
+                // prepare session to success or cancellation page
+                $this->_getCheckoutSession()->clearHelperData();
+
+                // "last successful quote"
+                $this->_getCheckoutSession()->setLastQuoteId($quoteId)->setLastSuccessQuoteId($quoteId);
+
+                if ($order) {
+                    $this->_getCheckoutSession()->setLastOrderId($order->getId())
+                        ->setLastRealOrderId($order->getIncrementId())
+                        ->setLastOrderStatus($order->getStatus());
+                }
+
+                $this->_eventManager->dispatch(
+                    'paypal_express_place_order_success',
+                    [
+                        'order' => $order,
+                        'quote' => $quote
+                    ]
+                );
+                $responseContent['redirectUrl'] = $this->urlBuilder->getUrl('checkout/onepage/success/');
+
+            } else {
+                $responseContent['redirectUrl'] = $this->urlBuilder->getUrl('paypal/express/review');
+                $this->_checkoutSession->setQuoteId($quoteId);
+
+            }
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            $responseContent['success'] = false;
+            $responseContent['error_message'] = $e->getMessage();
+
+        } catch (\Exception $e) {
+            $responseContent['success'] = false;
+            $responseContent['error_message'] = 'We can\'t process Express Checkout approval.';
+        }
+
+        return $controllerResult->setData($responseContent);
+
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 41ce152b65bce..b058ba129a33f 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -654,8 +654,6 @@ public function isMethodAvailable($methodCode = null)
                 }
                 break;
             case self::METHOD_WPP_BML:
-                //add logic with disallowed funding
-
             case self::METHOD_WPS_BML:
                 // check for express payments dependence
                 if (!$this->isMethodActive(self::METHOD_WPP_EXPRESS)
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 88e5ccc40f24b..a84e4a457cead 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -617,7 +617,7 @@ public function canSkipOrderReviewStep()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function returnFromPaypal($token)
+    public function returnFromPaypal($token, $payerData = null)
     {
         $this->_getApi()
             ->setToken($token)
@@ -693,7 +693,8 @@ public function returnFromPaypal($token)
         $payment = $quote->getPayment();
         $payment->setMethod($this->_methodType);
         $this->_paypalInfo->importToPayment($this->_getApi(), $payment);
-        $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_PAYER_ID, $this->_getApi()->getPayerId())
+        $payerId = $payerData ? $payerData : $this->_getApi()->getPayerId();
+        $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_PAYER_ID, $payerId)
             ->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_TOKEN, $token);
         $quote->collectTotals();
         $this->quoteRepository->save($quote);
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 7d4d2e0b26c45..1f261703489c6 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -133,7 +133,8 @@ public function getConfig()
                     'allowedFunding' => [],
                     'disallowedFunding' => $this->getDisallowedFunding(),
                     'styles' => $this->getButtonStyles(),
-                    'startUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData')
+                    'startUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData'),
+                    'onAuthorizeUrl' => $this->urlBuilder->getUrl('paypal/express/onAuthorization')
                 ],
             ];
         }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index a4506cc19c36b..a7d0e7a9cbe0c 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -3,13 +3,13 @@
  * See COPYING.txt for license details.
  */
 define([
+    'jquery',
     'paypalInContextExpressCheckout',
     'Magento_Ui/js/model/messageList',
     'underscore',
     'domReady!'
-], function (paypal, messageList, _) {
+], function ($, paypal, messageList, _) {
     'use strict';
-
     /**
      * Returns array of allowed funding
      *
@@ -25,6 +25,24 @@ define([
     };
 
     return function (clientConfig, element) {
+
+        /** track chackbox status change*/
+        function onChangeValidateStatus(handler) {
+            _.each(jQuery('#' + clientConfig.rendererComponent.getAgreementId()).find('input'), function (element) {
+                element.addEventListener('change', handler);
+            }, this);
+        }
+
+        function isValid() {
+            //todo refactor this. add  of validators insead of hardcode
+            var count = jQuery('#' + clientConfig.rendererComponent.getAgreementId()).find('input').length;
+            return count >= 0 && jQuery('#' + clientConfig.rendererComponent.getAgreementId()).find('input:checkbox:checked').length == count;
+        }
+
+        function toggleButtons(actions) {
+            isValid() ? actions.enable() : actions.disable();
+        }
+
         paypal.Button.render({
 
             env: clientConfig.environment,
@@ -39,6 +57,21 @@ define([
             // Enable Pay Now checkout flow (optional)
             commit: true,
 
+            validate: function (actions) {
+                //@todo move outside. Load this logic as composite
+                //disable on the first page load
+                toggleButtons(actions);
+                onChangeValidateStatus(function () {
+                    toggleButtons(actions);
+                });
+            },
+
+            onClick: function() {
+                if(clientConfig.validator.validate()) {
+                    clientConfig.rendererComponent.continueToPayPal();
+                }
+            },
+
             // Set up a payment
             payment: function (data, actions) {
                 var params = {
@@ -46,14 +79,18 @@ define([
                     customer_id: clientConfig.customerId || "",
                     button: clientConfig.button,
                     form_key: clientConfig.formKey
-                }
+                };
+
                 return paypal.request.post(clientConfig.startUrl, params)
                     .then(function (res) {
                         //add logic to process negative cases
                         // 3. Return res.id from the response
                         return res.token;
 
-                });
+                    })
+                    .catch(function (err) {
+                        throw err;
+                    });
             },
             // Execute the payment
             onAuthorize: function (data, actions) {
@@ -74,10 +111,15 @@ define([
                     };
                 return paypal.request.post(clientConfig.onAuthorizeUrl, params)
                     .then(function (res) {
-                        //add logic to process negative cases
-                        // 3. Return res.id from the response
-                        return window.location.replace(clientConfig.successUrl);
-
+                        if(res.success) {
+                            //add logic to process negative cases
+                            // 3. Return res.id from the response
+                            return actions.redirect(window, res.redirectUrl);
+                        } else {
+                            messageList.addErrorMessage({
+                                message: res.error_message
+                            });
+                        }
                     });
 
             },
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index efecb541a3b17..2fe34b8f5351d 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -5,7 +5,6 @@
 define(
     [
         'underscore',
-        'jquery',
         'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract',
         'Magento_Paypal/js/action/set-payment-method',
         'Magento_Checkout/js/model/payment/additional-validators',
@@ -16,7 +15,6 @@ define(
     ],
     function (
         _,
-        $,
         Component,
         setPaymentMethodAction,
         additionalValidators,
@@ -48,6 +46,8 @@ define(
                 this.clientConfig.customerId = window.customerData.id;
                 this.clientConfig.button = 0;
                 this.clientConfig.merchantId = this.merchantId;
+                this.clientConfig.validator = additionalValidators;
+                this.clientConfig.rendererComponent = this;
                 checkoutSmartButtons(this.clientConfig, '#' + this.getButtonId());
             },
 
@@ -56,7 +56,32 @@ define(
              */
             getButtonId: function () {
                 return this.inContextId;
-            }
+            },
+
+            /**
+             * @returns {String}
+             */
+            getAgreementId: function () {
+                return this.inContextId + '-agreement';
+            },
+
+            /** Redirect to paypal */
+            continueToPayPal: function () {
+                //update payment method information if additional data was changed
+                if (additionalValidators.validate()) {
+                    this.selectPaymentMethod();
+                    setPaymentMethodAction(this.messageContainer).done(
+                        function () {
+                            customerData.invalidate(['cart']);
+                            return true;
+                        }
+                    );
+
+                    return false;
+                }
+            },
+
+
         });
     }
 );
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index 9726e5b8ffea5..b6f0886de1aab 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -25,7 +25,7 @@
         <!-- ko foreach: getRegion('messages') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
         <!--/ko-->
-        <div class="checkout-agreements-block">
+        <div class="checkout-agreements-block" data-bind="attr: {id: getAgreementId()}">
             <!-- ko foreach: $parent.getRegion('before-place-order') -->
                 <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->

From da1500bbcf13b1a21795179083688c9bebb31a7f Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Tue, 8 Jan 2019 10:05:09 -0600
Subject: [PATCH 520/932] MC-4378: Convert UpdateCategoryEntityTest to MFTF

- Revert unnecessary changes to composer.json
---
 dev/tests/functional/composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 25b5347e903b6..e49824d17df80 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -8,8 +8,7 @@
         "allure-framework/allure-phpunit": "~1.2.0",
         "doctrine/annotations": "1.4.*",
         "phpunit/phpunit": "~6.5.0",
-        "phpunit/phpunit-selenium": "~4.1.0",
-        "symfony/css-selector": "^4.1"
+        "phpunit/phpunit-selenium": "~4.1.0"
     },
     "suggest": {
         "netwing/selenium-server-standalone": "dev-master",

From 353dd754228d2e2ab633216105f75cd41f7b6ed7 Mon Sep 17 00:00:00 2001
From: Kieu Phan <kphan@adobe.com>
Date: Tue, 8 Jan 2019 10:50:58 -0600
Subject: [PATCH 521/932] MC-10836: Testing activities Enable MTF tests

---
 .../Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php | 2 +-
 .../Test/TestCase/ExpressCheckoutFromShoppingCartTest.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
index 445fa49bc124b..7da578397a759 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
@@ -30,7 +30,7 @@ class ExpressCheckoutFromProductPageTest extends Scenario
     /* tags */
     const MVP = 'yes';
     const TEST_TYPE = '3rd_party_test';
-    const TO_MAINTAIN = 'yes';
+//    const TO_MAINTAIN = 'yes';
     const SEVERITY = 'S0';
     /* end tags */
 
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
index 54b5a6cee9742..e44d6e65ec90f 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
@@ -30,7 +30,7 @@ class ExpressCheckoutFromShoppingCartTest extends Scenario
     /* tags */
     const MVP = 'yes';
     const TEST_TYPE = '3rd_party_test';
-    const TO_MAINTAIN = 'yes';
+//    const TO_MAINTAIN = 'yes';
     const SEVERITY = 'S0';
     /* end tags */
 

From 7f4dffdbd5b58a39ae043a9b47a5c75e19f6a552 Mon Sep 17 00:00:00 2001
From: rajneesh1dev <rajneeshgupta@cedcoss.com>
Date: Tue, 8 Jan 2019 22:50:26 +0530
Subject: [PATCH 522/932] Update uploader.php fix issue 20098

---
 .../Magento/CatalogImportExport/Model/Import/Uploader.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
index 7e6ada724a81a..3ac7f98818d70 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Uploader.php
@@ -180,9 +180,9 @@ public function move($fileName, $renameFileOff = false)
             }
 
             $fileName = preg_replace('/[^a-z0-9\._-]+/i', '', $fileName);
-            $filePath = $this->_directory->getRelativePath($filePath . $fileName);
+            $relativePath = $this->_directory->getRelativePath($filePath . $fileName);
             $this->_directory->writeFile(
-                $filePath,
+                $relativePath,
                 $read->readAll()
             );
         }

From b7a5e77e95230cefa4b58a95eb5da20112c01bba Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Tue, 8 Jan 2019 10:30:17 -0600
Subject: [PATCH 523/932] MC-6282: [Backend]: Create Place Order Controller

---
 .../Controller/Express/OnAuthorization.php    | 59 ++++++-------------
 .../express-checkout-smart-buttons.js         |  2 +-
 2 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index f8f1f33e99838..f0430c41fc182 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -8,23 +8,12 @@
 
 namespace Magento\Paypal\Controller\Express;
 
-use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 use Magento\Framework\Controller\ResultFactory;
 
 class OnAuthorization
     extends \Magento\Paypal\Controller\Express\AbstractExpress
     implements \Magento\Framework\App\Action\HttpPostActionInterface
 {
-    /**
-     * @var \Magento\Checkout\Api\AgreementsValidatorInterface
-     */
-    protected $agreementsValidator;
-
-    /**
-     * @var \Magento\Sales\Api\PaymentFailuresInterface
-     */
-    private $paymentFailures;
-
     /**
      * Config mode type
      *
@@ -46,21 +35,11 @@ class OnAuthorization
      */
     protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
 
-    /**
-     * @var \Magento\Checkout\Api\PaymentInformationManagementInterface
-     */
-    private $paymentInformationService;
-
     /**
      * @var \Magento\Quote\Model\Quote\PaymentFactory
      */
     protected $cartRepository;
 
-    /**
-     * @var \Magento\Quote\Api\CartManagementInterface
-     */
-    private $quoteManagement;
-
     /**
      * Url Builder
      *
@@ -68,6 +47,11 @@ class OnAuthorization
      */
     private $urlBuilder;
 
+    /**
+     * @var \Magento\Quote\Api\GuestCartRepositoryInterface
+     */
+    private $guestCartRepository;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
@@ -91,11 +75,9 @@ public function __construct(
         \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Customer\Model\Url $customerUrl,
         \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator,
-        \Magento\Sales\Api\PaymentFailuresInterface $paymentFailures = null,
-        \Magento\Checkout\Api\PaymentInformationManagementInterface $paymentInformationService,
         \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
-        \Magento\Quote\Api\CartManagementInterface $quoteManagement,
-        \Magento\Framework\UrlInterface $urlBuilder
+        \Magento\Framework\UrlInterface $urlBuilder,
+        \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
     ) {
         parent::__construct(
             $context,
@@ -107,15 +89,9 @@ public function __construct(
             $urlHelper,
             $customerUrl
         );
-
-        $this->agreementsValidator = $agreementValidator;
-        $this->paymentFailures = $paymentFailures ? : $this->_objectManager->get(
-            \Magento\Sales\Api\PaymentFailuresInterface::class
-        );
-        $this->paymentInformationService = $paymentInformationService;
         $this->cartRepository = $cartRepository;
-        $this->quoteManagement = $quoteManagement;
         $this->urlBuilder = $urlBuilder;
+        $this->guestCartRepository = $guestCartRepository;
     }
 
     /**
@@ -129,30 +105,30 @@ public function execute()
         $quoteId = $params['quoteId'];
         $payerId = $params['payerId'];
         $tokenId = $params['paymentToken'];
+        $customerId = $params['customerId'];
         /** @var \Magento\Quote\Api\Data\CartInterface $quote */
         //@todo add logic  or separate controller to load quote for quest
-        $quote = $this->cartRepository->get($quoteId);
+        try {
+
+        $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
 
         $responseContent = [
             'success' => true,
             'error_message' => '',
         ];
 
-        try {
             //populate checkout object with new data
             $this->_initCheckout($quote);
+            /**  Populate quote  with information about billing and shipping addresses*/
             $this->_checkout->returnFromPaypal($tokenId, $payerId);
             if ($this->_checkout->canSkipOrderReviewStep()) {
-                //$this->_checkout->place($tokenId);
-                /**  Populate quote  with information about billing and shipping addresses*/
-                $this->_checkout->returnFromPaypal($tokenId);
-                /** we are using quoteManagement::submit here to prevent billing address/shipping validation if we return from PayPal  */
-                $order = $this->quoteManagement->submit($quote);
+                $this->_checkout->place($tokenId);
+                $order = $this->_checkout->getOrder();
                 // prepare session to success or cancellation page
                 $this->_getCheckoutSession()->clearHelperData();
 
                 // "last successful quote"
-                $this->_getCheckoutSession()->setLastQuoteId($quoteId)->setLastSuccessQuoteId($quoteId);
+                $this->_getCheckoutSession()->setLastQuoteId($quote->getId())->setLastSuccessQuoteId($quote->getId());
 
                 if ($order) {
                     $this->_getCheckoutSession()->setLastOrderId($order->getId())
@@ -171,7 +147,7 @@ public function execute()
 
             } else {
                 $responseContent['redirectUrl'] = $this->urlBuilder->getUrl('paypal/express/review');
-                $this->_checkoutSession->setQuoteId($quoteId);
+                $this->_checkoutSession->setQuoteId($quote->getId());
 
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
@@ -184,6 +160,5 @@ public function execute()
         }
 
         return $controllerResult->setData($responseContent);
-
     }
 }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index a7d0e7a9cbe0c..dc07460069ed0 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -103,7 +103,7 @@ define([
                         payerId: data.payerID,
                         quoteId: clientConfig.quoteId,
                         method: clientConfig.payment.method,
-                        customerId: clientConfig.customerId,
+                        customerId: clientConfig.customerId || '',
                         form_key: clientConfig.formKey
                         // add email for guest customer
                         /*email:*/

From 1d9f854620485bb2ccdeaa6f52c7558b2e3bea32 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Tue, 8 Jan 2019 14:03:40 -0600
Subject: [PATCH 524/932] MC-4394: Convert CreateVirtualProductEntityTest to
 MFTF

---
 .../StorefrontQuickSearchResultsSection.xml   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml

diff --git a/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
new file mode 100644
index 0000000000000..9e04bbb12a796
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Section/StorefrontQuickSearchResultsSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontQuickSearchResultsSection">
+        <element name="searchTextBox" type="text" selector="#search"/>
+        <element name="searchTextBoxButton" type="button" selector="button[class='action search']"/>
+        <element name="productLink" type="select" selector="a[class='product-item-link']"/>
+        <element name="asLowAsLabel" type="text" selector=".minimal-price-link > span"/>
+        <element name="textArea" type="text" selector="li[class='item']"/>
+        <element name="regularPrice" type="text" selector="li[class='item']"/>
+    </section>
+</sections>

From ba75a254744be8b9ec8cb256db646bb1755ee922 Mon Sep 17 00:00:00 2001
From: Kieu Phan <kphan@adobe.com>
Date: Tue, 8 Jan 2019 15:28:44 -0600
Subject: [PATCH 525/932] MC-10836: Testing activities Revert MTF tests

---
 .../Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php | 2 +-
 .../Test/TestCase/ExpressCheckoutFromShoppingCartTest.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
index 7da578397a759..445fa49bc124b 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromProductPageTest.php
@@ -30,7 +30,7 @@ class ExpressCheckoutFromProductPageTest extends Scenario
     /* tags */
     const MVP = 'yes';
     const TEST_TYPE = '3rd_party_test';
-//    const TO_MAINTAIN = 'yes';
+    const TO_MAINTAIN = 'yes';
     const SEVERITY = 'S0';
     /* end tags */
 
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
index e44d6e65ec90f..54b5a6cee9742 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/ExpressCheckoutFromShoppingCartTest.php
@@ -30,7 +30,7 @@ class ExpressCheckoutFromShoppingCartTest extends Scenario
     /* tags */
     const MVP = 'yes';
     const TEST_TYPE = '3rd_party_test';
-//    const TO_MAINTAIN = 'yes';
+    const TO_MAINTAIN = 'yes';
     const SEVERITY = 'S0';
     /* end tags */
 

From 8eb17ec32bf35bdb92b9fabcc5439fb01ae65a16 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 8 Jan 2019 15:48:11 -0600
Subject: [PATCH 526/932] MC-6281: [Backend]: Create Controller to getToken
 from PayPal

- clean up getTokenData controller
---
 .../Controller/Express/GetTokenData.php       | 229 +++++++++---------
 .../express-checkout-smart-buttons.js         |  13 +-
 2 files changed, 124 insertions(+), 118 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
index 23e550dad31ec..02631d194c97b 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -4,24 +4,59 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Paypal\Controller\Express;
 
+use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Webapi\Exception;
 use Magento\Paypal\Model\Express\Checkout;
-use Magento\Framework\App\ObjectManager;
 
-class GetTokenData extends GetToken
+class GetTokenData extends AbstractExpress implements HttpGetActionInterface
 {
+    /**
+     * Config mode type
+     *
+     * @var string
+     */
+    protected $_configType = \Magento\Paypal\Model\Config::class;
+
+    /**
+     * Config method type
+     *
+     * @var string
+     */
+    protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
+
+    /**
+     * Checkout mode type
+     *
+     * @var string
+     */
+    protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
+
     /**
      * @var \Psr\Log\LoggerInterface
      */
     private $logger;
+
+    /**
+     * @var \Magento\Quote\Api\CartRepositoryInterface
+     */
     private $quoteRepository;
+
+    /**
+     * @var \Magento\Customer\Model\ResourceModel\CustomerRepository
+     */
     private $customerRepository;
+
+    /**
+     * @var \Magento\Quote\Model\QuoteIdMaskFactory
+     */
     private $quoteIdMaskFactory;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
@@ -31,7 +66,10 @@ class GetTokenData extends GetToken
      * @param \Magento\Framework\Session\Generic $paypalSession
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Customer\Model\Url $customerUrl
-     * @param \Psr\Log\LoggerInterface|null $logger
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
+     * @param \Magento\Customer\Model\ResourceModel\CustomerRepository $customerRepository
+     * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -42,15 +80,12 @@ public function __construct(
         \Magento\Framework\Session\Generic $paypalSession,
         \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Customer\Model\Url $customerUrl,
-        \Psr\Log\LoggerInterface $logger = null,
-        \Magento\Quote\Api\CartRepositoryInterface $quoteRepository = null,
-        \Magento\Customer\Model\ResourceModel\CustomerRepository $customerRepository = null,
-        \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory = null
-    ) {
-        $this->logger = $logger ?: ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
-        $this->quoteRepository = $quoteRepository ?: ObjectManager::getInstance()->get(\Magento\Quote\Api\CartRepositoryInterface::class);
-        $this->customerRepository = $customerRepository ?: ObjectManager::getInstance()->get(\Magento\Customer\Model\ResourceModel\CustomerRepository::class);
-        $this->quoteIdMaskFactory = $quoteIdMaskFactory ?: ObjectManager::getInstance()->get(\Magento\Quote\Model\QuoteIdMaskFactory::class);
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
+        \Magento\Customer\Model\ResourceModel\CustomerRepository $customerRepository,
+        \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
+    )
+    {
         parent::__construct(
             $context,
             $customerSession,
@@ -61,129 +96,95 @@ public function __construct(
             $urlHelper,
             $customerUrl
         );
+
+        $this->logger = $logger;
+        $this->quoteRepository = $quoteRepository;
+        $this->customerRepository = $customerRepository;
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
     }
+
     /**
      * @return \Magento\Framework\App\ResponseInterface|ResultInterface
      */
     public function execute()
     {
         $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $responseContent = [
+            'success' => true,
+            'error_message' => '',
+        ];
+
         try {
             $token = $this->getToken();
             if ($token === null) {
                 $token = false;
             }
             $this->_initToken($token);
-            $controllerResult->setData(['token' => $token]);
+
+            $responseContent['token'] = $token;
         } catch (LocalizedException $exception) {
             $this->logger->critical($exception);
-            $controllerResult->setData([
-                'message' => [
-                    'text' => $exception->getMessage(),
-                    'type' => 'error'
-                ]
-            ]);
+
+            $responseContent['success'] = false;
+            $responseContent['error_message'] = $exception->getMessage();
         } catch (\Exception $exception) {
-            $this->messageManager->addExceptionMessage(
-                $exception,
-                __('We can\'t start Express Checkout.')
-            );
-            return $this->getErrorResponse($controllerResult);
+            $this->logger->critical($exception);
+
+            $responseContent['success'] = false;
+            $responseContent['error_message'] = __('Sorry, but something went wrong');
         }
-        return $controllerResult;
+
+        return $controllerResult->setData($responseContent);
     }
+
     /**
-     * @return string|null
-     * @throws LocalizedException
-     */
-//    protected function getToken()
-//    {
-//        $quoteId = $this->getRequest()->getParam('quote_id');
-//        $customerId = $this->getRequest()->getParam('customer_id');
-//        $hasButton = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_BUTTON) == 1;
-//
-//        if(!$customerId) {
-//            $quoteIdMask = $this->quoteIdMaskFactory->create()->load($quoteId, 'masked_id');
-//            $quoteId = $quoteIdMask->getQuoteId();
-//        }
-//        $quote = $this->quoteRepository->get((int)$quoteId);
-//        $this->initCheckout($quote);
-//
-//        if ($quote->getIsMultiShipping()) {
-//            $quote->setIsMultiShipping(false);
-//            $quote->removeAllAddresses();
-//        }
-//
-//        if ($customerId) {
-//            $customerData = $this->customerRepository->getById((int)$customerId);
-//
-//            $this->_checkout->setCustomerWithAddressChange(
-//                $customerData,
-//                $quote->getBillingAddress(),
-//                $quote->getShippingAddress()
-//            );
-//
-//            // billing agreement
-//            $isBaRequested = (bool)$this->getRequest()
-//                ->getParam(Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT);
-//            $this->_checkout->setIsBillingAgreementRequested($isBaRequested);
-//        }
-//
-//        // Bill Me Later
-//        $this->_checkout->setIsBml((bool)$this->getRequest()->getParam('bml'));
-//
-//        // giropay
-//        $this->_checkout->prepareGiropayUrls(
-//            $this->_url->getUrl('checkout/onepage/success'),
-//            $this->_url->getUrl('paypal/express/cancel'),
-//            $this->_url->getUrl('checkout/onepage/success')
-//        );
-//        return $this->_checkout->start(
-//            $this->_url->getUrl('*/*/return'),
-//            $this->_url->getUrl('*/*/cancel'),
-//            $hasButton
-//        );
-//    }
-    /**
-     * Instantiate quote and checkout
+     * Get paypal token
      *
-     * @param $quote
+     * @return string|null
      * @throws LocalizedException
      */
-//    private function initCheckout($quote)
-//    {
-//        if (!$quote->hasItems() || $quote->getHasError()) {
-//            $this->getResponse()->setStatusHeader(403, '1.1', 'Forbidden');
-//            throw new \Magento\Framework\Exception\LocalizedException(__('We can\'t initialize Express Checkout.'));
-//        }
-//        if (!(float)$quote->getGrandTotal()) {
-//            throw new \Magento\Framework\Exception\LocalizedException(
-//                __(
-//                    'PayPal can\'t process orders with a zero balance due. '
-//                    . 'To finish your purchase, please go through the standard checkout process.'
-//                )
-//            );
-//        }
-//        if (!isset($this->_checkoutTypes[$this->_checkoutType])) {
-//            $parameters = [
-//                'params' => [
-//                    'quote' => $quote,
-//                    'config' => $this->_config,
-//                ],
-//            ];
-//            $this->_checkoutTypes[$this->_checkoutType] = $this->_checkoutFactory
-//                ->create($this->_checkoutType, $parameters);
-//        }
-//        $this->_checkout = $this->_checkoutTypes[$this->_checkoutType];
-//    }
-    /**
-     * @param ResultInterface $controllerResult
-     * @return ResultInterface
-     */
-    private function getErrorResponse(ResultInterface $controllerResult)
+    protected function getToken()
     {
-        $controllerResult->setHttpResponseCode(Exception::HTTP_BAD_REQUEST);
-        $controllerResult->setData(['message' => __('Sorry, but something went wrong')]);
-        return $controllerResult;
+        $quoteId = $this->getRequest()->getParam('quote_id');
+        $customerId = $this->getRequest()->getParam('customer_id');
+        $hasButton = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_BUTTON);
+        $isBaRequested = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT);
+
+        if (!$customerId) {
+            $quoteIdMask = $this->quoteIdMaskFactory->create()->load($quoteId, 'masked_id');
+            $quoteId = $quoteIdMask->getQuoteId();
+        }
+        $quote = $this->quoteRepository->get((int)$quoteId);
+        $this->_initCheckout($quote);
+
+        if ($quote->getIsMultiShipping()) {
+            $quote->setIsMultiShipping(false);
+            $quote->removeAllAddresses();
+        }
+
+        if ($customerId) {
+            $customerData = $this->customerRepository->getById((int)$customerId);
+
+            $this->_checkout->setCustomerWithAddressChange(
+                $customerData,
+                $quote->getBillingAddress(),
+                $quote->getShippingAddress()
+            );
+
+            $this->_checkout->setIsBillingAgreementRequested($isBaRequested);
+        }
+
+        // giropay urls
+        $this->_checkout->prepareGiropayUrls(
+            $this->_url->getUrl('checkout/onepage/success'),
+            $this->_url->getUrl('paypal/express/cancel'),
+            $this->_url->getUrl('checkout/onepage/success')
+        );
+
+        return $this->_checkout->start(
+            $this->_url->getUrl('*/*/return'),
+            $this->_url->getUrl('*/*/cancel'),
+            $hasButton
+        );
     }
 }
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index a7d0e7a9cbe0c..78d6bed086ff2 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -83,10 +83,15 @@ define([
 
                 return paypal.request.post(clientConfig.startUrl, params)
                     .then(function (res) {
-                        //add logic to process negative cases
-                        // 3. Return res.id from the response
-                        return res.token;
-
+                        if (res.success) {
+                            //add logic to process negative cases
+                            // 3. Return res.id from the response
+                            return res.token;
+                        } else {
+                            messageList.addErrorMessage({
+                                message: res.error_message
+                            });
+                        }
                     })
                     .catch(function (err) {
                         throw err;

From fe80ba92531cb417d2215d257eeb2bf7f81af104 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Tue, 8 Jan 2019 16:03:48 -0600
Subject: [PATCH 527/932] MC-6282: [Backend]: Create Place Order Controller

---
 .../Controller/Express/OnAuthorization.php       | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index f0430c41fc182..15a9773ca187e 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -95,8 +95,9 @@ public function __construct(
     }
 
     /**
+     * Place order or redirect on Paypal review page
+     *
      * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function execute()
     {
@@ -106,16 +107,13 @@ public function execute()
         $payerId = $params['payerId'];
         $tokenId = $params['paymentToken'];
         $customerId = $params['customerId'];
-        /** @var \Magento\Quote\Api\Data\CartInterface $quote */
-        //@todo add logic  or separate controller to load quote for quest
         try {
+            $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
 
-        $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
-
-        $responseContent = [
-            'success' => true,
-            'error_message' => '',
-        ];
+            $responseContent = [
+                'success' => true,
+                'error_message' => '',
+            ];
 
             //populate checkout object with new data
             $this->_initCheckout($quote);

From d1c612d55d5585622ceb36ae25f805e1c847c6c1 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Tue, 8 Jan 2019 16:09:57 -0600
Subject: [PATCH 528/932] MC-4392: Convert MassProductUpdateStatusTest to MFTF

- Skipped MTF variation MassProductStatusUpdateTestVariation1 because it is tested in MFTF by MC-57
---
 .../Test/TestCase/Product/MassProductUpdateStatusTest.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateStatusTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateStatusTest.xml
index fa82fd90268fd..6936315a12818 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateStatusTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateStatusTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\MassProductUpdateStatusTest" summary="Update status of Products Using Mass Actions" ticketId="MAGETWO-60847">
         <variation name="MassProductStatusUpdateTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialProducts" xsi:type="array">
                 <item name ="0" xsi:type="string">catalogProductSimple::simple_10_dollar</item>
                 <item name ="1" xsi:type="string">catalogProductSimple::simple_10_dollar</item>

From 51c2712138ff11ea6551aac2e56b2770600c2117 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Tue, 8 Jan 2019 16:35:09 -0600
Subject: [PATCH 529/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 .../Magento/Customer/Block/Address/Grid.php   |  11 +-
 ...torefrontAddCustomerAddressActionGroup.xml |  48 +++++++
 .../Customer/Test/Mftf/Data/AddressData.xml   |  34 +++++
 .../Customer/Test/Mftf/Data/CustomerData.xml  |  24 ++++
 .../StorefrontCustomerAddressFormSection.xml  |  25 ++++
 .../StorefrontCustomerAddressesSection.xml    |   6 +
 .../Test/StorefrontAddCustomerAddressTest.xml | 121 +++++++++++++++++
 .../StorefrontUpdateCustomerAddressTest.xml   | 125 ++++++++++++++++++
 .../Test/Unit/Block/Address/GridTest.php      |   4 +-
 .../frontend/templates/address/grid.phtml     |   2 +-
 .../Block/Account/AddressesAdditional.php     |  21 +--
 .../Customer/Test/Block/Address/Renderer.php  |   5 +
 ...AssertAdditionalAddressCreatedFrontend.php |   2 +-
 13 files changed, 411 insertions(+), 17 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml

diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index 0b5062b25f54f..f10e8df6b947b 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -106,7 +106,7 @@ public function getAddressEditUrl($addressId): string
     /**
      * Get current additional customer addresses
      *
-     * Will return array of address interfaces if customer have additional addresses and false in other case.
+     * Return array of address interfaces if customer has additional addresses and false in other cases
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -145,11 +145,12 @@ public function getCustomer(): \Magento\Customer\Api\Data\CustomerInterface
     /**
      * Get one string street address from "two fields" array or just returns string if it was passed in parameters
      *
-     * @param string|array $street
+     * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
      */
-    public function getStreetAddress($street): string
+    public function getStreetAddress(\Magento\Customer\Api\Data\AddressInterface $address): string
     {
+        $street = $address->getStreet();
         if (is_array($street)) {
             $street = implode(', ', $street);
         }
@@ -174,7 +175,7 @@ public function getCountryByCode($countryCode): string
     /**
      * Get default billing address
      *
-     * Return address string if address found and null of not
+     * Return address string if address found and null if not
      *
      * @return int
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -189,7 +190,7 @@ private function getDefaultBilling(): int
     /**
      * Get default shipping address
      *
-     * Return address string if address found and null of not
+     * Return address string if address found and null if not
      *
      * @return int
      * @throws \Magento\Framework\Exception\LocalizedException
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml
new file mode 100644
index 0000000000000..a45fcf31f7b3f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAddCustomerAddressActionGroup.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAddNewCustomerAddressActionGroup">
+        <amOnPage url="customer/address/new/" stepKey="OpenCustomerAddNewAddress"/>
+        <arguments>
+            <argument name="Address"/>
+        </arguments>
+        <fillField  stepKey="fillFirstName" userInput="{{Address.firstname}}" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
+        <fillField  stepKey="fillLastName" userInput="{{Address.lastname}}" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
+        <fillField  stepKey="fillCompanyName" userInput="{{Address.company}}" selector="{{StorefrontCustomerAddressFormSection.company}}"/>
+        <fillField  stepKey="fillPhoneNumber" userInput="{{Address.telephone}}" selector="{{StorefrontCustomerAddressFormSection.phoneNumber}}"/>
+        <fillField  stepKey="fillStreetAddress" userInput="{{Address.street[0]}}" selector="{{StorefrontCustomerAddressFormSection.streetAddress}}"/>
+        <fillField  stepKey="fillCity" userInput="{{Address.city}}" selector="{{StorefrontCustomerAddressFormSection.city}}"/>
+        <selectOption  stepKey="selectState" userInput="{{Address.state}}" selector="{{StorefrontCustomerAddressFormSection.state}}"/>
+        <fillField  stepKey="fillZip" userInput="{{Address.postcode}}" selector="{{StorefrontCustomerAddressFormSection.zip}}"/>
+        <selectOption  stepKey="selectCountry" userInput="{{Address.country}}" selector="{{StorefrontCustomerAddressFormSection.country}}"/>
+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
+    </actionGroup>
+    <actionGroup name="StorefrontAddCustomerDefaultAddressActionGroup">
+        <amOnPage url="customer/address/new/" stepKey="OpenCustomerAddNewAddress"/>
+        <arguments>
+            <argument name="Address"/>
+        </arguments>
+        <fillField  stepKey="fillFirstName" userInput="{{Address.firstname}}" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
+        <fillField  stepKey="fillLastName" userInput="{{Address.lastname}}" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
+        <fillField  stepKey="fillCompanyName" userInput="{{Address.company}}" selector="{{StorefrontCustomerAddressFormSection.company}}"/>
+        <fillField  stepKey="fillPhoneNumber" userInput="{{Address.telephone}}" selector="{{StorefrontCustomerAddressFormSection.phoneNumber}}"/>
+        <fillField  stepKey="fillStreetAddress" userInput="{{Address.street[0]}}" selector="{{StorefrontCustomerAddressFormSection.streetAddress}}"/>
+        <fillField  stepKey="fillCity" userInput="{{Address.city}}" selector="{{StorefrontCustomerAddressFormSection.city}}"/>
+        <selectOption  stepKey="selectState" userInput="{{Address.state}}" selector="{{StorefrontCustomerAddressFormSection.state}}"/>
+        <fillField  stepKey="fillZip" userInput="{{Address.postcode}}" selector="{{StorefrontCustomerAddressFormSection.zip}}"/>
+        <selectOption  stepKey="selectCountry" userInput="{{Address.country}}" selector="{{StorefrontCustomerAddressFormSection.country}}"/>
+        <click stepKey="checkUseAsDefaultBillingAddressCheckBox" selector="{{StorefrontCustomerAddressFormSection.useAsDefaultBillingAddressCheckBox}}"/>
+        <click stepKey="checkUseAsDefaultShippingAddressCheckBox" selector="{{StorefrontCustomerAddressFormSection.useAsDefaultShippingAddressCheckBox}}"/>
+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index c7335f9024218..85b94b67c0eda 100755
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -44,12 +44,29 @@
         <data key="city">Austin</data>
         <data key="state">Texas</data>
         <data key="country_id">US</data>
+        <data key="country">United States</data>
         <data key="postcode">78729</data>
         <data key="telephone">512-345-6789</data>
         <data key="default_billing">Yes</data>
         <data key="default_shipping">Yes</data>
         <requiredEntity type="region">RegionTX</requiredEntity>
     </entity>
+    <entity name="US_Address_TX_Default_Billing" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">Magento</data>
+        <array key="street">
+            <item>7700 West Parmer Lane</item>
+        </array>
+        <data key="city">Austin</data>
+        <data key="state">Texas</data>
+        <data key="country_id">US</data>
+        <data key="country">United States</data>
+        <data key="postcode">78729</data>
+        <data key="telephone">512-345-6789</data>
+        <data key="default_billing">Yes</data>
+        <requiredEntity type="region">RegionTX</requiredEntity>
+    </entity>
     <entity name="US_Address_NY" type="address">
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>
@@ -68,6 +85,23 @@
         <requiredEntity type="region">RegionNY</requiredEntity>
         <data key="country">United States</data>
     </entity>
+    <entity name="US_Address_NY_Default_Shipping" type="address">
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="company">368</data>
+        <array key="street">
+            <item>368 Broadway St.</item>
+            <item>113</item>
+        </array>
+        <data key="city">New York</data>
+        <data key="state">New York</data>
+        <data key="country_id">US</data>
+        <data key="postcode">10001</data>
+        <data key="telephone">512-345-6789</data>
+        <data key="default_shipping">Yes</data>
+        <requiredEntity type="region">RegionNY</requiredEntity>
+        <data key="country">United States</data>
+    </entity>
     <entity name="US_Address_NY_Not_Default_Address" type="address">
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index 44ac0981d9577..ab42dfe85e4ff 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -45,6 +45,16 @@
         <data key="website_id">0</data>
         <requiredEntity type="address">US_Address_TX</requiredEntity>
     </entity>
+    <entity name="Simple_Customer_Without_Address" type="customer">
+        <data key="group_id">1</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+    </entity>
     <entity name="Simple_US_Customer_Multiple_Addresses" type="customer">
         <data key="group_id">0</data>
         <data key="default_billing">true</data>
@@ -73,6 +83,20 @@
         <requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
         <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
     </entity>
+    <entity name="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" type="customer">
+        <data key="group_id">0</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_TX_Default_Billing</requiredEntity>
+        <requiredEntity type="address">US_Address_NY_Default_Shipping</requiredEntity>
+    </entity>
     <entity name="Simple_US_Customer_NY" type="customer">
         <data key="group_id">0</data>
         <data key="default_billing">true</data>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml
new file mode 100644
index 0000000000000..112ced1bc375f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressFormSection.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerAddressFormSection">
+        <element name="firstName" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'firstname')]"/>
+        <element name="lastName" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'lastname')]"/>
+        <element name="company" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'company')]"/>
+        <element name="phoneNumber" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'telephone')]"/>
+        <element name="streetAddress" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'street')]"/>
+        <element name="city" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'city')]"/>
+        <element name="state" type="select" selector="//form[@class='form-address-edit']//select[contains(@name, 'region_id')]"/>
+        <element name="zip" type="input" selector="//form[@class='form-address-edit']//input[contains(@name, 'postcode')]"/>
+        <element name="country" type="select" selector="//form[@class='form-address-edit']//select[contains(@name, 'country_id')]"/>
+        <element name="useAsDefaultBillingAddressCheckBox" type="input" selector="//form[@class='form-address-edit']//input[@name='default_billing']"/>
+        <element name="useAsDefaultShippingAddressCheckBox" type="input" selector="//form[@class='form-address-edit']//input[@name='default_shipping']"/>
+        <element name="saveAddress" type="button" selector="//button[@title='Save Address']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
index 892c3d190f349..29a2f549274a7 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml
@@ -9,7 +9,13 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerAddressesSection">
+        <element name="defaultBillingAddress" type="text" selector=".box-address-billing" />
+        <element name="editDefaultBillingAddress" type="text" selector="//div[@class='box-actions']//span[text()='Change Billing Address']" timeout="30"/>
+        <element name="defaultShippingAddress" type="text" selector=".box-address-shipping" />
+        <element name="editDefaultShippingAddress" type="text" selector="//div[@class='box-actions']//span[text()='Change Shipping Address']" timeout="30"/>
         <element name="addressesList" type="text" selector=".additional-addresses" />
         <element name="deleteAdditionalAddress" type="button" selector="//tbody//tr[{{var}}]//a[@class='action delete']" parameterized="true"/>
+        <element name="editAdditionalAddress" type="button" selector="//tbody//tr[{{var}}]//a[@class='action edit']" parameterized="true" timeout="30"/>
+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Address']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml
new file mode 100644
index 0000000000000..413bbfd06a539
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddCustomerAddressTest.xml
@@ -0,0 +1,121 @@
+<?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="StorefrontAddNewCustomerAddressTest">
+        <annotations>
+            <features value="Customer address"/>
+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
+            <title value="Storefront - My account - Address Book - add new address"/>
+            <description value="Storefront user should be able to create a new address via the storefront"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97364"/>
+            <group value="customer"/>
+            <group value="create"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="AmOnLogoutPage"/>
+        </after>
+
+        <!--Log in to Storefront as Customer 1 -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddNewCustomerAddressActionGroup" stepKey="AddNewAddress">
+            <argument name="Address" value="US_Address_TX"/>
+        </actionGroup>
+        <see userInput="{{US_Address_TX.street[0]}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesStreetOnDefaultBilling"/>
+        <see userInput="{{US_Address_TX.city}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesCityOnDefaultBilling"/>
+        <see userInput="{{US_Address_TX.postcode}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesPostcodeOnDefaultBilling"/>
+        <see userInput="{{US_Address_TX.street[0]}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesStreetOnDefaultShipping"/>
+        <see userInput="{{US_Address_TX.city}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesCityOnDefaultShipping"/>
+        <see userInput="{{US_Address_TX.postcode}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesPostcodeOnDefaultShipping"/>
+    </test>
+    <test name="StorefrontAddCustomerDefaultAddressTest">
+        <annotations>
+            <features value="Customer address"/>
+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
+            <title value="Storefront - My account - Address Book - add new default billing/shipping address"/>
+            <description value="Storefront user should be able to create a new default address via the storefront"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97364"/>
+            <group value="customer"/>
+            <group value="create"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
+        </after>
+
+        <!--Log in to Storefront as Customer 1 -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddCustomerDefaultAddressActionGroup" stepKey="AddNewDefaultAddress">
+            <argument name="Address" value="US_Address_TX"/>
+        </actionGroup>
+        <see userInput="{{US_Address_TX.street[0]}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesStreetOnDefaultBilling"/>
+        <see userInput="{{US_Address_TX.city}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesCityOnDefaultBilling"/>
+        <see userInput="{{US_Address_TX.postcode}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesPostcodeOnDefaultBilling"/>
+        <see userInput="{{US_Address_TX.street[0]}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesStreetOnDefaultShipping"/>
+        <see userInput="{{US_Address_TX.city}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesCityOnDefaultShipping"/>
+        <see userInput="{{US_Address_TX.postcode}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesPostcodeOnDefaultShipping"/>
+    </test>
+    <test name="StorefrontAddCustomerNonDefaultAddressTest">
+        <annotations>
+            <features value="Customer address"/>
+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
+            <title value="Storefront - My account - Address Book - add new non default billing/shipping address"/>
+            <description value="Storefront user should be able to create a new non default address via the storefront"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97500"/>
+            <group value="customer"/>
+            <group value="create"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="AmOnLogoutPage"/>
+        </after>
+
+        <!--Log in to Storefront as Customer 1 -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddNewCustomerAddressActionGroup" stepKey="AddNewNonDefaultAddress">
+            <argument name="Address" value="US_Address_TX"/>
+        </actionGroup>
+        <see userInput="{{US_Address_TX.street[0]}}"
+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesStreetOnDefaultShipping"/>
+        <see userInput="{{US_Address_TX.city}}"
+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesCityOnDefaultShipping"/>
+        <see userInput="{{US_Address_TX.postcode}}"
+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressesPostcodeOnDefaultShipping"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
new file mode 100644
index 0000000000000..d1b5fb2aa7d11
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
@@ -0,0 +1,125 @@
+<?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="StorefrontUpdateCustomerDefaultBillingAddressFromBlockTest">
+        <annotations>
+            <features value="Customer address"/>
+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
+            <title value="Add default customer address via the Storefront6"/>
+            <description value="Storefront user should be able to create a new default address via the storefront"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97501"/>
+            <group value="customer"/>
+            <group value="update"/>
+            <skip>
+                <issueId value="MAGETWO-97504"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
+        </after>
+
+        <!--Log in to Storefront as Customer 1 -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <amOnPage url="customer/address/" stepKey="OpenCustomerAddNewAddress"/>
+        <click stepKey="ClickEditDefaultBillingAddress" selector="{{StorefrontCustomerAddressesSection.editDefaultBillingAddress}}"/>
+        <fillField  stepKey="fillFirstName" userInput="EditedFirstNameBilling" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
+        <fillField  stepKey="fillLastName" userInput="EditedLastNameBilling" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
+        <see userInput="EditedFirstNameBilling"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesFirstNameOnDefaultBilling"/>
+        <see userInput="EditedLastNameBilling"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesLastNameOnDefaultBilling"/>
+        <see userInput="{{US_Address_NY_Default_Shipping.firstname}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesFirstNameOnDefaultShipping"/>
+        <see userInput="{{US_Address_NY_Default_Shipping.lastname}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesLastNameOnDefaultShipping"/>
+    </test>
+    <test name="StorefrontUpdateCustomerDefaultShippingAddressFromBlockTest">
+        <annotations>
+            <features value="Customer address"/>
+            <stories value="Implement handling of large number of addresses on storefront Address book"/>
+            <title value="Add default customer address via the Storefront611"/>
+            <description value="Storefront user should be able to create a new default address via the storefront"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97501"/>
+            <group value="customer"/>
+            <group value="update"/>
+            <skip>
+                <issueId value="MAGETWO-97504"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
+        </after>
+
+        <!--Log in to Storefront as Customer 1 -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <amOnPage url="customer/address/" stepKey="OpenCustomerAddNewAddress"/>
+        <click stepKey="ClickEditDefaultShippingAddress" selector="{{StorefrontCustomerAddressesSection.editDefaultShippingAddress}}"/>
+        <fillField  stepKey="fillFirstName" userInput="EditedFirstNameShipping" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
+        <fillField  stepKey="fillLastName" userInput="EditedLastNameShipping" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
+        <see userInput="EditedFirstNameShipping"
+             selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" stepKey="checkNewAddressesFirstNameOnDefaultShipping"/>
+        <see userInput="EditedLastNameShipping"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesLastNameOnDefaultShipping"/>
+        <see userInput="{{US_Address_TX_Default_Billing.firstname}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesFirstNameOnDefaultBilling"/>
+        <see userInput="{{US_Address_TX_Default_Billing.lastname}}"
+             selector="{{StorefrontCustomerAddressesSection.defaultBillingAddress}}" stepKey="checkNewAddressesLastNameOnDefaultBilling"/>
+    </test>
+    <test name="StorefrontUpdateCustomerAddressFromGridTest">
+        <annotations>
+            <features value="Customer address"/>
+            <stories value="Add default customer address via the Storefront7"/>
+            <title value="Add default customer address via the Storefront7"/>
+            <description value="Storefront user should be able to create a new default address via the storefront2"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-97502"/>
+            <group value="customer"/>
+            <group value="update"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="DeleteCustomer"/>
+        </after>
+
+        <!--Log in to Storefront as Customer 1 -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signUp">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <amOnPage url="customer/address/" stepKey="OpenCustomerAddNewAddress"/>
+        <click selector="{{StorefrontCustomerAddressesSection.editAdditionalAddress('1')}}" stepKey="editAdditionalAddress"/>
+        <fillField  stepKey="fillFirstName" userInput="EditedFirstName" selector="{{StorefrontCustomerAddressFormSection.firstName}}"/>
+        <fillField  stepKey="fillLastName" userInput="EditedLastName" selector="{{StorefrontCustomerAddressFormSection.lastName}}"/>
+        <click stepKey="saveCustomerAddress" selector="{{StorefrontCustomerAddressFormSection.saveAddress}}"/>
+        <see userInput="You saved the address." stepKey="verifyAddressAdded"/>
+        <see userInput="EditedFirstName"
+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressFirstNameOnGrid"/>
+        <see userInput="EditedLastName"
+             selector="{{StorefrontCustomerAddressesSection.addressesList}}" stepKey="checkNewAddressLastNameOnGrid"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
index 65a72ae1adeba..8a9189ecdad82 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -173,7 +173,9 @@ public function testGetStreetAddress()
     {
         $street = ['Line 1', 'Line 2'];
         $expectedAddress = 'Line 1, Line 2';
-        $this->assertEquals($expectedAddress, $this->gridBlock->getStreetAddress($street));
+        $address = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
+        $address->expects($this->atLeastOnce())->method('getStreet')->willReturn($street);
+        $this->assertEquals($expectedAddress, $this->gridBlock->getStreetAddress($address));
     }
 
     /**
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml b/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml
index 452c30fe9f5fc..7af5b5af2e7a1 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/grid.phtml
@@ -36,7 +36,7 @@ $customerAddressView = $block->getData('customer_address');
                         <tr>
                             <td data-th="<?= $block->escapeHtml(__('First Name')) ?>" class="col firstname"><?= $block->escapeHtml($address->getFirstname()) ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Last Name')) ?>" class="col lastname"><?= $block->escapeHtml($address->getLastname()) ?></td>
-                            <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->escapeHtml($block->getStreetAddress($address->getStreet())) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Street Address')) ?>" class="col streetaddress"><?= $block->escapeHtml($block->getStreetAddress($address)) ?></td>
                             <td data-th="<?= $block->escapeHtml(__('City')) ?>" class="col city"><?= $block->escapeHtml($address->getCity()) ?></td>
                             <td data-th="<?= $block->escapeHtml(__('Country')) ?>" class="col country"><?= /* @escapeNotVerified */ $block->getCountryByCode($address->getCountryId()) ?></td>
                             <td data-th="<?= $block->escapeHtml(__('State')) ?>" class="col state"><?= /* @escapeNotVerified */ $address->getRegion()->getRegion() ?></td>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
index cba358549c3d7..13ef742d0627c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php
@@ -20,14 +20,14 @@ class AddressesAdditional extends Block
      *
      * @var string
      */
-    protected $addressSelector = '//li[address[contains(.,"%s")]]';
+    protected $addressSelector = '//tbody//tr[contains(.,"%s")]';
 
     /**
      * Selector for addresses block
      *
      * @var string
      */
-    protected $addressesSelector = '//li[address]';
+    protected $addressesSelector = '.additional-addresses';
 
     /**
      * Selector for delete link
@@ -74,16 +74,19 @@ public function deleteAdditionalAddress(Address $address)
      */
     public function isAdditionalAddressExists($address)
     {
-        $additionalAddressExists = false;
-
-        $addresses = $this->_rootElement->getElements($this->addressesSelector, Locator::SELECTOR_XPATH);
-        foreach ($addresses as $addressBlock) {
-            if (strpos($addressBlock->getText(), $address) === 0) {
-                $additionalAddressExists = $addressBlock->isVisible();
+        $addressExists = true;
+        foreach (explode("\n", $address) as $addressItem) {
+            $addressElement = $this->_rootElement->find(
+                sprintf($this->addressSelector, $addressItem),
+                Locator::SELECTOR_XPATH
+            );
+            if (!$addressElement->isVisible()) {
+                $addressExists = false;
                 break;
             }
         }
-        return $additionalAddressExists;
+
+        return $addressExists;
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php
index f9a3989d8f574..8d8a0cfe5ea1a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php
@@ -58,6 +58,11 @@ protected function getPattern()
                     . "{{lastname}}{{depend}} {{suffix}}{{/depend}}\n{{/depend}}{{street}}\n"
                     . "{{city}}, {{{$region}}} {{postcode}}\n{{country_id}}\n{{depend}}{{telephone}}{{/depend}}";
                 break;
+            case "html_without_company_separated_names":
+                $outputPattern = "{{depend}}{{prefix}}\n{{/depend}}{{firstname}}\n{{depend}}{{middlename}}\n{{/depend}}"
+                    . "{{lastname}}{{depend}}\n{{suffix}}{{/depend}}\n{{/depend}}{{street}}\n"
+                    . "{{city}}\n{{{$region}}}\n{{postcode}}\n{{country_id}}\n{{depend}}{{telephone}}{{/depend}}";
+                break;
             case "html_for_select_element":
                 $outputPattern = "{{depend}}{{prefix}} {{/depend}}{{firstname}} {{depend}}{{middlename}} {{/depend}}"
                     . "{{lastname}}{{depend}} {{suffix}}{{/depend}}, {{/depend}}{{street}}, "
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php
index abfee067a73de..4d086cf06053d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAdditionalAddressCreatedFrontend.php
@@ -28,7 +28,7 @@ public function processAssert(CustomerAccountIndex $customerAccountIndex, Addres
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('Address Book');
         $addressRenderer = $this->objectManager->create(
             \Magento\Customer\Test\Block\Address\Renderer::class,
-            ['address' => $shippingAddress, 'type' => 'html']
+            ['address' => $shippingAddress, 'type' => 'html_without_company_separated_names']
         )->render();
         $isAddressExists = $customerAccountIndex->getAdditionalAddressBlock()
             ->isAdditionalAddressExists($addressRenderer);

From 0d9cf93629d7fb432420a0d3ece8cbb5e456f669 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Tue, 8 Jan 2019 17:09:57 -0600
Subject: [PATCH 530/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
index 8a9189ecdad82..31bcc37612302 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/GridTest.php
@@ -28,7 +28,6 @@ class GridTest extends \PHPUnit\Framework\TestCase
      */
     private $currentCustomer;
 
-
     /**
      * @var \Magento\Directory\Model\CountryFactory|\PHPUnit_Framework_MockObject_MockObject
      */

From 53d861a9a4f429cb5971d65316dd00fa3a79ed7e Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Wed, 9 Jan 2019 10:36:52 +0530
Subject: [PATCH 531/932] Updated Text.php

---
 app/code/Magento/Eav/Model/Attribute/Data/Text.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index 0a49e012690f6..336e412435405 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -72,7 +72,7 @@ public function validateValue($value)
             return true;
         }
 
-        if (empty($value) && $value !== '0') {
+        if (empty($value) && $value !== '0' && $attribute->getDefaultValue() == NULL) {
             $label = __($attribute->getStoreLabel());
             $errors[] = __('"%1" is a required value.', $label);
         }

From 9c2c4e64b11943b1a75d4439c7a4486a48827669 Mon Sep 17 00:00:00 2001
From: Yashwant 2jcommerce <yashwant@2jcommerce.in>
Date: Wed, 9 Jan 2019 12:13:01 +0530
Subject: [PATCH 532/932] Review-Details-Detailed-Rating-misaligned

---
 .../Magento/backend/Magento_Review/web/css/source/_module.less  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
index 17be2ca706076..08606402f7a0e 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Review/web/css/source/_module.less
@@ -34,7 +34,7 @@
         .admin__field-control {
             direction: rtl;
             display: inline-block;
-            margin: -4px 0 0;
+            margin: -1px 0 0;
             unicode-bidi: bidi-override;
             vertical-align: top;
             width: 125px;

From 480dc76f9419f293990f0a9f1a3b7d873dac7843 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 9 Jan 2019 11:12:54 +0300
Subject: [PATCH 533/932] MAGETWO-91688: Exception when login as restricted
 admin with access only to CMS Block

- Fix unit and static tests.
---
 .../Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php  | 3 ++-
 app/code/Magento/Cms/Ui/Component/DataProvider.php           | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
index 54e0e17ab7ad6..a624823d02c13 100644
--- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
@@ -118,7 +118,8 @@ public function testPrepareMetadata()
                         'config' => [
                             'editorConfig' => [
                                 'enabled' => false
-                            ]
+                            ],
+                            'componentType' => \Magento\Ui\Component\Container::NAME
                         ]
                     ]
                 ]
diff --git a/app/code/Magento/Cms/Ui/Component/DataProvider.php b/app/code/Magento/Cms/Ui/Component/DataProvider.php
index 736a71ccb747e..b02dd6ba98ed0 100644
--- a/app/code/Magento/Cms/Ui/Component/DataProvider.php
+++ b/app/code/Magento/Cms/Ui/Component/DataProvider.php
@@ -13,6 +13,9 @@
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
 
+/**
+ * DataProvider for cms ui.
+ */
 class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
 {
     /**
@@ -67,6 +70,8 @@ public function __construct(
     }
 
     /**
+     * Get authorization info.
+     *
      * @deprecated 101.0.7
      * @return AuthorizationInterface|mixed
      */

From fa4077a00437140ab85913ba8cc5cbfd05cc63f2 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Wed, 9 Jan 2019 10:27:14 +0200
Subject: [PATCH 534/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Magento/CatalogImportExport/Model/Import/Product.php    | 6 +++---
 .../Test/Unit/Model/Import/ProductTest.php                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index f409375d77fd7..4ee074cc796cc 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -3100,7 +3100,7 @@ private function retrieveProductBySku($sku)
     /**
      * Add row as skipped
      *
-     * @param @param int $rowNumber
+     * @param int $rowNum
      * @param string $errorCode Error code or simply column name
      * @param string $errorLevel
      * @param string $colName OPTIONAL Column name.
@@ -3112,8 +3112,8 @@ private function skipRow(
         $errorLevel = ProcessingError::ERROR_LEVEL_NOT_CRITICAL,
         $colName = null
     ): self {
-        $this->addRowError($errorCode, $rowNum, $colName, null, $errorLevel)
-            ->getErrorAggregator()
+        $this->addRowError($errorCode, $rowNum, $colName, null, $errorLevel);
+        $this->getErrorAggregator()
             ->addRowToSkip($rowNum);
         return $this;
     }
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
index a562916b3b4bb..2e0ed776fd5cc 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -866,7 +866,7 @@ public function testValidateRowCheckSpecifiedSku($sku, $expectedError)
             \Magento\CatalogImportExport\Model\Import\Product::COL_STORE => '',
         ];
 
-        $this->storeResolver->expects($this->any())->method('getStoreCodeToId')->willReturn(null);
+        $this->storeResolver->method('getStoreCodeToId')->willReturn(null);
         $this->setPropertyValue($importProduct, 'storeResolver', $this->storeResolver);
         $this->setPropertyValue($importProduct, 'skuProcessor', $this->skuProcessor);
 

From 2ca887df5555ea9d293e45b52204634f689b38d5 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 9 Jan 2019 12:45:28 +0200
Subject: [PATCH 535/932] MAGETWO-97514: [FT] [MFTF] AdminDeleteTaxRuleTest
 fails because of bad design

---
 .../Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml    | 2 ++
 app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml
index 83f6b635bfee7..f12bf4344ab12 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/FillShippingZipFormActionGroup.xml
@@ -13,6 +13,8 @@
             <argument name="address"/>
         </arguments>
         <conditionalClick stepKey="openShippingDetails" selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.country}}" time="30" stepKey="waitForCountryFieldAppears"/>
         <selectOption stepKey="selectCountry" selector="{{CheckoutCartSummarySection.country}}" userInput="{{address.country}}"/>
         <selectOption stepKey="selectStateProvince" selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{address.state}}"/>
         <fillField stepKey="fillPostCode" selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{address.postcode}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
index 658f524a4a5db..72adf7b0dae1e 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
@@ -68,7 +68,9 @@
             <argument name="address" value="US_Address_Utah" />
         </actionGroup>
         <scrollTo selector="{{StorefrontProductPageSection.orderTotal}}" x="0" y="-80" stepKey="scrollToOrderTotal"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.subTotal}}" time="30" stepKey="waitSubtotalAppears"/>
         <see selector="{{StorefrontProductPageSection.subTotal}}" userInput="$100.00" stepKey="seeSubTotal"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.shipping}}" time="30" stepKey="waitShippingAppears"/>
         <see selector="{{StorefrontProductPageSection.shipping}}" userInput="$5.00" stepKey="seeShipping"/>
         <dontSee selector="{{StorefrontProductPageSection.tax}}" stepKey="dontSeeAssertTaxAmount" />
         <see selector="{{StorefrontProductPageSection.orderTotal}}" userInput="$105.00" stepKey="seeAssertOrderTotal"/>

From 318e7326256e03b31b850af327ef038b1c251201 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Wed, 9 Jan 2019 14:26:41 +0200
Subject: [PATCH 536/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Test/Unit/Model/Import/ProductTest.php    | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
index 2e0ed776fd5cc..1520da2d42a5d 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -3,11 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import;
 
 use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class ProductTest
@@ -117,10 +119,10 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
     /** @var  \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $_localeDate;
 
-    /** @var \Magento\Framework\Indexer\IndexerRegistry|\PHPUnit_Framework_MockObject_MockObject  */
+    /** @var \Magento\Framework\Indexer\IndexerRegistry|\PHPUnit_Framework_MockObject_MockObject */
     protected $indexerRegistry;
 
-    /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject  */
+    /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $_logger;
 
     /** @var  \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|\PHPUnit_Framework_MockObject_MockObject */
@@ -153,10 +155,10 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
      */
     protected $errorAggregator;
 
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject*/
+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $scopeConfig;
 
-    /** @var \Magento\Catalog\Model\Product\Url|\PHPUnit_Framework_MockObject_MockObject*/
+    /** @var \Magento\Catalog\Model\Product\Url|\PHPUnit_Framework_MockObject_MockObject */
     protected $productUrl;
 
     /** @var  ImageTypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
@@ -719,7 +721,7 @@ public function testValidateRowDeleteBehaviourAddRowErrorCall()
     {
         $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getBehavior', 'getRowScope', 'addRowError'])
+            ->setMethods(['getBehavior', 'getRowScope', 'addRowError', 'getErrorAggregator'])
             ->getMock();
 
         $importProduct->expects($this->exactly(2))->method('getBehavior')
@@ -727,6 +729,10 @@ public function testValidateRowDeleteBehaviourAddRowErrorCall()
         $importProduct->expects($this->once())->method('getRowScope')
             ->willReturn(\Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT);
         $importProduct->expects($this->once())->method('addRowError');
+        $importProduct->method('getErrorAggregator')
+            ->willReturn(
+                $this->getErrorAggregatorObject(['addRowToSkip'])
+            );
         $rowData = [
             \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => 'sku',
         ];
@@ -856,7 +862,7 @@ public function getStoreIdByCodeDataProvider()
     public function testValidateRowCheckSpecifiedSku($sku, $expectedError)
     {
         $importProduct = $this->createModelMockWithErrorAggregator(
-            [ 'addRowError', 'getOptionEntity', 'getRowScope'],
+            ['addRowError', 'getOptionEntity', 'getRowScope'],
             ['isRowInvalid' => true]
         );
 
@@ -899,7 +905,7 @@ public function testValidateRowProcessEntityIncrement()
     public function testValidateRowValidateExistingProductTypeAddNewSku()
     {
         $importProduct = $this->createModelMockWithErrorAggregator(
-            [ 'addRowError', 'getOptionEntity'],
+            ['addRowError', 'getOptionEntity'],
             ['isRowInvalid' => true]
         );
 
@@ -929,7 +935,7 @@ public function testValidateRowValidateExistingProductTypeAddNewSku()
         $this->setPropertyValue($importProduct, '_oldSku', $oldSku);
 
         $expectedData = [
-            'entity_id' =>  $oldSku[$sku]['entity_id'], //entity_id_val
+            'entity_id' => $oldSku[$sku]['entity_id'], //entity_id_val
             'type_id' => $oldSku[$sku]['type_id'],// type_id_val
             'attr_set_id' => $oldSku[$sku]['attr_set_id'], //attr_set_id_val
             'attr_set_code' => $_attrSetIdToName[$oldSku[$sku]['attr_set_id']],//attr_set_id_val
@@ -979,7 +985,8 @@ public function testValidateRowValidateNewProductTypeAddRowErrorCall(
         $colAttrSet,
         $attrSetNameToIdColAttrSet,
         $error
-    ) {
+    )
+    {
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
@@ -1036,11 +1043,7 @@ public function testValidateRowValidateNewProductTypeGetNewSkuCall()
             'entity_id' => null,
             'type_id' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE],//value
             //attr_set_id_val
-            'attr_set_id' => $_attrSetNameToId[
-                $rowData[
-                    \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET
-                ]
-            ],
+            'attr_set_id' => $_attrSetNameToId[$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET]],
             'attr_set_code' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET],//value
             'row_id' => null
         ];

From e6c41bac830e622dc8683fc4b24ee3e46345af4b Mon Sep 17 00:00:00 2001
From: Surabhi Srivastava <surabhisrivastava@cedcoss.com>
Date: Wed, 9 Jan 2019 12:41:46 +0000
Subject: [PATCH 537/932] Fixed issue #19942

Updated Invoice.php
---
 .../Sales/Controller/Adminhtml/Order/Invoice/Save.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
index ab74a64b6fcf3..f3852d7292339 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -194,12 +194,6 @@ public function execute()
             }
             $transactionSave->save();
 
-            if (!empty($data['do_shipment'])) {
-                $this->messageManager->addSuccessMessage(__('You created the invoice and shipment.'));
-            } else {
-                $this->messageManager->addSuccessMessage(__('The invoice has been created.'));
-            }
-
             // send invoice/shipment emails
             try {
                 if (!empty($data['send_email'])) {
@@ -219,6 +213,11 @@ public function execute()
                     $this->messageManager->addErrorMessage(__('We can\'t send the shipment right now.'));
                 }
             }
+            if (!empty($data['do_shipment'])) {
+                $this->messageManager->addSuccessMessage(__('You created the invoice and shipment.'));
+            } else {
+                $this->messageManager->addSuccessMessage(__('The invoice has been created.'));
+            }
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true);
             return $resultRedirect->setPath('sales/order/view', ['order_id' => $orderId]);
         } catch (LocalizedException $e) {

From 3015cc0c119fdc9b59ffbe010424c6b2246b365d Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Wed, 9 Jan 2019 15:06:24 +0200
Subject: [PATCH 538/932] MAGETWO-97488: Refreshing checkout page deletes
 shipping address on guest checkout

---
 app/code/Magento/Checkout/etc/frontend/sections.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Checkout/etc/frontend/sections.xml b/app/code/Magento/Checkout/etc/frontend/sections.xml
index 35733a6119a25..90c2878f501cf 100644
--- a/app/code/Magento/Checkout/etc/frontend/sections.xml
+++ b/app/code/Magento/Checkout/etc/frontend/sections.xml
@@ -46,7 +46,6 @@
     </action>
     <action name="rest/*/V1/guest-carts/*/payment-information">
         <section name="cart"/>
-        <section name="checkout-data"/>
     </action>
     <action name="rest/*/V1/guest-carts/*/selected-payment-method">
         <section name="cart"/>

From 4441124c4a655da5bf3631af20461e2be8bf40a3 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Wed, 9 Jan 2019 18:54:36 +0530
Subject: [PATCH 539/932] iessue fixed #20137 On checkout page apply discount
 button is not align with input box

iessue fixed #20137 On checkout page apply discount button is not align with input box
---
 .../web/css/source/module/checkout/_payment-options.less       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
index 0b27454b206e3..d87b4b70caffa 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -69,6 +69,9 @@
 
         .payment-option-content {
             .lib-css(padding, 0 0 @indent__base @checkout-payment-option-content__padding__xl);
+            .action-apply{
+                margin-right: 0;
+            }
         }
 
         .payment-option-inner {

From 5bda73030f980e165b55d21836d6f2f6e1a2e7d2 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Wed, 9 Jan 2019 08:42:30 -0600
Subject: [PATCH 540/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 app/code/Magento/Customer/Block/Address/Grid.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index f10e8df6b947b..4a73a37fc7f11 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -165,7 +165,7 @@ public function getStreetAddress(\Magento\Customer\Api\Data\AddressInterface $ad
      * @param string $countryCode
      * @return string
      */
-    public function getCountryByCode($countryCode): string
+    public function getCountryByCode(string $countryCode): string
     {
         /** @var \Magento\Directory\Model\Country $country */
         $country = $this->countryFactory->create();

From 20abce30c41fc3f8bfa76b296799eb5e35665e57 Mon Sep 17 00:00:00 2001
From: Patrick McLain <pat@pmclain.com>
Date: Fri, 4 Jan 2019 17:51:51 -0500
Subject: [PATCH 541/932] Fix region_id update in updateCustomerAddress
 mutation

This commit maps `region/region_id` to `AddressInterface:regionId` when
provided as input.

The `AddressInterface` contains both `region` and `regionId` properties which
are mapped to `\Magento\Customer\Model\Address` by the
`AddressRepositoryInterface`.

After populating an existing customer address with the user input for `region`,
the exting `regionId` was still set on the `AddressInterface`. When saving
the `region` property is mapped to the model before `regionId`.

https://github.com/magento/magento2/blob/1a92f1c1609445c7b6b107a165d387e306f2f779/app/code/Magento/Customer/Model/Address.php#L141-L167
---
 .../Model/Resolver/UpdateCustomerAddress.php        |  4 ++++
 .../GraphQl/Customer/UpdateCustomerAddressTest.php  | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
index 7bae40e4cc5de..833ab2e450280 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -109,6 +109,10 @@ private function updateCustomerAddress(int $customerId, int $addressId, array $a
     {
         $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
         $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
+        if (isset($addressData['region']['region_id'])) {
+            $address->setRegionId($address->getRegion()->getRegionId());
+        }
+
         return $this->addressRepository->save($address);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
index 519fe2b1405a0..6a9708b4f86a2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -218,13 +218,12 @@ private function assertCustomerAddressesFields(AddressInterface $address, $actua
         ];
         $this->assertResponseFields($actualResponse, $assertionMap);
         $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
-        // https://github.com/magento/graphql-ce/issues/270
-//        $assertionRegionMap = [
-//            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
-//            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
-//            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
-//        ];
-//        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
+        $assertionRegionMap = [
+            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
+            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
+            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
+        ];
+        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
     }
 
     /**

From 66678e0c36942c0e469426946e96965ead45712f Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 9 Jan 2019 17:22:44 +0200
Subject: [PATCH 542/932] MAGETWO-97526: [FT]
 Magento\Backend\Test\TestCase\LoginAfterJSMinificationTest unstable on
 Jenkins

---
 .../TestCase/LoginAfterJSMinificationTest.php | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php
index 1c3d018af077a..3c74618bf293e 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php
@@ -9,6 +9,7 @@
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 use Magento\Mtf\Util\Command\Cli\DeployMode;
 use Magento\Mtf\TestStep\TestStepFactory;
+use Magento\User\Test\TestStep\LoginUserOnBackendStep;
 
 /**
  * Verify visibility of form elements on Configuration page.
@@ -53,9 +54,11 @@ public function __inject(
     }
 
     /**
-     * Admin login test after JS minification is turned on in production mode
+     * Admin login test after JS minification is turned on in production mode.
+     *
      * @param DeployMode $cli
      * @param null $configData
+     *
      * @return void
      */
     public function test(
@@ -64,15 +67,27 @@ public function test(
     ) {
         $this->configData = $configData;
 
-       //Pre-conditions
+        //Pre-conditions
         $cli->setDeployModeToDeveloper();
-        $this->objectManager->create(
+        $this->stepFactory->create(
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
             ['configData' => $this->configData]
         )->run();
 
         // Steps
         $cli->setDeployModeToProduction();
-        $this->adminDashboardPage->open();
+        //$this->adminDashboardPage->open();
+        $this->stepFactory->create(LoginUserOnBackendStep::class)->run();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->stepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData]
+        )->cleanup();
     }
 }

From d42158e32e3ad180c3f3ca1265bb2e9768a70c52 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Wed, 9 Jan 2019 09:40:17 -0600
Subject: [PATCH 543/932] MAGETWO-94347: Implement handling of large number of
 addresses on storefront Address book

---
 app/code/Magento/Customer/Block/Address/Grid.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index 4a73a37fc7f11..de6767a0ef92a 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -143,7 +143,7 @@ public function getCustomer(): \Magento\Customer\Api\Data\CustomerInterface
     }
 
     /**
-     * Get one string street address from "two fields" array or just returns string if it was passed in parameters
+     * Get one string street address from the Address DTO passed in parameters
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string

From 409750e844e5d7a0359629966c4decc3723adccf Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 9 Jan 2019 10:16:15 -0600
Subject: [PATCH 544/932] MC-10838: [Frontend]Process PayPal errors

- get onCancel method to work like before
---
 app/code/Magento/Paypal/Model/ExpressConfigProvider.php        | 3 ++-
 .../web/js/in-context/express-checkout-smart-buttons.js        | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 1f261703489c6..99cb3fb2ea075 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -134,7 +134,8 @@ public function getConfig()
                     'disallowedFunding' => $this->getDisallowedFunding(),
                     'styles' => $this->getButtonStyles(),
                     'startUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData'),
-                    'onAuthorizeUrl' => $this->urlBuilder->getUrl('paypal/express/onAuthorization')
+                    'onAuthorizeUrl' => $this->urlBuilder->getUrl('paypal/express/onAuthorization'),
+                    'onCancelUrl' => $this->urlBuilder->getUrl('paypal/express/cancel')
                 ],
             ];
         }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 0b0f5be38fce6..817fee06c8e26 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -129,14 +129,13 @@ define([
 
             },
             onCancel: function (data, actions) {
-                window.alert('Transaction is cancelled.');
+                actions.redirect(window, clientConfig.onCancelUrl);
             },
 
             onError: function (err) {
                 messageList.addErrorMessage({
                     message: err
                 });
-
             }
         }, element);
     };

From da809e36e486ccaa02217b2b1b31df6a01745f93 Mon Sep 17 00:00:00 2001
From: Suneet <suneet64@gmail.com>
Date: Wed, 9 Jan 2019 22:02:23 +0530
Subject: [PATCH 545/932] Fixed issue while adding new review from admin panel

---
 .../Review/Controller/Adminhtml/Product/JsonProductInfo.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
index db336d0c2f563..567bf4043f6f3 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
@@ -18,7 +17,7 @@
 /**
  * Represents product info in json
  */
-class JsonProductInfo extends ProductController implements HttpGetActionInterface
+class JsonProductInfo extends ProductController
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface

From 00953bc0d052dae36b030949d9fdd6094fdfb03c Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen@reachdigital.nl>
Date: Thu, 3 Jan 2019 14:29:46 +0100
Subject: [PATCH 546/932] Refactor \Order\Shipment\Save Controller to use
 ResultInterface

---
 .../Adminhtml/Order/Shipment/Save.php         | 59 ++++++++-----------
 .../Adminhtml/Order/Shipment/SaveTest.php     | 22 +++----
 2 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 8bd64ccf82d88..3c26ae938fce3 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -1,13 +1,13 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
-use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 
 /**
@@ -48,17 +48,22 @@ class Save extends \Magento\Backend\App\Action implements HttpPostActionInterfac
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader
      * @param \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator
      * @param \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender
+     * @param \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface|null $shipmentValidator
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader,
         \Magento\Shipping\Model\Shipping\LabelGenerator $labelGenerator,
-        \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender
+        \Magento\Sales\Model\Order\Email\Sender\ShipmentSender $shipmentSender,
+        \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface $shipmentValidator = null
     ) {
+        parent::__construct($context);
+
         $this->shipmentLoader = $shipmentLoader;
         $this->labelGenerator = $labelGenerator;
         $this->shipmentSender = $shipmentSender;
-        parent::__construct($context);
+        $this->shipmentValidator = $shipmentValidator ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface::class);
     }
 
     /**
@@ -86,7 +91,7 @@ protected function _saveShipment($shipment)
      * Save shipment
      * We can save only new shipment. Existing shipments are not editable
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -98,7 +103,7 @@ public function execute()
         $formKeyIsValid = $this->_formKeyValidator->validate($this->getRequest());
         $isPost = $this->getRequest()->isPost();
         if (!$formKeyIsValid || !$isPost) {
-            $this->messageManager->addError(__('We can\'t save the shipment right now.'));
+            $this->messageManager->addErrorMessage(__('We can\'t save the shipment right now.'));
             return $resultRedirect->setPath('sales/order/index');
         }
 
@@ -118,8 +123,7 @@ public function execute()
             $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
             $shipment = $this->shipmentLoader->load();
             if (!$shipment) {
-                $this->_forward('noroute');
-                return;
+                return $this->resultFactory->create(ResultFactory::TYPE_FORWARD)->forward('noroute');
             }
 
             if (!empty($data['comment_text'])) {
@@ -132,15 +136,13 @@ public function execute()
                 $shipment->setCustomerNote($data['comment_text']);
                 $shipment->setCustomerNoteNotify(isset($data['comment_customer_notify']));
             }
-            $validationResult = $this->getShipmentValidator()
-                ->validate($shipment, [QuantityValidator::class]);
+            $validationResult = $this->shipmentValidator->validate($shipment, [QuantityValidator::class]);
 
             if ($validationResult->hasMessages()) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __("Shipment Document Validation Error(s):\n" . implode("\n", $validationResult->getMessages()))
                 );
-                $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
-                return;
+                return $resultRedirect->setPath('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
             }
             $shipment->register();
 
@@ -160,7 +162,7 @@ public function execute()
             $shipmentCreatedMessage = __('The shipment has been created.');
             $labelCreatedMessage = __('You created the shipping label.');
 
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 $isNeedCreateLabel ? $shipmentCreatedMessage . ' ' . $labelCreatedMessage : $shipmentCreatedMessage
             );
             $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getCommentText(true);
@@ -169,8 +171,8 @@ public function execute()
                 $responseAjax->setError(true);
                 $responseAjax->setMessage($e->getMessage());
             } else {
-                $this->messageManager->addError($e->getMessage());
-                $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
+                $this->messageManager->addErrorMessage($e->getMessage());
+                return $resultRedirect->setPath('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
             }
         } catch (\Exception $e) {
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
@@ -178,29 +180,14 @@ public function execute()
                 $responseAjax->setError(true);
                 $responseAjax->setMessage(__('An error occurred while creating shipping label.'));
             } else {
-                $this->messageManager->addError(__('Cannot save shipment.'));
-                $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
+                $this->messageManager->addErrorMessage(__('Cannot save shipment.'));
+                return $resultRedirect->setPath('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
             }
         }
         if ($isNeedCreateLabel) {
-            $this->getResponse()->representJson($responseAjax->toJson());
-        } else {
-            $this->_redirect('sales/order/view', ['order_id' => $shipment->getOrderId()]);
-        }
-    }
-
-    /**
-     * @return \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface
-     * @deprecated 100.1.1
-     */
-    private function getShipmentValidator()
-    {
-        if ($this->shipmentValidator === null) {
-            $this->shipmentValidator = $this->_objectManager->get(
-                \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface::class
-            );
+            return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setJsonData($responseAjax->toJson());
         }
 
-        return $this->shipmentValidator;
+        return $resultRedirect->setPath('sales/order/view', ['order_id' => $shipment->getOrderId()]);
     }
 }
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
index f841728416f82..c253900501d18 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -142,7 +142,7 @@ protected function setUp()
         );
         $this->messageManager = $this->createPartialMock(
             \Magento\Framework\Message\Manager::class,
-            ['addSuccess', 'addError']
+            ['addSuccessMessage', 'addErrorMessage']
         );
         $this->session = $this->createPartialMock(
             \Magento\Backend\Model\Session::class,
@@ -236,7 +236,7 @@ public function testExecute($formKeyIsValid, $isPost)
 
         if (!$formKeyIsValid || !$isPost) {
             $this->messageManager->expects($this->once())
-                ->method('addError');
+                ->method('addErrorMessage');
 
             $this->resultRedirect->expects($this->once())
                 ->method('setPath')
@@ -325,12 +325,11 @@ public function testExecute($formKeyIsValid, $isPost)
                 ->method('get')
                 ->with(\Magento\Backend\Model\Session::class)
                 ->will($this->returnValue($this->session));
-            $path = 'sales/order/view';
             $arguments = ['order_id' => $orderId];
             $shipment->expects($this->once())
                 ->method('getOrderId')
                 ->will($this->returnValue($orderId));
-            $this->prepareRedirect($path, $arguments);
+            $this->prepareRedirect($arguments);
 
             $this->shipmentValidatorMock->expects($this->once())
                 ->method('validate')
@@ -360,10 +359,9 @@ public function executeDataProvider()
     }
 
     /**
-     * @param string $path
      * @param array $arguments
      */
-    protected function prepareRedirect($path, array $arguments = [])
+    protected function prepareRedirect(array $arguments = [])
     {
         $this->actionFlag->expects($this->any())
             ->method('get')
@@ -372,14 +370,8 @@ protected function prepareRedirect($path, array $arguments = [])
         $this->session->expects($this->any())
             ->method('setIsUrlNotice')
             ->with(true);
-
-        $url = $path . '/' . (!empty($arguments) ? $arguments['order_id'] : '');
-        $this->helper->expects($this->atLeastOnce())
-            ->method('getUrl')
-            ->with($path, $arguments)
-            ->will($this->returnValue($url));
-        $this->response->expects($this->atLeastOnce())
-            ->method('setRedirect')
-            ->with($url);
+        $this->resultRedirect->expects($this->once())
+            ->method('setPath')
+            ->with('sales/order/view', $arguments);
     }
 }

From b3771a9bede66a7bcd91e2c8c6395a14464240cf Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 9 Jan 2019 12:48:51 -0600
Subject: [PATCH 547/932] MC-6283: [System Configuration] Introduce the new
 settings related to Smart buttons

- add button styles to config to get correct config path
---
 app/code/Magento/Paypal/Model/Config.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index b058ba129a33f..3205f280c09b0 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1646,6 +1646,30 @@ protected function _mapGenericStyleFieldset($fieldName)
             case 'paypal_hdrbordercolor':
             case 'paypal_payflowcolor':
                 return "paypal/style/{$fieldName}";
+            default:
+                return $this->_mapButtonStyleFieldset($fieldName);
+        }
+    }
+
+    /**
+     * Map PayPal button style config fields
+     *
+     * @param string $fieldName
+     * @return string|null
+     */
+    protected function _mapButtonStyleFieldset($fieldName)
+    {
+        $name = str_replace('checkout_page_button_','',$fieldName);
+
+        switch ($name) {
+            case 'customize':
+            case 'layout':
+            case 'size':
+            case 'color':
+            case 'shape':
+            case 'label':
+            case 'disable_funding_options':
+                return "payment/{$this->_methodCode}/{$fieldName}";
             default:
                 return null;
         }

From 6f158a957413ec64557b2bee1526dd2606fa0994 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Wed, 9 Jan 2019 22:01:48 +0300
Subject: [PATCH 548/932] MAGETWO-91688: Exception when login as restricted
 admin with access only to CMS Block

- Stabilize functional tests.
---
 ...AnAdminOrderUsingBraintreePaymentTest1.xml | 59 +++++++++++++------
 .../AdminDeleteUserActionGroup.xml            |  2 +-
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
index 0f1216d1652d1..5fc2a7c5b5fb6 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -17,20 +17,24 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-93677"/>
             <group value="braintree"/>
-            <skip>
-                <issueId value="MQE-1187" />
-            </skip>
         </annotations>
 
+
         <before>
             <!--Login As Admin-->
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+
             <!--CreateNewProduct-->
-            <actionGroup ref="CreateNewProductActionGroup" stepKey="CreateNewProduct"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
             <!--Create New Customer-->
-            <actionGroup ref="CreateCustomerActionGroup" stepKey="CreateCustomer"/>
+            <createData stepKey="createCustomer" entity="Simple_US_Customer"/>
         </before>
 
+
         <!--Configure Braintree-->
         <actionGroup ref="ConfigureBraintree" stepKey="configureBraintree"/>
 
@@ -45,42 +49,63 @@
             <argument name="role" value="adminRole"/>
         </actionGroup>
 
-        <!--Log out-->
-        <actionGroup ref="SignOut" stepKey="SignOut"/>
+        <!--SignOut-->
+        <actionGroup ref="logout" stepKey="signOutFromAdmin"/>
+
         <!--Log in as new user-->
         <actionGroup ref="LoginAsAnyUser" stepKey="LoginActionGroup">
             <argument name="uname" value="{{newAdmin.username}}"/>
             <argument name="passwd" value="{{newAdmin.password}}"/>
         </actionGroup>
+        <waitForPageLoad stepKey="waitForLogin" time="3"/>
 
         <!--Create New Order-->
-        <actionGroup ref="CreateNewOrderActionGroup" stepKey="createNewOrder"/>
+        <actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="navigateToNewOrder">
+            <argument name="customer" value="Simple_US_Customer"/>
+        </actionGroup>
+
+        <actionGroup ref="addSimpleProductToOrder" stepKey="addProduct">
+            <argument name="product" value="_defaultProduct"/>
+        </actionGroup>
+
+        <actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress">
+            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+
+        <actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"/>
+
+        <waitForPageLoad stepKey="waitForShippingToFinish"/>
+
+        <actionGroup ref="useBraintreeForMasterCard" stepKey="selectCardWithBraintree"/>
+
+        <click stepKey="submitOrder" selector="{{NewOrderSection.submitOrder}}"/>
+        <waitForPageLoad stepKey="waitForSaveConfig" time="5"/>
+        <waitForElementVisible selector="{{NewOrderSection.successMessage}}" stepKey="waitForSuccessMessage" time="1"/>
 
         <after>
+            <!-- Disable BrainTree -->
+            <actionGroup ref="DisableBrainTree" stepKey="disableBrainTree"/>
+
             <!--SignOut-->
             <actionGroup ref="SignOut" stepKey="signOutFromNewUser"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
 
             <!--Delete Product-->
-            <actionGroup ref="DeleteProductActionGroup" stepKey="DeleteAllProducts">
-                <argument name="productName" value="NewProductData.ProductName"/>
-            </actionGroup>
+            <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
 
             <!--Delete Customer-->
-            <actionGroup ref="DeleteCustomerActionGroup" stepKey="DeleteCustomer">
-                <argument name="lastName" value="NewCustomerData.LastName"/>
-            </actionGroup>
+            <deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
 
             <!--Delete created user-->
-            <actionGroup ref="DeleteCreatedUserActionGroup" stepKey="AdminDeleteUserActionGroup">
+            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="AdminDeleteUserActionGroup">
                 <argument name="user" value="adminRole"/>
             </actionGroup>
+
             <!--Delete created role-->
             <actionGroup ref="AdminDeleteCreatedRoleActionGroup" stepKey="AdminDeleteRoleActionGroup">
                 <argument name="role" value="adminRole"/>
             </actionGroup>
-            <!--Log Out-->
-            <actionGroup ref="logout" stepKey="logOut2"/>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
index 39c54b54b1222..306714a69a237 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="DeleteCreatedUserActionGroup">
+    <actionGroup name="AdminDeleteUserActionGroup">
         <arguments>
             <argument name="user"/>
         </arguments>

From 130f1ae59221964dd6c74ebf0545828cbed9a583 Mon Sep 17 00:00:00 2001
From: Suneet <suneet64@gmail.com>
Date: Thu, 10 Jan 2019 00:33:49 +0530
Subject: [PATCH 549/932] Added the Http Post Action Interface

---
 .../Review/Controller/Adminhtml/Product/JsonProductInfo.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
index 567bf4043f6f3..4b561e53d6370 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
@@ -17,7 +18,7 @@
 /**
  * Represents product info in json
  */
-class JsonProductInfo extends ProductController
+class JsonProductInfo extends ProductController implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface

From 09fbf4628e03001b7544710f32d664142a3648fb Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 9 Jan 2019 13:59:39 -0600
Subject: [PATCH 550/932] MAGETWO-95945: Add a code mess rule for improper
 session and cookies usages

---
 .../Rule/Design/CookieAndSessionMisuse.php    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
index e6acef87d3638..ee56158a54509 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
@@ -82,10 +82,12 @@ private function isControllerPlugin(\ReflectionClass $class): bool
                     //Non-existing class (autogenerated perhaps) or doesn't have an argument.
                     continue;
                 }
-                $isAction = $argument->isSubclassOf(\Magento\Framework\App\ActionInterface::class)
-                    || $argument->getName() === \Magento\Framework\App\ActionInterface::class;
-                if ($isAction) {
-                    return true;
+                if ($argument) {
+                    $isAction = $argument->isSubclassOf(\Magento\Framework\App\ActionInterface::class)
+                        || $argument->getName() === \Magento\Framework\App\ActionInterface::class;
+                    if ($isAction) {
+                        return true;
+                    }
                 }
             }
         }
@@ -109,10 +111,12 @@ private function isBlockPlugin(\ReflectionClass $class): bool
                     //Non-existing class (autogenerated perhaps) or doesn't have an argument.
                     continue;
                 }
-                $isBlock = $argument->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class)
-                    || $argument->getName() === \Magento\Framework\View\Element\BlockInterface::class;
-                if ($isBlock) {
-                    return true;
+                if ($argument) {
+                    $isBlock = $argument->isSubclassOf(\Magento\Framework\View\Element\BlockInterface::class)
+                        || $argument->getName() === \Magento\Framework\View\Element\BlockInterface::class;
+                    if ($isBlock) {
+                        return true;
+                    }
                 }
             }
         }

From 3765cc67e685c6f36f36b6beead8e8ec55c65fe2 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Wed, 9 Jan 2019 14:47:27 -0600
Subject: [PATCH 551/932] MC-5821: Update tax rule, fixed zip Utah

- Add some waitForElementVisible to try to improve test reliability
---
 .../Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
index 3ef279e4a76a2..a96a57cbfec55 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
@@ -95,7 +95,11 @@
             <argument name="address" value="US_Address_Utah" />
         </actionGroup>
         <scrollTo selector="{{StorefrontProductPageSection.orderTotal}}" x="0" y="-80" stepKey="scrollToOrderTotal"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.shipping}}" time="30" stepKey="waitForShipping"/>
+        <see selector="{{StorefrontProductPageSection.shipping}}" userInput="$5.00" stepKey="seeShipping"/>
+        <waitForElementVisible selector="{{StorefrontProductPageSection.tax}}" time="30" stepKey="waitForTax"/>
         <see selector="{{StorefrontProductPageSection.tax}}" userInput="$20.00" stepKey="seeAssertTaxAmount" />
+        <waitForElementVisible selector="{{StorefrontProductPageSection.orderTotal}}" time="30" stepKey="waitForOrderTotal"/>
         <see selector="{{StorefrontProductPageSection.orderTotal}}" userInput="$125.00" stepKey="seeAssertGrandTotal"/>
     </test>
 </tests>

From 3cf9ca6450fdec0d639ffde13dcbf30c844c200a Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Wed, 9 Jan 2019 15:29:07 -0600
Subject: [PATCH 552/932] MC-6280: [Frontend part] Implement Smart button
 component

---
 .../express-checkout-smart-buttons.js         | 128 +++++++++++++-----
 .../in-context/checkout-express.js            |  31 ++---
 2 files changed, 106 insertions(+), 53 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 817fee06c8e26..6210bfefd5d6e 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -26,21 +26,38 @@ define([
 
     return function (clientConfig, element) {
 
-        /** track chackbox status change*/
+        /**
+         *
+         * @param handler
+         */
         function onChangeValidateStatus(handler) {
             _.each(jQuery('#' + clientConfig.rendererComponent.getAgreementId()).find('input'), function (element) {
                 element.addEventListener('change', handler);
             }, this);
         }
 
+        /**
+         *
+         * @return {Boolean}
+         */
         function isValid() {
-            //todo refactor this. add  of validators insead of hardcode
-            var count = jQuery('#' + clientConfig.rendererComponent.getAgreementId()).find('input').length;
-            return count >= 0 && jQuery('#' + clientConfig.rendererComponent.getAgreementId()).find('input:checkbox:checked').length == count;
+            return clientConfig.validator.validate();
+
         }
 
+        /**
+         *
+         * @param actions
+         */
         function toggleButtons(actions) {
-            isValid() ? actions.enable() : actions.disable();
+            var id = '#agreement[1]-error';
+            if (isValid()) {
+                actions.enable()
+            } else {
+                actions.disable();
+                //hide error message
+                jQuery(id).hide();
+            }
         }
 
         paypal.Button.render({
@@ -66,14 +83,21 @@ define([
                 });
             },
 
-            onClick: function() {
-                if(clientConfig.validator.validate()) {
-                    clientConfig.rendererComponent.continueToPayPal();
+            /**
+             * Execute logic on Paypal button click
+             */
+            onClick: function () {
+                if (typeof clientConfig.onClick === "function") {
+                    clientConfig.onClick();
                 }
             },
 
-            // Set up a payment
-            payment: function (data, actions) {
+            /**
+             * Set up a payment
+             *
+             * @return {*}
+             */
+            payment: function () {
                 var params = {
                     quote_id: clientConfig.quoteId,
                     customer_id: clientConfig.customerId || "",
@@ -81,27 +105,57 @@ define([
                     form_key: clientConfig.formKey
                 };
 
-                return paypal.request.post(clientConfig.startUrl, params)
-                    .then(function (res) {
-                        if (res.success) {
-                            //add logic to process negative cases
-                            // 3. Return res.id from the response
-                            return res.token;
-                        } else {
-                            messageList.addErrorMessage({
-                                message: res.error_message
-                            });
-                        }
-                    })
-                    .catch(function (err) {
-                        throw err;
+                if (clientConfig.button) {
+                    return new paypal.Promise(function (resolve, reject) {
+                        clientConfig.additionalAction(clientConfig.messageContainer).done(function () {
+                                paypal.request.post(clientConfig.startUrl, params)
+                                    .then(function (res) {
+                                        if (res.success) {
+                                            return resolve(res.token);
+                                        } else {
+                                            return reject(new Error(res.error_message));
+                                        }
+                                    })
+                            }
+                        ).fail(
+                            function (response) {
+                                var error;
+                                try {
+                                    error = JSON.parse(response.responseText);
+                                } catch (exception) {
+                                    error = $t('Something went wrong with your request. Please try again later.');
+                                }
+                                return reject(new Error(error));
+                            }
+                        );
                     });
+                } else {
+                    return paypal.request.post(clientConfig.startUrl, params)
+                        .then(function (res) {
+                            if (res.success) {
+                                //add logic to process negative cases
+                                // 3. Return res.id from the response
+                                return res.token;
+                            } else {
+                                messageList.addErrorMessage({
+                                    message: res.error_message
+                                });
+                            }
+                        })
+                        .catch(function (err) {
+                            throw err;
+                        });
+                }
             },
-            // Execute the payment
+
+            /**
+             * Execute the payment
+             *
+             * @param data
+             * @param actions
+             * @return {*}
+             */
             onAuthorize: function (data, actions) {
-                if (clientConfig.button === 0) {
-                    //add logic to set payment method
-                }
                 var params =
                     {
                         paymentToken: data.paymentToken,
@@ -110,9 +164,6 @@ define([
                         method: clientConfig.payment.method,
                         customerId: clientConfig.customerId || '',
                         form_key: clientConfig.formKey
-                        // add email for guest customer
-                        /*email:*/
-
                     };
                 return paypal.request.post(clientConfig.onAuthorizeUrl, params)
                     .then(function (res) {
@@ -128,14 +179,23 @@ define([
                     });
 
             },
+
+            /**
+             * Process cancel action
+             *
+             * @param data
+             * @param actions
+             */
             onCancel: function (data, actions) {
                 actions.redirect(window, clientConfig.onCancelUrl);
             },
 
+            /**
+             * Process errors
+             *
+             * @param {Object} err
+             */
             onError: function (err) {
-                messageList.addErrorMessage({
-                    message: err
-                });
             }
         }, element);
     };
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index 2fe34b8f5351d..626c6cc0b3f29 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -37,7 +37,7 @@ define(
             /**
              * Render PayPal buttons using checkout.js
              */
-            renderPayPalButtons: function() {
+            renderPayPalButtons: function () {
                 this.clientConfig.payment = {
                     'method': this.item.method
                 };
@@ -47,7 +47,18 @@ define(
                 this.clientConfig.button = 0;
                 this.clientConfig.merchantId = this.merchantId;
                 this.clientConfig.validator = additionalValidators;
+                    this.clientConfig.onClick = function () {
+                        additionalValidators.validate();
+                        this.selectPaymentMethod();
+                };
+                this.clientConfig.additionalAction = setPaymentMethodAction;
                 this.clientConfig.rendererComponent = this;
+                this.clientConfig.messageContainer = this.messageContainer;
+                _.each(this.clientConfig, function (fn, name) {
+                    if (typeof fn === 'function') {
+                        this.clientConfig[name] = fn.bind(this);
+                    }
+                }, this);
                 checkoutSmartButtons(this.clientConfig, '#' + this.getButtonId());
             },
 
@@ -64,24 +75,6 @@ define(
             getAgreementId: function () {
                 return this.inContextId + '-agreement';
             },
-
-            /** Redirect to paypal */
-            continueToPayPal: function () {
-                //update payment method information if additional data was changed
-                if (additionalValidators.validate()) {
-                    this.selectPaymentMethod();
-                    setPaymentMethodAction(this.messageContainer).done(
-                        function () {
-                            customerData.invalidate(['cart']);
-                            return true;
-                        }
-                    );
-
-                    return false;
-                }
-            },
-
-
         });
     }
 );

From c060b57a5e65c2dedf3a935db1d82f0cd63926f0 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Thu, 10 Jan 2019 13:11:38 +0530
Subject: [PATCH 553/932] issus fixed #20158 Store switcher not aligned proper
 in tab view

issus fixed #20158 Store switcher not aligned proper in tab view
---
 .../Magento_Theme/web/css/source/_module.less   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index bafe1be57ee35..456cef112dcef 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -312,6 +312,23 @@
             }
         }
     }
+    .page-header{
+        .switcher {
+            .options {
+                ul.dropdown {
+                    right: 0;
+                    &:before{
+                        right: 10px;
+                        left: auto;
+                    }
+                    &:after {
+                        right: 9px;
+                        left: auto;
+                    }
+                }
+            }
+        }
+    }
 
     //
     //  Widgets

From f49a8dcdfbd808cd10d1fc6332188156898d48be Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 10 Jan 2019 10:15:32 +0200
Subject: [PATCH 554/932] MAGETWO-97526: [FT]
 Magento\Backend\Test\TestCase\LoginAfterJSMinificationTest unstable on
 Jenkins

---
 .../Backend/Test/TestCase/LoginAfterJSMinificationTest.php       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php
index 3c74618bf293e..4a6202f815b92 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/LoginAfterJSMinificationTest.php
@@ -76,7 +76,6 @@ public function test(
 
         // Steps
         $cli->setDeployModeToProduction();
-        //$this->adminDashboardPage->open();
         $this->stepFactory->create(LoginUserOnBackendStep::class)->run();
     }
 

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 555/932] 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 0fc868ced3f438b0ca3334c6569bbfea196387b2 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 10 Jan 2019 10:56:42 +0200
Subject: [PATCH 556/932] Fix static tests.

---
 .../Quote/Model/Quote/Item/ToOrderItem.php       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
index ca6b83aa50e75..6192d3471ccb0 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
@@ -48,6 +48,8 @@ public function __construct(
     }
 
     /**
+     * Convert quote item(quote address item) into order item.
+     *
      * @param Item|AddressItem $item
      * @param array $data
      * @return OrderItemInterface
@@ -66,13 +68,13 @@ public function convert($item, $data = [])
         if ($item instanceof \Magento\Quote\Model\Quote\Address\Item) {
             $orderItemData = array_merge(
                 $orderItemData,
-               $this->objectCopyService->getDataFromFieldset(
-                   'quote_convert_address_item',
-                   'to_order_item',
-                   $item
-               )
-           );
-       }
+                $this->objectCopyService->getDataFromFieldset(
+                    'quote_convert_address_item',
+                    'to_order_item',
+                    $item
+                )
+            );
+        }
         if (!$item->getNoDiscount()) {
             $data = array_merge(
                 $data,

From 651a5267c43e694d9309953160d3620fdbcb5603 Mon Sep 17 00:00:00 2001
From: Yevhen Sentiabov <isentiabov@magento.com>
Date: Thu, 10 Jan 2019 11:23:54 +0200
Subject: [PATCH 557/932] MAGETWO-97397: A new customer created via an admin
 order has their Customer Group set to the Default customer group on the
 default website scope

  - Set default customer group as selected in the dropdown
---
 .../Adminhtml/Order/Create/Form/Account.php   | 50 ++++++++--
 .../Order/Create/Form/AccountTest.php         | 93 +++++++++++++++----
 2 files changed, 115 insertions(+), 28 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 26379a05fe694..bb24d2ae15a34 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Create order account form
@@ -132,15 +133,8 @@ protected function _prepareForm()
         $this->_addAttributesToForm($attributes, $fieldset);
 
         $this->_form->addFieldNameSuffix('order[account]');
-
-        $formValues = $this->getFormValues();
-        foreach ($attributes as $code => $attribute) {
-            $defaultValue = $attribute->getDefaultValue();
-            if (isset($defaultValue) && !isset($formValues[$code])) {
-                $formValues[$code] = $defaultValue;
-            }
-        }
-        $this->_form->setValues($formValues);
+        $storeId = (int)$this->_sessionQuote->getStoreId();
+        $this->_form->setValues($this->extractValuesFromAttributes($attributes, $storeId));
 
         return $this;
     }
@@ -193,4 +187,42 @@ public function getFormValues()
 
         return $data;
     }
+
+    /**
+     * Extract the form values from attributes.
+     *
+     * @param array $attributes
+     * @param int $storeId
+     * @return array
+     */
+    private function extractValuesFromAttributes(array $attributes, int $storeId): array
+    {
+        $formValues = $this->getFormValues();
+        foreach ($attributes as $code => $attribute) {
+            $defaultValue = $attribute->getDefaultValue();
+            if (isset($defaultValue) && !isset($formValues[$code])) {
+                $formValues[$code] = $defaultValue;
+            }
+            if ($code === 'group_id' && empty($defaultValue)) {
+                $formValues[$code] = $this->getDefaultCustomerGroup($storeId);
+            }
+        }
+
+        return $formValues;
+    }
+
+    /**
+     * Gets default customer group.
+     *
+     * @param int $storeId
+     * @return string|null
+     */
+    private function getDefaultCustomerGroup(int $storeId): ?string
+    {
+        return $this->_scopeConfig->getValue(
+            'customer/create_account/default_group',
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
index 999522a49e006..b289e9b94558e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
@@ -11,26 +11,37 @@
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
 use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
+use Magento\Customer\Model\Data\Option;
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Customer\Model\Metadata\FormFactory;
 use Magento\Framework\View\LayoutInterface;
 use Magento\Quote\Model\Quote;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @magentoAppArea adminhtml
  */
 class AccountTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var Account */
+    /**
+     * @var Account
+     */
     private $accountBlock;
 
     /**
-     * @var Bootstrap
+     * @var ObjectManager
      */
     private $objectManager;
 
+    /**
+     * @var SessionQuote|MockObject
+     */
+    private $session;
+
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      */
@@ -38,19 +49,23 @@ protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $quote = $this->objectManager->create(Quote::class)->load(1);
-        $sessionQuoteMock = $this->getMockBuilder(
-            SessionQuote::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getCustomerId', 'getStore', 'getStoreId', 'getQuote']
-        )->getMock();
-        $sessionQuoteMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
-        $sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quote));
+
+        $this->session = $this->getMockBuilder(SessionQuote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerId', 'getStore', 'getStoreId', 'getQuote', 'getQuoteId'])
+            ->getMock();
+        $this->session->method('getCustomerId')
+            ->willReturn(1);
+        $this->session->method('getQuote')
+            ->willReturn($quote);
+        $this->session->method('getQuoteId')
+            ->willReturn($quote->getId());
         /** @var LayoutInterface $layout */
         $layout = $this->objectManager->get(LayoutInterface::class);
         $this->accountBlock = $layout->createBlock(
             Account::class,
             'address_block' . rand(),
-            ['sessionQuote' => $sessionQuoteMock]
+            ['sessionQuote' => $this->session]
         );
         parent::setUp();
     }
@@ -62,13 +77,13 @@ public function testGetForm()
     {
         $expectedFields = ['group_id', 'email'];
         $form = $this->accountBlock->getForm();
-        $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
+        self::assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
         $fieldset = $form->getElements()[0];
 
-        $this->assertEquals(count($expectedFields), $fieldset->getElements()->count());
+        self::assertEquals(count($expectedFields), $fieldset->getElements()->count());
 
         foreach ($fieldset->getElements() as $element) {
-            $this->assertTrue(
+            self::assertTrue(
                 in_array($element->getId(), $expectedFields),
                 sprintf('Unexpected field "%s" in form.', $element->getId())
             );
@@ -79,6 +94,7 @@ public function testGetForm()
      * Tests a case when user defined custom attribute has default value.
      *
      * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoConfigFixture current_store customer/create_account/default_group 3
      */
     public function testGetFormWithUserDefinedAttribute()
     {
@@ -91,18 +107,27 @@ public function testGetFormWithUserDefinedAttribute()
 
         $form = $accountBlock->getForm();
         $form->setUseContainer(true);
+        $content = $form->toHtml();
 
-        $this->assertContains(
+        self::assertContains(
             '<option value="1" selected="selected">Yes</option>',
-            $form->toHtml(),
-            'Default value for user defined custom attribute should be selected'
+            $content,
+            'Default value for user defined custom attribute should be selected.'
+        );
+
+        self::assertContains(
+            '<option value="3" selected="selected">Customer Group 1</option>',
+            $content,
+            'The Customer Group specified for the chosen store should be selected.'
         );
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * Creates a mock for Form object.
+     *
+     * @return MockObject
      */
-    private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
+    private function getFormFactoryMock(): MockObject
     {
         /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
         $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
@@ -113,11 +138,12 @@ private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
             ->setDefaultValue('1')
             ->setFrontendLabel('Yes/No');
 
+        /** @var Form|MockObject $form */
         $form = $this->getMockBuilder(Form::class)
             ->disableOriginalConstructor()
             ->getMock();
         $form->method('getUserAttributes')->willReturn([$booleanAttribute]);
-        $form->method('getSystemAttributes')->willReturn([]);
+        $form->method('getSystemAttributes')->willReturn([$this->createCustomerGroupAttribute()]);
 
         $formFactory = $this->getMockBuilder(FormFactory::class)
             ->disableOriginalConstructor()
@@ -126,4 +152,33 @@ private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
 
         return $formFactory;
     }
+
+    /**
+     * Creates a customer group attribute object.
+     *
+     * @return AttributeMetadataInterface
+     */
+    private function createCustomerGroupAttribute(): AttributeMetadataInterface
+    {
+        /** @var Option $option1 */
+        $option1 = $this->objectManager->create(Option::class);
+        $option1->setValue(3);
+        $option1->setLabel('Customer Group 1');
+
+        /** @var Option $option2 */
+        $option2 = $this->objectManager->create(Option::class);
+        $option2->setValue(4);
+        $option2->setLabel('Customer Group 2');
+
+        /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
+        $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
+        $attribute = $attributeMetadataFactory->create()
+            ->setAttributeCode('group_id')
+            ->setBackendType('static')
+            ->setFrontendInput('select')
+            ->setOptions([$option1, $option2])
+            ->setIsRequired(true);
+
+        return $attribute;
+    }
 }

From 79e16e1e21b8ee1d7b736a3916b4349620c4ac2a Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Thu, 10 Jan 2019 11:26:44 +0200
Subject: [PATCH 558/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Controller/Adminhtml/Import/ValidateTest.php      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
index 9afce0ed10bcd..a3cf42b48489f 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
 use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\HTTP\Adapter\FileTransferFactory;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
@@ -25,7 +27,7 @@ class ValidateTest extends \Magento\TestFramework\TestCase\AbstractBackendContro
      * @magentoDbIsolation enabled
      * @SuppressWarnings(PHPMD.Superglobals)
      */
-    public function testValidationReturn(string $fileName, string $mimeType, string $message, string $delimiter)
+    public function testValidationReturn(string $fileName, string $mimeType, string $message, string $delimiter): void
     {
         $validationStrategy = ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_STOP_ON_ERROR;
 
@@ -62,10 +64,7 @@ public function testValidationReturn(string $fileName, string $mimeType, string
 
         $this->_objectManager->configure(
             [
-                'preferences' => [
-                    \Magento\Framework\HTTP\Adapter\FileTransferFactory::class =>
-                        \Magento\ImportExport\Controller\Adminhtml\Import\HttpFactoryMock::class
-                ]
+                'preferences' => [FileTransferFactory::class => HttpFactoryMock::class]
             ]
         );
 
@@ -82,7 +81,7 @@ public function testValidationReturn(string $fileName, string $mimeType, string
     /**
      * @return array
      */
-    public function validationDataProvider()
+    public function validationDataProvider(): array
     {
         return [
             [

From e1abd4a0274e241e7ef50fa0e5b43dd5530bafab Mon Sep 17 00:00:00 2001
From: amol 2jcommerce <amol@2jcommerce.in>
Date: Thu, 10 Jan 2019 17:18:51 +0530
Subject: [PATCH 559/932] Changes for
 Product-per-row-not-proper-on-listing-page

---
 .../web/css/source/module/_listings.less               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index 6bf766b7400a7..3cb3d4af53189 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -42,7 +42,7 @@
 
             .products-grid & {
                 display: inline-block;
-                width: 100%/2;
+                width: 100%/2.04;
             }
 
             &:extend(.abs-add-box-sizing all);
@@ -363,7 +363,7 @@
     .products-grid {
         .product-item {
             margin-bottom: @indent__base;
-            width: 100%/3;
+            width: 100%/3.04;
         }
     }
 
@@ -374,7 +374,7 @@
     .page-products.page-layout-3columns {
         .products-grid {
             .product-item {
-                width: 100%/3;
+                width: 100%/3.04;
             }
         }
     }
@@ -388,7 +388,7 @@
     .page-products {
         .products-grid {
             .product-item {
-                width: 100%/3;
+                width: 100%/3.04;
             }
         }
     }
@@ -443,7 +443,7 @@
             .product-item {
                 margin-left: calc(~'(100% - 4 * 24.439%) / 3');
                 padding: 5px;
-                width: 24.439%;
+                width: 24.09%;
 
                 &:nth-child(4n + 1) {
                     margin-left: 0;

From fe78cec2b588db90263a188a1980dfd2c606ea31 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 10 Jan 2019 11:56:45 +0000
Subject: [PATCH 560/932] magento/magento2#20144: Fixed code style

---
 .../web/css/source/module/checkout/_payment-options.less        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
index d87b4b70caffa..47754c9acee4d 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -69,7 +69,7 @@
 
         .payment-option-content {
             .lib-css(padding, 0 0 @indent__base @checkout-payment-option-content__padding__xl);
-            .action-apply{
+            .action-apply {
                 margin-right: 0;
             }
         }

From eed3bc376b8afa124effb1870fd2ab20ac433b14 Mon Sep 17 00:00:00 2001
From: Suneet <suneet64@gmail.com>
Date: Thu, 10 Jan 2019 17:59:57 +0530
Subject: [PATCH 561/932] Reverted back the implemented interface and changed
 the client method

---
 app/code/Magento/Review/Block/Adminhtml/Add.php               | 2 +-
 .../Review/Controller/Adminhtml/Product/JsonProductInfo.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
index 96dd02e65f18a..c5600fe061003 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -56,7 +56,7 @@ protected function _construct()
                     },
                     loadProductData : function() {
                         jQuery.ajax({
-                            type: "POST",
+                            type: "GET",
                             url: review.productInfoUrl,
                             data: {
                                 form_key: FORM_KEY
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
index 4b561e53d6370..db336d0c2f563 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
@@ -18,7 +18,7 @@
 /**
  * Represents product info in json
  */
-class JsonProductInfo extends ProductController implements HttpPostActionInterface
+class JsonProductInfo extends ProductController implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface

From e99d90a30264bc4c3140dcb814bde5f1bb8d1347 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 10 Jan 2019 14:35:39 +0200
Subject: [PATCH 562/932] Fix static tests.

---
 app/code/Magento/Wishlist/Block/Customer/Wishlist.php    | 8 +++++---
 app/code/Magento/Wishlist/composer.json                  | 1 +
 .../blank/Magento_Wishlist/web/css/source/_module.less   | 9 +++++----
 .../luma/Magento_Wishlist/web/css/source/_module.less    | 9 +++++----
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index cc9c95935eada..d02f2229401c1 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -5,13 +5,13 @@
  */
 
 /**
- * Wishlist block customer items
- *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Wishlist\Block\Customer;
 
 /**
+ * Wishlist block customer items.
+ *
  * @api
  * @since 100.0.2
  */
@@ -86,6 +86,7 @@ protected function _prepareCollection($collection)
      * Paginate Wishlist Product Items collection
      *
      * @return void
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     private function paginateCollection()
     {
@@ -252,6 +253,7 @@ public function getAddToCartQty(\Magento\Wishlist\Model\Item $item)
 
     /**
      * Get add all to cart params for POST request
+     *
      * @return string
      */
     public function getAddAllToCartParams()
@@ -263,7 +265,7 @@ public function getAddAllToCartParams()
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index ce43f6faae200..ad2fe8e2b04d1 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -15,6 +15,7 @@
         "magento/module-rss": "*",
         "magento/module-sales": "*",
         "magento/module-store": "*",
+        "magento/module-theme": "*",
         "magento/module-ui": "*"
     },
     "suggest": {
diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
index 83c5c4095a38d..3746df14b9c62 100644
--- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
@@ -9,18 +9,19 @@
 
 & when (@media-common = true) {
     .toolbar {
-        &.wishlist-toolbar{
+        &.wishlist-toolbar {
             .limiter {
                 float: right;
             }
             .main .pages {
                 display: inline-block;
-                z-index: 0;
                 position: relative;
+                z-index: 0;
             }
-            .toolbar-amount, .limiter {
-                z-index: 1;
+            .toolbar-amount,
+            .limiter {
                 display: inline-block;
+                z-index: 1;
             }
         }
     }
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 3213c035df412..a3896e41c94bc 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -9,18 +9,19 @@
 
 & when (@media-common = true) {
     .toolbar {
-        &.wishlist-toolbar{
+        &.wishlist-toolbar {
             .limiter {
                 float: right;
             }
             .main .pages {
                 display: inline-block;
-                z-index: 0;
                 position: relative;
+                z-index: 0;
             }
-            .toolbar-amount, .limiter {
-                z-index: 1;
+            .toolbar-amount,
+            .limiter {
                 display: inline-block;
+                z-index: 1;
             }
         }
     }

From 84ea8d3904acdc5b910a25bd27d6442cf1adc2a6 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Thu, 10 Jan 2019 15:02:16 +0200
Subject: [PATCH 563/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../CatalogImportExport/Model/Import/Product.php      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 4ee074cc796cc..1847ffc70758d 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -796,6 +796,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param StockItemImporterInterface|null $stockItemImporter
      * @param DateTimeFactory $dateTimeFactory
      * @param ProductRepositoryInterface|null $productRepository
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\FileSystemException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -914,7 +916,7 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData, $
     {
         if (!$this->validator->isAttributeValid($attrCode, $attrParams, $rowData)) {
             foreach ($this->validator->getMessages() as $message) {
-                $this->skipRow($rowNum, $message, null, $attrCode);
+                $this->skipRow($rowNum, $message, ProcessingError::ERROR_LEVEL_NOT_CRITICAL, $attrCode);
             }
             return false;
         }
@@ -2462,7 +2464,12 @@ public function validateRow(array $rowData, $rowNum)
 
         if (!$this->validator->isValid($rowData)) {
             foreach ($this->validator->getMessages() as $message) {
-                $this->skipRow($rowNum, $message, null, $this->validator->getInvalidAttribute());
+                $this->skipRow(
+                    $rowNum,
+                    $message,
+                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL,
+                    $this->validator->getInvalidAttribute()
+                );
             }
         }
 

From 4b0eeb6a6d933c92416cd6eca48d720d48508d61 Mon Sep 17 00:00:00 2001
From: Milind Singh <milind7@live.com>
Date: Thu, 10 Jan 2019 17:27:15 +0530
Subject: [PATCH 564/932] Order API resources updated.

---
 app/code/Magento/Sales/etc/webapi.xml | 90 +++++++++++++--------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/app/code/Magento/Sales/etc/webapi.xml b/app/code/Magento/Sales/etc/webapi.xml
index cee245e348393..492dff8057039 100644
--- a/app/code/Magento/Sales/etc/webapi.xml
+++ b/app/code/Magento/Sales/etc/webapi.xml
@@ -10,271 +10,271 @@
     <route url="/V1/orders/:id" method="GET">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders" method="GET">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/:id/statuses" method="GET">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="getStatus"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/:id/cancel" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="cancel"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::cancel" />
         </resources>
     </route>
     <route url="/V1/orders/:id/emails" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::emails" />
         </resources>
     </route>
     <route url="/V1/orders/:id/hold" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="hold"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::hold" />
         </resources>
     </route>
     <route url="/V1/orders/:id/unhold" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="unHold"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::unhold" />
         </resources>
     </route>
     <route url="/V1/orders/:id/comments" method="POST">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="addComment"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::comment" />
         </resources>
     </route>
     <route url="/V1/orders/:id/comments" method="GET">
         <service class="Magento\Sales\Api\OrderManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/create" method="PUT">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::create" />
         </resources>
     </route>
     <route url="/V1/orders/:parent_id" method="PUT">
         <service class="Magento\Sales\Api\OrderAddressRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::create" />
         </resources>
     </route>
     <route url="/V1/orders/items/:id" method="GET">
         <service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/orders/items" method="GET">
         <service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::actions_view" />
         </resources>
     </route>
     <route url="/V1/invoices/:id" method="GET">
         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices" method="GET">
         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/comments" method="GET">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/emails" method="POST">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/void" method="POST">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="setVoid"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/:id/capture" method="POST">
         <service class="Magento\Sales\Api\InvoiceManagementInterface" method="setCapture"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/comments" method="POST">
         <service class="Magento\Sales\Api\InvoiceCommentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoices/" method="POST">
         <service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/invoice/:invoiceId/refund" method="POST">
         <service class="Magento\Sales\Api\RefundInvoiceInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_invoice" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id/comments" method="GET">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemos" method="GET">
         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id" method="GET">
         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id" method="PUT">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="cancel"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id/emails" method="POST">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/refund" method="POST">
         <service class="Magento\Sales\Api\CreditmemoManagementInterface" method="refund"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo/:id/comments" method="POST">
         <service class="Magento\Sales\Api\CreditmemoCommentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/creditmemo" method="POST">
         <service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::sales_creditmemo" />
         </resources>
     </route>
     <route url="/V1/order/:orderId/refund" method="POST">
         <service class="Magento\Sales\Api\RefundOrderInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::creditmemo" />
         </resources>
     </route>
     <route url="/V1/shipment/:id" method="GET">
         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipments" method="GET">
         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/comments" method="GET">
         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="getCommentsList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/comments" method="POST">
         <service class="Magento\Sales\Api\ShipmentCommentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/emails" method="POST">
         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="notify"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/track" method="POST">
         <service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/track/:id" method="DELETE">
         <service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="deleteById"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/" method="POST">
         <service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/shipment/:id/label" method="GET">
         <service class="Magento\Sales\Api\ShipmentManagementInterface" method="getLabel"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::shipment" />
         </resources>
     </route>
     <route url="/V1/order/:orderId/ship" method="POST">
         <service class="Magento\Sales\Api\ShipOrderInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::ship" />
         </resources>
     </route>
     <route url="/V1/orders/" method="POST">
         <service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::create" />
         </resources>
     </route>
     <route url="/V1/transactions/:id" method="GET">
         <service class="Magento\Sales\Api\TransactionRepositoryInterface" method="get"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::transactions_fetch" />
         </resources>
     </route>
     <route url="/V1/transactions" method="GET">
         <service class="Magento\Sales\Api\TransactionRepositoryInterface" method="getList"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::transactions_fetch" />
         </resources>
     </route>
     <route url="/V1/order/:orderId/invoice" method="POST">
         <service class="Magento\Sales\Api\InvoiceOrderInterface" method="execute"/>
         <resources>
-            <resource ref="Magento_Sales::sales" />
+            <resource ref="Magento_Sales::invoice" />
         </resources>
     </route>
 </routes>

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 565/932] 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 c4e63e910effeeb8b69f2721db36682cfd5af16d Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Thu, 10 Jan 2019 17:21:08 +0300
Subject: [PATCH 566/932] MAGETWO-91688: Exception when login as restricted
 admin with access only to CMS Block

- Stabilize functional tests.
---
 .../Mftf/ActionGroup/AdminRoleActionGroup.xml | 51 +++++++++++++++++
 .../Mftf/ActionGroup/AdminUserActionGroup.xml | 56 +++++++++++++++++++
 .../Mftf/Section/AdminCreateRoleSection.xml   | 24 ++++++++
 ...AnAdminOrderUsingBraintreePaymentTest1.xml | 32 +++++------
 .../AdminCreateRoleActionGroup.xml            | 18 ++++++
 .../AdminDeleteUserActionGroup.xml            | 18 ++++++
 6 files changed, 180 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
 create mode 100644 app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
 create mode 100644 app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml

diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
new file mode 100644
index 0000000000000..6fde2820a1483
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <actionGroup name="GoToUserRoles">
+        <click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
+        <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
+        <click selector="//span[contains(text(), 'User Roles')]" stepKey="clickToSelectUserRoles"/>
+        <waitForPageLoad stepKey="waitForUserRolesPageToOpen"/>
+    </actionGroup>
+
+    <!--Create new role-->
+    <actionGroup name="AdminCreateNewRole">
+        <arguments>
+            <argument name="role" type="string" defaultValue=""/>
+            <argument name="resource" type="string" defaultValue="All"/>
+            <argument name="scope" type="string" defaultValue="Custom"/>
+            <argument name="websites" type="string" defaultValue="Main Website"/>
+        </arguments>
+        <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
+        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
+        <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
+        <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
+        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
+        <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see userInput="You saved the role." stepKey="seeSuccessMessage" />
+    </actionGroup>
+
+
+    <!--Delete role-->
+    <actionGroup name="AdminDeleteRoleActionGroup">
+        <arguments>
+            <argument name="role" defaultValue=""/>
+        </arguments>
+        <click stepKey="clickOnRole" selector="{{AdminDeleteRoleSection.theRole}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteRoleSection.current_pass}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click stepKey="clickToDeleteRole" selector="{{AdminDeleteRoleSection.delete}}"/>
+        <waitForAjaxLoad stepKey="waitForDeleteConfirmationPopup" time="5"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteRoleSection.confirm}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
new file mode 100644
index 0000000000000..6ba8d2d76f8d4
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
+    <!--Go to all users-->
+    <actionGroup name="GoToAllUsers">
+        <click selector="{{AdminCreateUserSection.system}}" stepKey="clickOnSystemIcon"/>
+        <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
+        <click selector="{{AdminCreateUserSection.allUsers}}" stepKey="clickToSelectUserRoles"/>
+        <waitForPageLoad stepKey="waitForUserRolesPageToOpen"/>
+    </actionGroup>
+
+    <!--Create new user with specified role-->
+    <actionGroup name="AdminCreateUserAction">
+        <click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
+        <waitForPageLoad stepKey="waitForNewUserPageLoad" time="10"/>
+        <fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{NewAdmin.username}}" stepKey="enterUserName" />
+        <fillField selector="{{AdminCreateUserSection.firstNameTextField}}" userInput="{{NewAdmin.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{AdminCreateUserSection.lastNameTextField}}" userInput="{{NewAdmin.lastName}}" stepKey="enterLastName" />
+        <fillField selector="{{AdminCreateUserSection.emailTextField}}" userInput="{{NewAdmin.email}}" stepKey="enterEmail" />
+        <fillField selector="{{AdminCreateUserSection.passwordTextField}}" userInput="{{NewAdmin.password}}" stepKey="enterPassword" />
+        <fillField selector="{{AdminCreateUserSection.pwConfirmationTextField}}" userInput="{{NewAdmin.password}}" stepKey="confirmPassword" />
+        <fillField selector="{{AdminCreateUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
+        <scrollToTopOfPage stepKey="scrollToTopOfPage" />
+        <click selector="{{AdminCreateUserSection.userRoleTab}}" stepKey="clickUserRole" />
+        <waitForAjaxLoad stepKey="waitForRoles" time="5"/>
+        <fillField selector="{{AdminCreateRoleSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
+        <click selector="{{AdminCreateRoleSection.searchButton}}" stepKey="clickSearch" />
+        <waitForPageLoad stepKey="waitForSearch" time="10"/>
+        <click selector="{{AdminCreateRoleSection.searchResultFirstRow}}" stepKey="selectRole" />
+        <click selector="{{AdminCreateUserSection.saveButton}}" stepKey="clickSaveUser" />
+        <waitForPageLoad stepKey="waitForSaveUser" time="10"/>
+        <see userInput="You saved the user." stepKey="seeSuccessMessage" />
+    </actionGroup>
+
+
+    <!--Delete User-->
+    <actionGroup name="AdminDeleteNewUserActionGroup">
+
+        <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
+        <waitForPageLoad stepKey="waitForDeletePopupOpen" time="5"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
new file mode 100644
index 0000000000000..65f9b8d657da4
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminCreateRoleSection">
+        <element name="create" type="button" selector="#add"/>
+        <element name="name" type="button" selector="#role_name"/>
+        <element name="password" type="input" selector="#current_password"/>
+        <element name="roleResources" type="button" selector="#role_info_tabs_account"/>
+        <element name="roleResource" type="button" selector="#gws_is_all"/>
+        <element name="resourceValue" type="button" selector="//*[text()='{{arg1}}']" parameterized="true"/>
+        <element name="roleScope" type="button" selector="#all"/>
+        <element name="scopeValue" type="button" selector="//select[@id='all']/*[text()='{{arg2}}']" parameterized="true"/>
+        <element name="website" type="checkbox" selector="//*[contains(text(), '{{arg3}}')]" parameterized="true"/>
+        <element name="save" type="button" selector="//button[@title='Save Role']"/>
+        <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
+        <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
+        <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
index 5fc2a7c5b5fb6..c474df6f7e696 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -39,24 +39,20 @@
         <actionGroup ref="ConfigureBraintree" stepKey="configureBraintree"/>
 
         <!--Create New Role-->
-        <actionGroup ref="AdminCreateRoleActionGroup" stepKey="adminCreateRole">
-            <argument name="restrictedRole" value="Sales"/>
-            <argument name="User" value="adminRole"/>
-        </actionGroup>
+        <actionGroup ref="GoToUserRoles" stepKey="GoToUserRoles"/>
+        <waitForPageLoad stepKey="waitForAllRoles" time="15"/>
+        <actionGroup ref="AdminCreateNewRole" stepKey="AdminCreateNewRole"/>
 
         <!--Create new admin user-->
-        <actionGroup ref="AdminCreateUserActionGroup" stepKey="adminCreateUser">
-            <argument name="role" value="adminRole"/>
-        </actionGroup>
+        <actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
+        <waitForPageLoad stepKey="waitForUsers" time="15"/>
+        <actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
 
         <!--SignOut-->
         <actionGroup ref="logout" stepKey="signOutFromAdmin"/>
 
         <!--Log in as new user-->
-        <actionGroup ref="LoginAsAnyUser" stepKey="LoginActionGroup">
-            <argument name="uname" value="{{newAdmin.username}}"/>
-            <argument name="passwd" value="{{newAdmin.password}}"/>
-        </actionGroup>
+        <actionGroup ref="LoginNewUser" stepKey="signInNewUser"/>
         <waitForPageLoad stepKey="waitForLogin" time="3"/>
 
         <!--Create New Order-->
@@ -97,15 +93,13 @@
             <!--Delete Customer-->
             <deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
 
-            <!--Delete created user-->
-            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="AdminDeleteUserActionGroup">
-                <argument name="user" value="adminRole"/>
-            </actionGroup>
+            <!--Delete User -->
+            <actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>
+            <actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
 
-            <!--Delete created role-->
-            <actionGroup ref="AdminDeleteCreatedRoleActionGroup" stepKey="AdminDeleteRoleActionGroup">
-                <argument name="role" value="adminRole"/>
-            </actionGroup>
+            <!--Delete Role-->
+            <actionGroup ref="GoToUserRoles" stepKey="GoBackToUserRoles"/>
+            <actionGroup ref="AdminDeleteRoleActionGroup" stepKey="AdminDeleteRoleActionGroup"/>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
index 7fec1b95bdddb..da08ac469b7c4 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
@@ -24,4 +24,22 @@
         <click selector="{{AdminEditRoleInfoSection.saveButton}}" stepKey="clickSaveRoleButton" />
         <waitForPageLoad stepKey="waitForPageLoad2" />
     </actionGroup>
+    <!--Create new role-->
+    <actionGroup name="AdminCreateRole">
+        <arguments>
+            <argument name="role" type="string" defaultValue=""/>
+            <argument name="resource" type="string" defaultValue="All"/>
+            <argument name="scope" type="string" defaultValue="Custom"/>
+            <argument name="websites" type="string" defaultValue="Main Website"/>
+        </arguments>
+        <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
+        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
+        <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
+        <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
+        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
+        <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see userInput="You saved the role." stepKey="seeSuccessMessage" />
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
index 306714a69a237..9b7342e531b66 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
@@ -22,4 +22,22 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see stepKey="seeDeleteMessageForUser" userInput="You deleted the user."/>
     </actionGroup>
+    <actionGroup name="AdminDeleteCustomUserActionGroup">
+        <arguments>
+            <argument name="user"/>
+        </arguments>
+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToUserGrid" />
+        <fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{user.username}}" stepKey="enterUserName" />
+        <click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch" />
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
+        <see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user.username}}" stepKey="seeUser" />
+        <click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="openUserEdit"/>
+        <waitForPageLoad stepKey="waitForUserEditPageLoad"/>
+        <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword" />
+        <click selector="{{AdminMainActionsSection.delete}}" stepKey="deleteUser"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForSave" />
+        <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the user." stepKey="seeUserDeleteMessage"/>
+    </actionGroup>
 </actionGroups>

From a2429f1023114c64583f8dc0b199c3369d583af4 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Thu, 10 Jan 2019 08:50:20 -0600
Subject: [PATCH 567/932] MC-4385: Convert MoveCategoryEntityTest to MFTF

---
 .../Catalog/Test/Mftf/Data/CategoryData.xml   |   6 +
 .../Section/StorefrontNavigationSection.xml   |   1 +
 ...eAnchoredCategoryToDefaultCategoryTest.xml | 112 ++++++++++++++++++
 ...minMoveCategoryAndCheckUrlRewritesTest.xml |  98 +++++++++++++++
 ...CategoryFromParentAnchoredCategoryTest.xml | 102 ++++++++++++++++
 .../Section/AdminUrlRewriteIndexSection.xml   |   5 +
 6 files changed, 324 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index ff3c5cb4403bf..8ee9b294673dc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -62,4 +62,10 @@
         <data key="name" unique="suffix">FifthLevelCategory</data>
         <data key="name_lwr" unique="suffix">category</data>
     </entity>
+    <entity name="SubCategory" type="category">
+        <data key="name" unique="suffix">SubCategory</data>
+        <data key="name_lwr" unique="suffix">subcategory</data>
+        <data key="is_active">true</data>
+        <data key="include_in_menu">true</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
index e8f35fc6787b7..c6bad0efb3ca7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontNavigationSection.xml
@@ -11,5 +11,6 @@
         <element name="topCategory" type="button" selector="//a[contains(@class,'level-top')]/span[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="subCategory" type="button" selector="//ul[contains(@class,'submenu')]//span[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="breadcrumbs" type="textarea" selector=".items"/>
+        <element name="categoryBreadcrumbs" type="textarea" selector=".breadcrumbs li"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
new file mode 100644
index 0000000000000..50403dfa0668d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
@@ -0,0 +1,112 @@
+<?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="AdminMoveAnchoredCategoryToDefaultCategoryTest">
+        <annotations>
+            <stories value="Move categories"/>
+            <title value="Move default anchored subcategory with anchored parent to default subcategory"/>
+            <description value="Login as admin,move anchored subcategory with anchored parent to default subcategory"/>
+            <testCaseId value="MC-6493"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+            <features value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
+            <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Open Category Page-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <!--Create Subcategory under Anchored category and select product-->
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <!--Select Display Setting and verify Anchor option is enabled in First level Category-->
+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <!--Create Second level anchored category-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="addSubCategoryName"/>
+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting1"/>
+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting1"/>
+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor1"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave1"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage1"/>
+        <!--Create Third level anchored category and add a product-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName1"/>
+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting2"/>
+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting2"/>
+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor2"/>
+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory1"/>
+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory2"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
+        <!--Check Category breadcrumbs in store  front page-->
+        <amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
+        <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
+        <!--<Verify category displayed in store front page-->
+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
+        <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
+        <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{FirstLevelSubCat.name}}, {{SimpleSubCategory.name}}]</expectedResult>
+        <actualResult type="variable">breadcrumbs</actualResult>
+        </assertEquals>
+        <!--Verify Product displayed in category store front page-->
+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
+        <waitForPageLoad  stepKey="waitForProductToLoad1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
+        <!--Open Category Page-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <!--Move SubCategory under Default Category-->
+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
+        <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
+        <waitForPageLoad  stepKey="waitForStoreFrontPageLoad1"/>
+        <!--Verify breadcrumbs in store front page after the move-->
+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbsAfterMove"/>
+        <assertEquals  stepKey="verifyBreadcrumbsInFrontPageAfterMove">
+            <expectedResult type="array">['Home',{{SimpleSubCategory.name}}]</expectedResult>
+            <actualResult type="variable">breadcrumbsAfterMove</actualResult>
+        </assertEquals>
+        <!--Open Category in store front-->
+        <amOnPage url="{{StorefrontCategoryPage.url(SimpleSubCategory.name)}}"  stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleSubCategory.name)}}" stepKey="seeCategoryInTitle"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct1"/>
+        <waitForPageLoad  stepKey="waitForProductToLoad2"/>
+        <!--Verify product name on Store Front-->
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductNameAfterMove"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
new file mode 100644
index 0000000000000..4515c7c7ef9ee
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
@@ -0,0 +1,98 @@
+<?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="AdminMoveCategoryAndCheckUrlRewritesTest">
+        <annotations>
+            <stories value="Move categories"/>
+            <title value="URL Rewrites for subcategories during creation and move"/>
+            <description value="Login as admin, move category from one to another and check category url rewrites"/>
+            <testCaseId value="MC-6494"/>
+            <features value="Catalog"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Open category page and select created category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <!--Create second level category-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SubCategory.name}}" stepKey="addSubCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave1"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage1"/>
+        <!--Create third level category under second level category-->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName1"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory2"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#" />
+        <!--Open Url Rewrite Page-->
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
+        <waitForPageLoad stepKey="waitForUrlRewritePage"/>
+        <!--Search third level category Redirect Path, Target Path and Redirect Type-->
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="fillRedirectPathFilter"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad0"/>
+        <!--Verify Category RedirectType-->
+        <see stepKey="verifyTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="No" />
+        <!--Verify Redirect Path -->
+        <!--ToDo Need to update and remove '2' from the userInput, url key value output has 2 added on it-->
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="verifyTheRedirectPath"/>
+        <!--Verify Category Target Path-->
+        <see stepKey="verifyTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn(1)}}" userInput="catalog/category/view/id/{$categoryId}"/>
+        <!--Open Category Page -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <!--Move the third level category under first level category -->
+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="moveCategory"/>
+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
+        <!--Open Url Rewrite page  -->
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage1"/>
+        <waitForPageLoad stepKey="waitForUrlRewritePage1"/>
+        <!--ToDo Need to update and remove '2' from the userInput, url key value output has 2 added on it-->
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" stepKey="fillCategoryUrlKey1"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
+        <!--Verify new RedirectType after move -->
+        <see stepKey="verifyTheRedirectTypeAfterMove" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="No" />
+        <!--Verify new Redirect Path after move -->
+        <see stepKey="verifyTheRequestPathAfterMove" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(2)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
+        <!--Verify new Target Path after move -->
+        <see stepKey="verifyTheTargetPathAfterMove" selector="{{AdminUrlRewriteIndexSection.targetPathColumn(1)}}" userInput="catalog/category/view/id/{$categoryId}" />
+        <!--Verify before move Redirect Path displayed with associated Target Path and Redirect Type-->
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="fillCategoryUrlKey2"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton2"/>
+        <see stepKey="verifyTheRedirectTypeAfterMove1" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="Permanent (301)" />
+        <!--ToDo Need to update and remove '2' from the userInput, url key value output has 2 added on it-->
+        <see stepKey="verifyTheRequestPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(2)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" />
+        <see stepKey="verifyTheTargetPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.targetPathColumn(1)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
+        <!--Verify before move  Redirect Path directs to the category page-->
+        <amOnPage url="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnStoreNavigationBar"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleSubCategory.name)}}" stepKey="seeCategoryInTitle"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
new file mode 100644
index 0000000000000..b6eb3d492e3a3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
@@ -0,0 +1,102 @@
+<?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="AdminMoveCategoryFromParentAnchoredCategoryTest">
+        <annotations>
+            <stories value="Move categories"/>
+            <title value="Move default subcategory with anchored parent to default subcategory"/>
+            <description value="Login as admin,move subcategory with anchored parent to default subcategory"/>
+            <testCaseId value="MC-6492"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+            <features value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+        </before>
+        <after>
+            <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
+            <actionGroup ref="DeleteCategory" stepKey="deleteCategory">
+                <argument name="categoryEntity" value="SimpleSubCategory"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Open Category page-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <!--Create Subcategory under Anchored category-->
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <!--Select Display Setting and verify Anchor option is enabled-->
+        <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
+        <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
+        <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
+        <!--Select and add the Product -->
+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <!--Verify category displayed in store front page-->
+        <amOnPage url="/$$createDefaultCategory.name$$/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
+        <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
+        <!--Check category breadcrumbs in store  front page-->
+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
+        <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
+            <expectedResult type="array">['Home', $$createDefaultCategory.name$$, {{SimpleSubCategory.name}}]</expectedResult>
+            <actualResult type="variable">breadcrumbs</actualResult>
+        </assertEquals>
+        <!--Verify Product displayed in category store front page-->
+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
+        <waitForPageLoad  stepKey="waitForProductToLoad1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
+        <!--Open Category Page-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <!--Move SubCategory to Default Category-->
+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
+        <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
+        <waitForPageLoad  stepKey="waitForStoreFrontPageLoad1"/>
+        <!--Verify breadcrumbs after the move in store front page-->
+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbsAfterMove"/>
+        <assertEquals  stepKey="verifyBreadcrumbsInFrontPageAfterMove">
+            <expectedResult type="array">['Home',{{SimpleSubCategory.name}}]</expectedResult>
+            <actualResult type="variable">breadcrumbsAfterMove</actualResult>
+        </assertEquals>
+       <!--Open category store front page -->
+        <amOnPage url="{{StorefrontCategoryPage.url(SimpleSubCategory.name)}}"  stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <!--Verify Category in store front-->
+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleSubCategory.name)}}" stepKey="seeCategoryInTitle"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
+        <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct1"/>
+        <waitForPageLoad  stepKey="waitForProductToLoad2"/>
+        <!--Verify product name on Store Front-->
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductNameAfterMove"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
index 0880b50950e15..9af99cf43bbe0 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -11,5 +11,10 @@
     <section name="AdminUrlRewriteIndexSection">
         <element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
         <element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
+        <element name="targetPathColumn" type="text" selector="//tr[@data-role='row']['{{var1}}']/td[@data-column='target_path']" parameterized="true"/>
+        <element name="searchButton" type="button" selector="button[data-ui-id='widget-button-1']" timeout="30"/>
+        <element name="redirectTypeColumn" type="text" selector="//tr[@data-role='row']['{{var1}}']/td[@data-column='redirect_type']" parameterized="true"/>
+        <element name="requestPathColumn" type="text" selector="//tr[@data-role='row']['{{var1}}']/td[@data-column='request_path']" parameterized="true"/>
+
     </section>
 </sections>

From c434e978b9a3e14770d745f7d2ff3ac15deaf7f1 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 10 Jan 2019 17:11:37 +0200
Subject: [PATCH 568/932] MAGETWO-60795: [FT]
 Magento\Catalog\Test\TestCase\Product\ProductTypeSwitchingOnUpdateTest fails
 on CI

---
 .../web/js/components/price-configurable.js         |  2 ++
 .../tests/app/Magento/Catalog/Test/Block/Search.php |  1 +
 .../Product/ProductTypeSwitchingOnUpdateTest.php    |  1 +
 .../Product/ProductTypeSwitchingOnUpdateTest.xml    | 13 +------------
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
index 28e775b984b05..6bbab77a3a0ab 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/price-configurable.js
@@ -53,6 +53,8 @@ define([
             if (isConfigurable) {
                 this.disable();
                 this.clear();
+            } else {
+                this.enable();
             }
         }
     });
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
index 7ca5bfd2be140..f4f7e37890e60 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
@@ -77,6 +77,7 @@ public function search($keyword, $length = null)
             $keyword = substr($keyword, 0, $length);
         }
         $this->fillSearch($keyword);
+        $this->waitForElementEnabled($this->searchButton);
         $this->_rootElement->find($this->searchButton)->click();
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
index 43741393e7968..90cd6bdb76328 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.php
@@ -143,5 +143,6 @@ protected function clearDownloadableData()
         /** @var Downloadable $downloadableInfoTab */
         $downloadableInfoTab = $this->catalogProductEdit->getProductForm()->getSection('downloadable_information');
         $downloadableInfoTab->getDownloadableBlock('Links')->clearDownloadableData();
+        $downloadableInfoTab->setIsDownloadable('No');
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
index f3df374a8bac8..5fa1cfe5e5911 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest.xml
@@ -11,7 +11,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
             <data name="product" xsi:type="string">configurableProduct::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -21,7 +20,6 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation2">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
             <data name="actionName" xsi:type="string">-</data>
@@ -29,7 +27,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation3">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="productOrigin" xsi:type="string">configurableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductSimple::product_without_category</data>
             <data name="actionName" xsi:type="string">deleteVariations</data>
@@ -40,12 +37,10 @@
             <data name="productOrigin" xsi:type="string">configurableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductVirtual::required_fields</data>
             <data name="actionName" xsi:type="string">deleteVariations</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation5">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
             <data name="product" xsi:type="string">catalogProductSimple::default</data>
             <data name="actionName" xsi:type="string">-</data>
@@ -56,7 +51,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -69,7 +63,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductVirtual::default</data>
             <data name="product" xsi:type="string">downloadableProduct::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
@@ -81,15 +74,13 @@
             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductSimple::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation9">
             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
             <data name="product" xsi:type="string">configurableProduct::not_virtual_for_type_switching</data>
-            <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="actionName" xsi:type="string">clearDownloadableData</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductsInGrid" />
@@ -99,7 +90,6 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertChildProductIsNotDisplayedSeparately" />
         </variation>
         <variation name="ProductTypeSwitchingOnUpdateTestVariation10">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="productOrigin" xsi:type="string">downloadableProduct::default</data>
             <data name="product" xsi:type="string">catalogProductVirtual::default</data>
             <data name="actionName" xsi:type="string">clearDownloadableData</data>
@@ -110,7 +100,6 @@
             <data name="productOrigin" xsi:type="string">catalogProductSimple::default</data>
             <data name="product" xsi:type="string">downloadableProduct::default</data>
             <data name="actionName" xsi:type="string">-</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />

From 0b8d5314b9c103cee5d763b91517504c3d122d51 Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Thu, 10 Jan 2019 09:29:16 -0600
Subject: [PATCH 569/932] MC-6296: Update DCTRequest

---
 app/code/Magento/Dhl/Model/Carrier.php        |  27 +++--
 .../Dhl/Test/Unit/Model/CarrierTest.php       |  82 +++++++++-----
 ...ata_dhl.php => dhl_quote_request_data.php} |   7 +-
 ...ponse_rates.xml => dhl_quote_response.xml} | 104 +++++++++++++-----
 .../Model/_files/dhl_quote_response_rates.php |  31 ++++++
 5 files changed, 184 insertions(+), 67 deletions(-)
 rename app/code/Magento/Dhl/Test/Unit/Model/_files/{rates_request_data_dhl.php => dhl_quote_request_data.php} (92%)
 rename app/code/Magento/Dhl/Test/Unit/Model/_files/{success_dhl_response_rates.xml => dhl_quote_response.xml} (84%)
 create mode 100644 app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index d997db6ac1a3e..9f1d9ef75659f 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -199,6 +199,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
         'SiteID', 'Password'
     ];
 
+    protected $productMetadata;
+
     /**
      * Xml response validator
      *
@@ -261,7 +263,8 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
         array $data = [],
-        \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator = null
+        \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator = null,
+        \Magento\Framework\App\ProductMetadataInterface $productMetadata
     ) {
         $this->readFactory = $readFactory;
         $this->_carrierHelper = $carrierHelper;
@@ -272,6 +275,7 @@ public function __construct(
         $this->mathDivision = $mathDivision;
         $this->_dateTime = $dateTime;
         $this->_httpClientFactory = $httpClientFactory;
+        $this->productMetadata = $productMetadata;
         parent::__construct(
             $scopeConfig,
             $rateErrorFactory,
@@ -929,6 +933,7 @@ protected function _getQuotes()
                 $date = date(self::REQUEST_DATE_FORMAT, strtotime($this->_getShipDate() . " +{$offset} days"));
                 $this->_setQuotesRequestXmlDate($requestXml, $date);
 
+
                 $request = $requestXml->asXML();
                 $debugPoint['request'] = $this->filterDebugData($request);
                 $responseBody = $this->_getCachedQuotes($request);
@@ -983,18 +988,26 @@ protected function _getQuotesFromServer($request)
     protected function _buildQuotesRequestXml()
     {
         $rawRequest = $this->_rawRequest;
-        $xmlStr = '<?xml version = "1.0" encoding = "UTF-8"?>' .
-            '<p:DCTRequest xmlns:p="http://www.dhl.com" xmlns:p1="http://www.dhl.com/datatypes" ' .
-            'xmlns:p2="http://www.dhl.com/DCTRequestdatatypes" ' .
+
+        $xmlStr = '<?xml version="1.0" encoding = "UTF-8"?>' .
+            '<req:DCTRequest schemaVersion="2.0" ' .
+            'xmlns:req="http://www.dhl.com" ' .
             'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
-            'xsi:schemaLocation="http://www.dhl.com DCT-req.xsd "/>';
+            'xsi:schemaLocation="http://www.dhl.com DCT-req_global-2.0.xsd"/>';
+
         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
         $nodeGetQuote = $xml->addChild('GetQuote', '', '');
         $nodeRequest = $nodeGetQuote->addChild('Request');
 
         $nodeServiceHeader = $nodeRequest->addChild('ServiceHeader');
-        $nodeServiceHeader->addChild('SiteID', (string)$this->getConfigData('id'));
-        $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
+        $nodeServiceHeader->addChild('MessageTime', date('Y-m-d\TH:i:sP'));
+        $nodeServiceHeader->addChild('MessageReference', uniqid('magento_quotereq_'));
+        $nodeServiceHeader->addChild('SiteID', (string) $this->getConfigData('id'));
+        $nodeServiceHeader->addChild('Password', (string) $this->getConfigData('password'));
+
+        $nodeMetaData = $nodeRequest->addChild('MetaData');
+        $nodeMetaData->addChild('SoftwareName', $this->productMetadata->getName());
+        $nodeMetaData->addChild('SoftwareVersion', $this->productMetadata->getVersion());
 
         $nodeFrom = $nodeGetQuote->addChild('From');
         $nodeFrom->addChild('CountryCode', $rawRequest->getOrigCountryId());
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 96c76a17bc317..06a2c84285702 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -55,6 +55,7 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
+     * @var Error|MockObject
      * @var Error|MockObject
      */
     private $error;
@@ -124,6 +125,7 @@ protected function setUp()
         $configReader = $this->getConfigReader();
         $readFactory = $this->getReadFactory();
         $storeManager = $this->getStoreManager();
+        $productMetadata = $this->getProductMetadata();
 
         $this->error = $this->getMockBuilder(Error::class)
             ->setMethods(['setCarrier', 'setCarrierTitle', 'setErrorMessage'])
@@ -160,6 +162,7 @@ protected function setUp()
                 'carrierHelper' => $carrierHelper,
                 'data' => ['id' => 'dhl', 'store' => '1'],
                 'xmlValidator' => $this->xmlValidator,
+                'productMetadata' => $productMetadata
             ]
         );
     }
@@ -183,7 +186,7 @@ public function scopeConfigGetValue($path)
             'carriers/dhl/content_type' => 'N',
             'carriers/dhl/nondoc_methods' => '1,3,4,8,P,Q,E,F,H,J,M,V,Y',
             'carriers/dhl/showmethod' => 1,
-            'carriers/dhl/title' => 'dhl Title',
+            'carriers/dhl/title' => 'DHL Title',
             'carriers/dhl/specificerrmsg' => 'dhl error message',
             'carriers/dhl/unit_of_measure' => 'K',
             'carriers/dhl/size' => '1',
@@ -191,7 +194,7 @@ public function scopeConfigGetValue($path)
             'carriers/dhl/width' => '1.6',
             'carriers/dhl/depth' => '1.6',
             'carriers/dhl/debug' => 1,
-            'shipping/origin/country_id' => 'GB',
+            'shipping/origin/country_id' => 'GB'
         ];
         return isset($pathMap[$path]) ? $pathMap[$path] : null;
     }
@@ -247,8 +250,14 @@ protected function _invokePrepareShippingLabelContent(\SimpleXMLElement $xml)
         return $method->invoke($model, $xml);
     }
 
+    /**
+     * Tests that valid rates are returned when sending a quotes request.
+     */
     public function testCollectRates()
     {
+        $requestData = require __DIR__ . '/_files/dhl_quote_request_data.php';
+        $responseXml = file_get_contents(__DIR__ . '/_files/dhl_quote_response.xml');
+
         $this->scope->method('getValue')
             ->willReturnCallback([$this, 'scopeConfigGetValue']);
 
@@ -256,13 +265,9 @@ public function testCollectRates()
             ->willReturn(true);
 
         $this->httpResponse->method('getBody')
-            ->willReturn(file_get_contents(__DIR__ . '/_files/success_dhl_response_rates.xml'));
+            ->willReturn($responseXml);
 
-        /** @var RateRequest $request */
-        $request = $this->objectManager->getObject(
-            RateRequest::class,
-            require __DIR__ . '/_files/rates_request_data_dhl.php'
-        );
+        $request = $this->objectManager->getObject(RateRequest::class, $requestData);
 
         $reflectionClass = new \ReflectionObject($this->httpClient);
         $rawPostData = $reflectionClass->getProperty('raw_post_data');
@@ -272,13 +277,27 @@ public function testCollectRates()
             ->method('debug')
             ->with($this->stringContains('<SiteID>****</SiteID><Password>****</Password>'));
 
-        self::assertNotEmpty($this->model->collectRates($request)->getAllRates());
-        self::assertContains('<Weight>18.223</Weight>', $rawPostData->getValue($this->httpClient));
-        self::assertContains('<Height>0.630</Height>', $rawPostData->getValue($this->httpClient));
-        self::assertContains('<Width>0.630</Width>', $rawPostData->getValue($this->httpClient));
-        self::assertContains('<Depth>0.630</Depth>', $rawPostData->getValue($this->httpClient));
+        $expectedRates = require __DIR__ . '/_files/dhl_quote_response_rates.php';
+        $actualRates = $this->model->collectRates($request)->getAllRates();
+
+        self::assertEquals(count($expectedRates), count($actualRates));
+
+        foreach ($actualRates as $i => $actualRate) {
+            $actualRate = $actualRate->getData();
+            unset($actualRate['method_title']);
+            self::assertEquals($expectedRates[$i], $actualRate);
+        }
+
+        $requestXml = $rawPostData->getValue($this->httpClient);
+        self::assertContains('<Weight>18.223</Weight>', $requestXml);
+        self::assertContains('<Height>0.630</Height>', $requestXml);
+        self::assertContains('<Width>0.630</Width>', $requestXml);
+        self::assertContains('<Depth>0.630</Depth>', $requestXml);
     }
 
+    /**
+     * Tests that an error is returned when attempting to collect rates for an inactive shipping method.
+     */
     public function testCollectRatesErrorMessage()
     {
         $this->scope->method('getValue')
@@ -296,16 +315,6 @@ public function testCollectRatesErrorMessage()
         $this->assertSame($this->error, $this->model->collectRates($request));
     }
 
-    public function testCollectRatesFail()
-    {
-        $this->scope->expects($this->once())->method('isSetFlag')->willReturn(true);
-
-        $request = new RateRequest();
-        $request->setPackageWeight(1);
-
-        $this->assertFalse(false, $this->model->collectRates($request));
-    }
-
     /**
      * Test request to shipment sends valid xml values.
      */
@@ -595,14 +604,18 @@ private function getRateMethodFactory(): MockObject
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $rateMethod = $this->getMockBuilder(Method::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['setPrice'])
-            ->getMock();
-        $rateMethod->method('setPrice')
-            ->willReturnSelf();
+
         $rateMethodFactory->method('create')
-            ->willReturn($rateMethod);
+            ->willReturnCallback(function () {
+                $rateMethod = $this->getMockBuilder(Method::class)
+                    ->disableOriginalConstructor()
+                    ->setMethods(['setPrice'])
+                    ->getMock();
+                $rateMethod->method('setPrice')
+                    ->willReturnSelf();
+
+                return $rateMethod;
+            });
 
         return $rateMethodFactory;
     }
@@ -700,4 +713,13 @@ private function getHttpClientFactory(): MockObject
 
         return $httpClientFactory;
     }
+
+    private function getProductMetadata(): MockObject
+    {
+        $productMetadata = $this->createMock(\Magento\Framework\App\ProductMetadata::class);
+        $productMetadata->method('getName')->willReturn('Magento');
+        $productMetadata->method('getVersion')->willReturn('2.3.1');
+
+        return $productMetadata;
+    }
 }
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/rates_request_data_dhl.php b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php
similarity index 92%
rename from app/code/Magento/Dhl/Test/Unit/Model/_files/rates_request_data_dhl.php
rename to app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php
index 32e9c78886cef..f762b99735233 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/_files/rates_request_data_dhl.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_request_data.php
@@ -24,10 +24,9 @@
         'limit_carrier' => null,
         'base_subtotal_incl_tax' => '5',
         'orig_country_id' => 'US',
-        'country_id' => 'US',
-        'region_id' => '12',
-        'city' => 'Fremont',
-        'postcode' => '94538',
+        'orig_region_id' => '12',
+        'orig_city' => 'Fremont',
+        'orig_postcode' => '94538',
         'dhl_id' => 'MAGEN_8501',
         'dhl_password' => 'QR2GO1U74X',
         'dhl_account' => '799909537',
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/success_dhl_response_rates.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response.xml
similarity index 84%
rename from app/code/Magento/Dhl/Test/Unit/Model/_files/success_dhl_response_rates.xml
rename to app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response.xml
index b529e86ef154c..7421707966411 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/_files/success_dhl_response_rates.xml
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response.xml
@@ -5,9 +5,9 @@
  * See COPYING.txt for license details.
  */
 -->
-
-<res:DCTResponse xmlns:res="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://www.dhl.com DCT-Response.xsd">
+<res:DCTResponse xmlns:res="http://www.dhl.com"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://www.dhl.com DCT-Response_global-2.0.xsd">
     <GetQuoteResponse>
         <Response>
             <ServiceHeader>
@@ -16,15 +16,15 @@
             </ServiceHeader>
         </Response>
         <BkgDetails>
-            <OriginServiceArea>
-                <FacilityCode>NUQ</FacilityCode>
-                <ServiceAreaCode>NUQ</ServiceAreaCode>
-            </OriginServiceArea>
-            <DestinationServiceArea>
-                <FacilityCode>BER</FacilityCode>
-                <ServiceAreaCode>BER</ServiceAreaCode>
-            </DestinationServiceArea>
             <QtdShp>
+                <OriginServiceArea>
+                    <FacilityCode>NUQ</FacilityCode>
+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
+                </OriginServiceArea>
+                <DestinationServiceArea>
+                    <FacilityCode>BER</FacilityCode>
+                    <ServiceAreaCode>BER</ServiceAreaCode>
+                </DestinationServiceArea>
                 <GlobalProductCode>E</GlobalProductCode>
                 <LocalProductCode>E</LocalProductCode>
                 <ProductShortName>EXPRESS 9:00</ProductShortName>
@@ -42,9 +42,10 @@
                 <TotalTransitDays>2</TotalTransitDays>
                 <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
                 <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-                <PickupNonDHLCourierCode />
-                <DeliveryNonDHLCourierCode />
-                <DeliveryDate>2014-01-13</DeliveryDate>
+                <DeliveryDate>
+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
+                </DeliveryDate>
                 <DeliveryTime>PT9H</DeliveryTime>
                 <DimensionalWeight>2.205</DimensionalWeight>
                 <WeightUnit>LB</WeightUnit>
@@ -101,8 +102,19 @@
                     <TotalTaxAmount>0.000</TotalTaxAmount>
                     <WeightChargeTax>0.000</WeightChargeTax>
                 </QtdSInAdCur>
+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
             </QtdShp>
             <QtdShp>
+                <OriginServiceArea>
+                    <FacilityCode>NUQ</FacilityCode>
+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
+                </OriginServiceArea>
+                <DestinationServiceArea>
+                    <FacilityCode>BER</FacilityCode>
+                    <ServiceAreaCode>BER</ServiceAreaCode>
+                </DestinationServiceArea>
                 <GlobalProductCode>Q</GlobalProductCode>
                 <LocalProductCode>Q</LocalProductCode>
                 <ProductShortName>MEDICAL EXPRESS</ProductShortName>
@@ -120,9 +132,10 @@
                 <TotalTransitDays>2</TotalTransitDays>
                 <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
                 <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-                <PickupNonDHLCourierCode />
-                <DeliveryNonDHLCourierCode />
-                <DeliveryDate>2014-01-13</DeliveryDate>
+                <DeliveryDate>
+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
+                </DeliveryDate>
                 <DeliveryTime>PT9H</DeliveryTime>
                 <DimensionalWeight>2.205</DimensionalWeight>
                 <WeightUnit>LB</WeightUnit>
@@ -179,8 +192,19 @@
                     <TotalTaxAmount>0.000</TotalTaxAmount>
                     <WeightChargeTax>0.000</WeightChargeTax>
                 </QtdSInAdCur>
+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
             </QtdShp>
             <QtdShp>
+                <OriginServiceArea>
+                    <FacilityCode>NUQ</FacilityCode>
+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
+                </OriginServiceArea>
+                <DestinationServiceArea>
+                    <FacilityCode>BER</FacilityCode>
+                    <ServiceAreaCode>BER</ServiceAreaCode>
+                </DestinationServiceArea>
                 <GlobalProductCode>Y</GlobalProductCode>
                 <LocalProductCode>Y</LocalProductCode>
                 <ProductShortName>EXPRESS 12:00</ProductShortName>
@@ -198,9 +222,10 @@
                 <TotalTransitDays>2</TotalTransitDays>
                 <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
                 <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-                <PickupNonDHLCourierCode />
-                <DeliveryNonDHLCourierCode />
-                <DeliveryDate>2014-01-13</DeliveryDate>
+                <DeliveryDate>
+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
+                </DeliveryDate>
                 <DeliveryTime>PT12H</DeliveryTime>
                 <DimensionalWeight>2.205</DimensionalWeight>
                 <WeightUnit>LB</WeightUnit>
@@ -257,8 +282,19 @@
                     <TotalTaxAmount>0.000</TotalTaxAmount>
                     <WeightChargeTax>0.000</WeightChargeTax>
                 </QtdSInAdCur>
+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
             </QtdShp>
             <QtdShp>
+                <OriginServiceArea>
+                    <FacilityCode>NUQ</FacilityCode>
+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
+                </OriginServiceArea>
+                <DestinationServiceArea>
+                    <FacilityCode>BER</FacilityCode>
+                    <ServiceAreaCode>BER</ServiceAreaCode>
+                </DestinationServiceArea>
                 <GlobalProductCode>3</GlobalProductCode>
                 <LocalProductCode>3</LocalProductCode>
                 <ProductShortName>B2C</ProductShortName>
@@ -275,9 +311,10 @@
                 <TotalTransitDays>2</TotalTransitDays>
                 <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
                 <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-                <PickupNonDHLCourierCode />
-                <DeliveryNonDHLCourierCode />
-                <DeliveryDate>2014-01-13</DeliveryDate>
+                <DeliveryDate>
+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
+                </DeliveryDate>
                 <DeliveryTime>PT23H59M</DeliveryTime>
                 <DimensionalWeight>2.205</DimensionalWeight>
                 <WeightUnit>LB</WeightUnit>
@@ -309,8 +346,19 @@
                     <TotalTaxAmount>0.000</TotalTaxAmount>
                     <WeightChargeTax>0.000</WeightChargeTax>
                 </QtdSInAdCur>
+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
             </QtdShp>
             <QtdShp>
+                <OriginServiceArea>
+                    <FacilityCode>NUQ</FacilityCode>
+                    <ServiceAreaCode>NUQ</ServiceAreaCode>
+                </OriginServiceArea>
+                <DestinationServiceArea>
+                    <FacilityCode>BER</FacilityCode>
+                    <ServiceAreaCode>BER</ServiceAreaCode>
+                </DestinationServiceArea>
                 <GlobalProductCode>P</GlobalProductCode>
                 <LocalProductCode>P</LocalProductCode>
                 <ProductShortName>EXPRESS WORLDWIDE</ProductShortName>
@@ -328,9 +376,10 @@
                 <TotalTransitDays>2</TotalTransitDays>
                 <PickupPostalLocAddDays>0</PickupPostalLocAddDays>
                 <DeliveryPostalLocAddDays>0</DeliveryPostalLocAddDays>
-                <PickupNonDHLCourierCode />
-                <DeliveryNonDHLCourierCode />
-                <DeliveryDate>2014-01-13</DeliveryDate>
+                <DeliveryDate>
+                    <DlvyDateTime>2014-01-13 11:59:00</DlvyDateTime>
+                    <DeliveryDateTimeOffset>+00:00</DeliveryDateTimeOffset>
+                </DeliveryDate>
                 <DeliveryTime>PT23H59M</DeliveryTime>
                 <DimensionalWeight>2.205</DimensionalWeight>
                 <WeightUnit>LB</WeightUnit>
@@ -387,6 +436,9 @@
                     <TotalTaxAmount>0.000</TotalTaxAmount>
                     <WeightChargeTax>0.000</WeightChargeTax>
                 </QtdSInAdCur>
+                <PickupWindowEarliestTime>09:00:00</PickupWindowEarliestTime>
+                <PickupWindowLatestTime>17:00:00</PickupWindowLatestTime>
+                <BookingCutoffOffset>PT1H</BookingCutoffOffset>
             </QtdShp>
         </BkgDetails>
         <Srvs>
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php
new file mode 100644
index 0000000000000..e623b5944ce7c
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+return [
+    [
+        'carrier' => 'dhl',
+        'carrier_title' => 'DHL Title',
+        'cost' => 45.85,
+        'method' => 'E'
+    ],
+    [
+        'carrier' => 'dhl',
+        'carrier_title' => 'DHL Title',
+        'cost' => 35.26,
+        'method' => 'Q'
+    ],
+    [
+        'carrier' => 'dhl',
+        'carrier_title' => 'DHL Title',
+        'cost' => 37.38,
+        'method' => 'Y'
+    ],
+    [
+        'carrier' => 'dhl',
+        'carrier_title' => 'DHL Title',
+        'cost' => 35.26,
+        'method' => 'P'
+    ]
+];
\ No newline at end of file

From 1decc0c6ff4e7720581709d3c29d9e2d00bf86c0 Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Thu, 10 Jan 2019 10:13:50 -0600
Subject: [PATCH 570/932] MC-6296: Update DCTRequest

Fixed Typo
---
 app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 06a2c84285702..6676be9cc8b7e 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -55,7 +55,6 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var Error|MockObject
      * @var Error|MockObject
      */
     private $error;

From 16591c5f60b4e367f4bba4da39ce4fc478bf9df5 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Thu, 10 Jan 2019 12:02:18 -0600
Subject: [PATCH 571/932] MC-6283: [System Configuration] Introduce the new
 settings related to Smart buttons

- fix spelling and config path method
---
 app/code/Magento/Paypal/Model/Config.php         | 16 +++++++---------
 .../Config/Source/ExpressButtons/Label.php       |  4 ++--
 .../Config/Source/ExpressButtons/Shape.php       |  2 +-
 .../etc/adminhtml/system/express_checkout.xml    | 16 ++++++++--------
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 3205f280c09b0..02ea30e6bc003 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1659,15 +1659,13 @@ protected function _mapGenericStyleFieldset($fieldName)
      */
     protected function _mapButtonStyleFieldset($fieldName)
     {
-        $name = str_replace('checkout_page_button_','',$fieldName);
-
-        switch ($name) {
-            case 'customize':
-            case 'layout':
-            case 'size':
-            case 'color':
-            case 'shape':
-            case 'label':
+        switch ($fieldName) {
+            case 'checkout_page_button_customize':
+            case 'checkout_page_button_layout':
+            case 'checkout_page_button_size':
+            case 'checkout_page_button_color':
+            case 'checkout_page_button_shape':
+            case 'checkout_page_button_label':
             case 'disable_funding_options':
                 return "payment/{$this->_methodCode}/{$fieldName}";
             default:
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
index 3a3e8b8461fb4..b0463ef1bac00 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
@@ -20,8 +20,8 @@ public function getCheckoutLabel(): array
             'checkout' => __('Checkout'),
             'credit' => __('Credit'),
             'pay' => __('Pay'),
-            'buynow' => __('Buynow'),
-            'paypal' => __('Paypal'),
+            'buynow' => __('Buy Now'),
+            'paypal' => __('PayPal'),
             'installment' => __('Installment')
         ];
     }
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
index d4be160d2c52b..bd7513861a2b5 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
@@ -18,7 +18,7 @@ public function getCheckoutShape(): array
     {
         return [
             'pill' => __('Pill'),
-            'rect' => __('Rect')
+            'rect' => __('Rectangle')
         ];
     }
 }
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 8b2cc88dbd523..23013b248d88a 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -652,9 +652,9 @@
                     </field>
                     <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
                         <label>PayPal Button - Checkout Page</label>
-                        <field id="checkout_page_button_customise" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
-                            <label>Customise Button</label>
-                            <comment><![CDATA[Customise the display of the PayPal button in the Checkout.]]></comment>
+                        <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
+                            <label>Customize Button</label>
+                            <comment><![CDATA[Customize the display of the PayPal button in the Checkout.]]></comment>
                             <config_path>payment/paypal_express/checkout_page_button_customize</config_path>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <attribute type="shared">1</attribute>
@@ -664,7 +664,7 @@
                             <config_path>payment/paypal_express/checkout_page_button_label</config_path>
                             <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Label::getCheckoutLabel</source_model>
                             <depends>
-                                <field id="checkout_page_button_customise">1</field>
+                                <field id="checkout_page_button_customize">1</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
@@ -673,7 +673,7 @@
                             <config_path>payment/paypal_express/checkout_page_button_layout</config_path>
                             <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Layout::getCheckoutLayout</source_model>
                             <depends>
-                                <field id="checkout_page_button_customise">1</field>
+                                <field id="checkout_page_button_customize">1</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
@@ -682,7 +682,7 @@
                             <config_path>payment/paypal_express/checkout_page_button_size</config_path>
                             <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Size::getCheckoutSize</source_model>
                             <depends>
-                                <field id="checkout_page_button_customise">1</field>
+                                <field id="checkout_page_button_customize">1</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
@@ -691,7 +691,7 @@
                             <config_path>payment/paypal_express/checkout_page_button_shape</config_path>
                             <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Shape::getCheckoutShape</source_model>
                             <depends>
-                                <field id="checkout_page_button_customise">1</field>
+                                <field id="checkout_page_button_customize">1</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
@@ -700,7 +700,7 @@
                             <config_path>payment/paypal_express/checkout_page_button_color</config_path>
                             <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Color::getCheckoutColor</source_model>
                             <depends>
-                                <field id="checkout_page_button_customise">1</field>
+                                <field id="checkout_page_button_customize">1</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>

From cff4abe97a5859fe3311bde33724d7255d5768af Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Thu, 10 Jan 2019 14:42:47 -0600
Subject: [PATCH 572/932] MC-6283: [System Configuration] Introduce the new
 settings related to Smart buttons

- hide layout and color fields when label is credit
---
 app/code/Magento/Paypal/Model/ExpressConfigProvider.php      | 5 +++++
 .../Magento/Paypal/etc/adminhtml/system/express_checkout.xml | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 99cb3fb2ea075..92ca97a4da198 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -208,6 +208,11 @@ private function getButtonStyles()
             $styles['color'] = $this->config->getValue('checkout_page_button_color');
             $styles['shape'] = $this->config->getValue('checkout_page_button_shape');
             $styles['label'] = $this->config->getValue('checkout_page_button_label');
+
+            if ($styles['label'] === 'credit') {
+                $styles['color'] = 'darkblue';
+                $styles['layout'] = 'horizontal';
+            }
         }
         return $styles;
     }
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 23013b248d88a..71ea376128625 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -674,6 +674,7 @@
                             <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Layout::getCheckoutLayout</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
+                                <field id="checkout_page_button_label" negative="1">credit</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
@@ -701,6 +702,7 @@
                             <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Color::getCheckoutColor</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
+                                <field id="checkout_page_button_label" negative="1">credit</field>
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>

From 3efa03ebbcb026b348e9a4676cedabf14fe1b2a8 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 10 Jan 2019 15:28:26 -0600
Subject: [PATCH 573/932] MC-6282: [Backend]: Create Place Order Controller

---
 .../web/js/in-context/express-checkout-smart-buttons.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 6210bfefd5d6e..6cbb190b4a7ee 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -105,7 +105,7 @@ define([
                     form_key: clientConfig.formKey
                 };
 
-                if (clientConfig.button) {
+                if (!clientConfig.button) {
                     return new paypal.Promise(function (resolve, reject) {
                         clientConfig.additionalAction(clientConfig.messageContainer).done(function () {
                                 paypal.request.post(clientConfig.startUrl, params)

From a3be047431cb1bc081894a89697ece02771483db Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Thu, 10 Jan 2019 16:04:41 -0600
Subject: [PATCH 574/932] MC-4393: Convert CreateFlatCatalogProduct to MFTF

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  13 ++
 .../Section/AdminProductGridFilterSection.xml |   2 +
 ...StorefrontCategoryBottomToolbarSection.xml |   1 +
 .../AdminCheckPaginationInStorefrontTest.xml  | 111 +++++++++---------
 4 files changed, 73 insertions(+), 54 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 23253ad6ad8f8..ed38e14bcbd14 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -497,4 +497,17 @@
         <data key="name" unique="suffix">Product With Long Name And Sku - But not too long</data>
         <data key="sku" unique="suffix">Product With Long Name And Sku - But not too long</data>
     </entity>
+    <entity name="PaginationProduct" type="product">
+        <data key="name" unique="suffix">pagi</data>
+        <data key="sku" unique="suffix">pagisku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="price">780.00</data>
+        <data key="urlKey" unique="suffix">pagiurl-</data>
+        <data key="status">1</data>
+        <data key="quantity">50</data>
+        <data key="weight">5</data>
+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index 611f12a39b510..d4dda07099df3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -31,5 +31,7 @@
         <element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
         <element name="keywordSearch" type="input" selector="input#fulltext"/>
         <element name="keywordSearchButton" type="button" selector=".data-grid-search-control-wrap button.action-submit" timeout="30"/>
+        <element name="productCount" type="text" selector="#catalog_category_products-total-count"/>
+        <element name="productPerPage" type="select" selector="#catalog_category_products_page-limit"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
index 1143a29546b0a..7ce795c78f25b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml
@@ -11,5 +11,6 @@
         <element name="nextPage" type="button" selector=".//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'next')]" timeout="30"/>
         <element name="previousPage" type="button" selector=".//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'previous')]" timeout="30"/>
         <element name="pageNumber" type="text" selector="//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'page')]//span[2][contains(text() ,'{{var1}}')]" parameterized="true"/>
+        <element name="perPage" type="select" selector="//*[@class='toolbar toolbar-products'][2]//select[@id='limiter']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
index 0818e2d67100b..cbe11cc2e9507 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
@@ -16,43 +16,34 @@
             <severity value="CRITICAL"/>
             <group value="mtf_migrated"/>
             <group value="Catalog"/>
-            <group value="banana"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1 "/>
+            <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 1 "/>
             <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct1" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct2" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct3" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct4" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct5" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct6" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct7" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct8" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct9" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct10" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct11" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct12" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct13" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct14" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct15" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct16" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct17" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct18" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct19" />
-            <createData entity="defaultSimpleProduct" stepKey="simpleProduct20" />
+            <createData entity="PaginationProduct" stepKey="simpleProduct1"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct2"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct3"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct4"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct5"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct6"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct7"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct8"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct9"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct10"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct11"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct12"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct13"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct14"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct15"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct16"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct17"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct18"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct19"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct20"/>
         </before>
         <after>
-            <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="getCatalogEditPage1"/>
-            <waitForPageLoad stepKey="waitForPageToLoad"/>
-            <click selector="{{CatalogSection.storefront}}" stepKey="clickOnStoreFront2"/>
-            <scrollTo selector="{{CatalogSection.flatCatalogCategoryCheckBox}}" x="0" y="-80" stepKey="scrollToFlatCatalogCategory1"/>
-            <checkOption selector="{{CatalogSection.flatCatalogCategoryCheckBox}}" stepKey="checkTheflatCategoryCheckBox"/>
-            <selectOption selector="{{CatalogSection.flatCatalogProduct}}"  userInput="No" stepKey="selectFlatCatalogProduct1"/>
-            <scrollToTopOfPage stepKey="scrollToTopOfThePage3"/>
-            <click selector="{{CatalogSection.storefront}}" stepKey="clickOnStoreFront3"/>
-            <click selector="{{CatalogSection.save}}" stepKey="clickOnSaveButton2"/>
-            <see selector="{{CatalogSection.successMessage}}" userInput="You saved the configuration." stepKey="seeSuccessSaveMessage1"/>
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
             <deleteData  createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData  createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
@@ -74,69 +65,67 @@
             <deleteData  createDataKey="simpleProduct18" stepKey="deleteSimpleProduct18"/>
             <deleteData  createDataKey="simpleProduct19" stepKey="deleteSimpleProduct19"/>
             <deleteData  createDataKey="simpleProduct20" stepKey="deleteSimpleProduct20"/>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0" />
+            <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 0" />
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <!--Select Catalog Configuration Page-->
-        <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="getCatalogEditPage"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <click selector="{{CatalogSection.storefront}}" stepKey="clickOnStoreFront"/>
-        <scrollTo selector="{{CatalogSection.flatCatalogCategoryCheckBox}}" x="0" y="-80" stepKey="scrollToFlatCatalogCategory"/>
-        <uncheckOption selector="{{CatalogSection.flatCatalogCategoryCheckBox}}" stepKey="uncheckTheflatCategoryCheckBox"/>
-        <selectOption selector="{{CatalogSection.flatCatalogCategory}}"  userInput="Yes" stepKey="selectFlatCatalogCategory"/>
-        <selectOption selector="{{CatalogSection.flatCatalogProduct}}"  userInput="Yes" stepKey="selectFlatCatalogProduct"/>
-        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
-        <click selector="{{CatalogSection.storefront}}" stepKey="clickOnStoreFront1"/>
-        <!--Save the updated catalog -->
-        <click selector="{{CatalogSection.save}}" stepKey="clickOnSaveButton"/>
-        <waitForPageLoad stepKey="waitForPageToSave"/>
-        <see selector="{{CatalogSection.successMessage}}" userInput="You saved the configuration." stepKey="seeSuccessSaveMessage"/>
-        <!-- Select Created Category-->
+        <!--Open Category Page and select created category-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <waitForPageLoad stepKey="waitForPageToLoad0"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoaded2"/>
-        <!--Select Products in Category and save-->
+        <!--Select Products-->
         <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
+        <waitForPageLoad stepKey="waitForProductsToLoad"/>
         <scrollTo selector="{{CatalogProductsSection.resetFilter}}" stepKey="scrollToResetFilter"/>
+        <waitForElementVisible selector="{{CatalogProductsSection.resetFilter}}" time="30" stepKey="waitForResetButtonToVisible"/>
         <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
         <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <selectOption selector="{{AdminProductGridFilterSection.productPerPage}}" userInput="20" stepKey="selectPagePerView"/>
+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="pagi"  stepKey="selectProduct1"/>
+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitFroPageToLoad1"/>
+        <see selector="{{AdminProductGridFilterSection.productCount}}" userInput="20" stepKey="seeNumberOfProductsFound"/>
         <click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForCategorySaved"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
-        <!--Go to the Store Front-->
+        <!--Open Category Store Front Page-->
         <amOnPage url="{{_defaultCategory.name}}.html" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <!--Select 9 items per page and verify number of products displayed in each page -->
         <conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
-        <!--Verify products in First Page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="9" stepKey="selectPerPageOption"/>
+        <!--Verify number of products displayed in First Page -->
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage"/>
-        <!--Verify products Second Page -->
+        <!--Verify number of products displayed in Second Page -->
         <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
         <waitForPageLoad stepKey="waitForPageToLoad4"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage"/>
-        <!--Verify products third  Page -->
+        <!--Verify number of products displayed in third  Page -->
         <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage"/>
-        <!--Verify products, use Previous Page selector-->
+        <!--Change Pages using Previous Page selector and verify number of products displayed in each page-->
         <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoad5"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage1"/>
-        <!--Verify Products, use Previous Page selector-->
         <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage1"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage2"/>
         <waitForPageLoad stepKey="waitForPageToLoad6"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage1"/>
-        <!--Select Pages by using page Number and verify products-->
+        <!--Select Pages by using page Number and verify number of products displayed-->
         <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage2"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
         <waitForPageLoad stepKey="waitForPageToLoad7"/>
@@ -151,5 +140,19 @@
         <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage"/>
         <waitForPageLoad stepKey="waitForPageToLoad9"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsFirstPage2"/>
+        <!--Select 15 items per page and verify number of products displayed in each page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="15" stepKey="selectPerPageOption1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad10"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="15" stepKey="seeNumberOfProductsInFirstPage3"/>
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad11"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="5" stepKey="seeNumberOfProductsInSecondPage3"/>
+        <!--Select 30 items per page  and verify number of products displayed in each page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="30" stepKey="selectPerPageOption2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad12"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="20" stepKey="seeNumberOfProductsInFirstPage4"/>
     </test>
 </tests>

From 473f907264cbff215a645518dfc5cc75849119d1 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Fri, 11 Jan 2019 08:20:24 +0530
Subject: [PATCH 575/932] Updated CancelOrderItemObserver.php

Fixed Issue #20121 Cancel order increases stock although "Set Items' Status to be In Stock When Order is Cancelled" is set to No
---
 .../Observer/CancelOrderItemObserver.php              | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
index 1e99794d68a40..c919c7057bcc6 100644
--- a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
@@ -6,6 +6,7 @@
 
 namespace Magento\CatalogInventory\Observer;
 
+use Magento\CatalogInventory\Model\Configuration;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
 use Magento\Framework\Event\Observer as EventObserver;
@@ -15,6 +16,11 @@
  */
 class CancelOrderItemObserver implements ObserverInterface
 {
+    /**
+     * @var \Magento\CatalogInventory\Model\Configuration
+     */
+    protected $configuration;
+
     /**
      * @var StockManagementInterface
      */
@@ -30,9 +36,11 @@ class CancelOrderItemObserver implements ObserverInterface
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
      */
     public function __construct(
+        Configuration $configuration,
         StockManagementInterface $stockManagement,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
     ) {
+        $this->configuration = $configuration;
         $this->stockManagement = $stockManagement;
         $this->priceIndexer = $priceIndexer;
     }
@@ -49,7 +57,8 @@ public function execute(EventObserver $observer)
         $item = $observer->getEvent()->getItem();
         $children = $item->getChildrenItems();
         $qty = $item->getQtyOrdered() - max($item->getQtyShipped(), $item->getQtyInvoiced()) - $item->getQtyCanceled();
-        if ($item->getId() && $item->getProductId() && empty($children) && $qty) {
+        if ($item->getId() && $item->getProductId() && empty($children) && $qty && $this->configuration
+            ->getCanBackInStock()) {
             $this->stockManagement->backItemQty($item->getProductId(), $qty, $item->getStore()->getWebsiteId());
         }
         $this->priceIndexer->reindexRow($item->getProductId());

From 1204f231c0b17b0880cf4a6b4b1812d4d130e00d Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 11 Jan 2019 06:40:01 +0200
Subject: [PATCH 576/932] magento/magento2: Refactor \Order\Shipment\Save
 Controller to use ResultInterface

Fix return type
---
 .../Shipping/Controller/Adminhtml/Order/Shipment/Save.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 3c26ae938fce3..e36292b7c2e36 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -91,7 +91,7 @@ protected function _saveShipment($shipment)
      * Save shipment
      * We can save only new shipment. Existing shipments are not editable
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */

From 81da50b43d5ebc12cf4e3a294f5b5a2bac6f3235 Mon Sep 17 00:00:00 2001
From: ajay-2jcommerce <ajay@2jcommerce.in>
Date: Fri, 11 Jan 2019 12:18:20 +0530
Subject: [PATCH 577/932] 
 Bundle-Product-add-to-cart-button-misaligned-on-tab-portrait ::Bundle Product
 add to cart button misaligned on tab portrait view.

---
 .../Magento/luma/Magento_Bundle/web/css/source/_module.less     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
index 43ae23bab7895..eeb17653c877b 100644
--- a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
@@ -253,7 +253,7 @@
             .box-tocart {
                 .action.primary {
                     margin-right: 1%;
-                    width: 49%;
+                    width: auto;
                 }
             }
 

From 66b47ea89626ba2396b4bdede214e16e339ca1d2 Mon Sep 17 00:00:00 2001
From: priti <priti@2jcommerce.in>
Date: Fri, 11 Jan 2019 12:48:42 +0530
Subject: [PATCH 578/932] Confirmation-pop-up-at-mobile-view-not-proper

---
 lib/web/css/source/components/_modals.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
index a8e8cebde3a6c..396930cce6d86 100644
--- a/lib/web/css/source/components/_modals.less
+++ b/lib/web/css/source/components/_modals.less
@@ -102,7 +102,7 @@
 
     &.confirm {
         .modal-inner-wrap {
-            .lib-css(width, @modal-popup-confirm__width);
+            .lib-css(max-width, @modal-popup-confirm__width);
 
             .modal-content {
                 padding-right: 7rem;

From 677dbd21f4e1791e7459d17a3e17a0ac4e7460f9 Mon Sep 17 00:00:00 2001
From: Lusine Papyan <Lusine_Papyan@epam.com>
Date: Thu, 10 Jan 2019 15:45:38 +0400
Subject: [PATCH 579/932] MAGETWO-96847: [2.3.x] Special price does not work
 when "default config" scope timezone does not match "website" scope timezone

- Add automated test script
---
 .../Mftf/Section/LocaleOptionsSection.xml     |  1 +
 ...ceForDifferentTimezonesForWebsitesTest.xml | 94 +++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
index c50bf0664f9cb..a460aaebf1051 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/LocaleOptionsSection.xml
@@ -11,5 +11,6 @@
     <section name="LocaleOptionsSection">
         <element name="sectionHeader" type="text" selector="#general_locale-head"/>
         <element name="timezone" type="select" selector="#general_locale_timezone"/>
+        <element name="useDefault" type="checkbox" selector="#general_locale_timezone_inherit"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
new file mode 100644
index 0000000000000..268e18d2b4efa
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
@@ -0,0 +1,94 @@
+<?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="StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Check that special price displayed when 'default config' scope timezone does not match 'website' scope timezone"/>
+            <description value="Check that special price displayed when 'default config' scope timezone does not match 'website' scope timezone"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-97508"/>
+            <useCaseId value="MAGETWO-96847"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+
+            <!--Create product-->
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+
+            <!--Create customer-->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <!--Delete create data-->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Set timezone for default config-->
+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfig"/>
+        <waitForPageLoad stepKey="waitForConfigPage"/>
+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
+        <grabValueFrom selector="{{LocaleOptionsSection.timezone}}" stepKey="originalTimezone"/>
+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="Central European Standard Time (Europe/Paris)" stepKey="setTimezone"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig"/>
+
+        <!--Set timezone for Main Website-->
+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfig1"/>
+        <waitForPageLoad stepKey="waitForConfigPage1"/>
+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreViewActionGroup">
+            <argument name="website" value="_defaultWebsite"/>
+        </actionGroup>
+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection1"/>
+        <uncheckOption selector="{{LocaleOptionsSection.useDefault}}"  stepKey="uncheckUseDefault"/>
+        <grabValueFrom selector="{{LocaleOptionsSection.timezone}}" stepKey="originalTimezone1"/>
+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="Greenwich Mean Time (Africa/Abidjan)" stepKey="setTimezone1"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig1"/>
+
+        <!--Set special price to created product-->
+        <amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="openAdminEditPage"/>
+        <actionGroup ref="AddSpecialPriceToProductActionGroup" stepKey="setSpecialPriceToCreatedProduct">
+            <argument name="price" value="15"/>
+        </actionGroup>
+        <actionGroup ref="saveProductForm" stepKey="saveProductForm"/>
+
+        <!--Login to storefront from customer and check price-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="logInFromCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!--Go to the product page and check special price-->
+        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceValue}}" stepKey="grabSpecialPrice"/>
+        <assertEquals expected='$15.00' expectedType="string" actual="$grabSpecialPrice" stepKey="assertSpecialPrice"/>
+
+        <!--Reset timezone-->
+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfigReset"/>
+        <waitForPageLoad stepKey="waitForConfigPageReset"/>
+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSectionReset"/>
+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="$originalTimezone" stepKey="resetTimezone"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset"/>
+
+        <!--Reset timezone-->
+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfigReset1"/>
+        <waitForPageLoad stepKey="waitForConfigPageReset1"/>
+        <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreViewActionGroup1">
+            <argument name="website" value="_defaultWebsite"/>
+        </actionGroup>
+        <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSectionReset1"/>
+        <uncheckOption selector="{{LocaleOptionsSection.useDefault}}"  stepKey="uncheckUseDefault1"/>
+        <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="$originalTimezone" stepKey="resetTimezone1"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset1"/>
+    </test>
+</tests>

From 1ea49541cb061fba0e8eff635ce12748f7108081 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Fri, 11 Jan 2019 10:08:46 +0200
Subject: [PATCH 580/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Test/Unit/Model/Import/ProductTest.php    | 114 +++++++++---------
 1 file changed, 59 insertions(+), 55 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
index 1520da2d42a5d..db3a1776ef02c 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import;
 
+use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import;
-use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class ProductTest
@@ -147,7 +147,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
     // @codingStandardsIgnoreEnd
     protected $taxClassProcessor;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product */
+    /** @var  Product */
     protected $importProduct;
 
     /**
@@ -345,7 +345,7 @@ protected function setUp()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->importProduct = $objectManager->getObject(
-            \Magento\CatalogImportExport\Model\Import\Product::class,
+            Product::class,
             [
                 'jsonHelper' => $this->jsonHelper,
                 'importExportData' => $this->importExportData,
@@ -387,7 +387,7 @@ protected function setUp()
                 'imageTypeProcessor' => $this->imageTypeProcessor
             ]
         );
-        $reflection = new \ReflectionClass(\Magento\CatalogImportExport\Model\Import\Product::class);
+        $reflection = new \ReflectionClass(Product::class);
         $reflectionProperty = $reflection->getProperty('metadataPool');
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($this->importProduct, $metadataPoolMock);
@@ -629,7 +629,7 @@ public function testGetEmptyAttributeValueConstantFromParameters()
 
     public function testDeleteProductsForReplacement()
     {
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods([
                 'setParameters', '_deleteProducts'
@@ -695,7 +695,7 @@ public function testValidateRowIsAlreadyValidated()
      */
     public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour = Import::BEHAVIOR_DELETE)
     {
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getBehavior', 'getRowScope', 'getErrorAggregator'])
             ->getMock();
@@ -707,7 +707,7 @@ public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour
             ->method('getErrorAggregator')
             ->willReturn($this->getErrorAggregatorObject());
         $importProduct->expects($this->once())->method('getRowScope')->willReturn($rowScope);
-        $skuKey = \Magento\CatalogImportExport\Model\Import\Product::COL_SKU;
+        $skuKey = Product::COL_SKU;
         $rowData = [
             $skuKey => 'sku',
         ];
@@ -719,7 +719,7 @@ public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour
 
     public function testValidateRowDeleteBehaviourAddRowErrorCall()
     {
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getBehavior', 'getRowScope', 'addRowError', 'getErrorAggregator'])
             ->getMock();
@@ -727,14 +727,14 @@ public function testValidateRowDeleteBehaviourAddRowErrorCall()
         $importProduct->expects($this->exactly(2))->method('getBehavior')
             ->willReturn(\Magento\ImportExport\Model\Import::BEHAVIOR_DELETE);
         $importProduct->expects($this->once())->method('getRowScope')
-            ->willReturn(\Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT);
+            ->willReturn(Product::SCOPE_DEFAULT);
         $importProduct->expects($this->once())->method('addRowError');
         $importProduct->method('getErrorAggregator')
             ->willReturn(
                 $this->getErrorAggregatorObject(['addRowToSkip'])
             );
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => 'sku',
+            Product::COL_SKU => 'sku',
         ];
 
         $importProduct->validateRow($rowData, 0);
@@ -745,7 +745,7 @@ public function testValidateRowValidatorCheck()
         $messages = ['validator message'];
         $this->validator->expects($this->once())->method('getMessages')->willReturn($messages);
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => 'sku',
+            Product::COL_SKU => 'sku',
         ];
         $rowNum = 0;
         $this->importProduct->validateRow($rowData, $rowNum);
@@ -847,7 +847,7 @@ public function getStoreIdByCodeDataProvider()
         return [
             [
                 '$storeCode' => null,
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$expectedResult' => Product::SCOPE_DEFAULT,
             ],
             [
                 '$storeCode' => 'value',
@@ -868,8 +868,8 @@ public function testValidateRowCheckSpecifiedSku($sku, $expectedError)
 
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_STORE => '',
+            Product::COL_SKU => $sku,
+            Product::COL_STORE => '',
         ];
 
         $this->storeResolver->method('getStoreCodeToId')->willReturn(null);
@@ -881,7 +881,7 @@ public function testValidateRowCheckSpecifiedSku($sku, $expectedError)
         $importProduct
             ->expects($this->once())
             ->method('getRowScope')
-            ->willReturn(\Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE);
+            ->willReturn(Product::SCOPE_STORE);
         $importProduct->expects($this->at(1))->method('addRowError')->with($expectedError, $rowNum)->willReturn(null);
 
         $importProduct->validateRow($rowData, $rowNum);
@@ -895,7 +895,7 @@ public function testValidateRowProcessEntityIncrement()
         $errorAggregator->method('isRowInvalid')->willReturn(true);
         $this->setPropertyValue($this->importProduct, '_processedEntitiesCount', $count);
         $this->setPropertyValue($this->importProduct, 'errorAggregator', $errorAggregator);
-        $rowData = [\Magento\CatalogImportExport\Model\Import\Product::COL_SKU => false];
+        $rowData = [Product::COL_SKU => false];
         //suppress validator
         $this->_setValidatorMockInImportProduct($this->importProduct);
         $this->importProduct->validateRow($rowData, $rowNum);
@@ -912,7 +912,7 @@ public function testValidateRowValidateExistingProductTypeAddNewSku()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
+            Product::COL_SKU => $sku,
         ];
         $oldSku = [
             $sku => [
@@ -953,7 +953,7 @@ public function testValidateRowValidateExistingProductTypeAddErrorRowCall()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
+            Product::COL_SKU => $sku,
         ];
         $oldSku = [
             $sku => [
@@ -978,6 +978,11 @@ public function testValidateRowValidateExistingProductTypeAddErrorRowCall()
 
     /**
      * @dataProvider validateRowValidateNewProductTypeAddRowErrorCallDataProvider
+     * @param string $colType
+     * @param string $productTypeModelsColType
+     * @param string $colAttrSet
+     * @param string $attrSetNameToIdColAttrSet
+     * @param string $error
      */
     public function testValidateRowValidateNewProductTypeAddRowErrorCall(
         $colType,
@@ -985,20 +990,19 @@ public function testValidateRowValidateNewProductTypeAddRowErrorCall(
         $colAttrSet,
         $attrSetNameToIdColAttrSet,
         $error
-    )
-    {
+    ) {
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => $colType,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => $colAttrSet,
+            Product::COL_SKU => $sku,
+            Product::COL_TYPE => $colType,
+            Product::COL_ATTR_SET => $colAttrSet,
         ];
         $_attrSetNameToId = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => $attrSetNameToIdColAttrSet,
+            $rowData[Product::COL_ATTR_SET] => $attrSetNameToIdColAttrSet,
         ];
         $_productTypeModels = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => $productTypeModelsColType,
+            $rowData[Product::COL_TYPE] => $productTypeModelsColType,
         ];
         $oldSku = [
             $sku => null,
@@ -1026,25 +1030,25 @@ public function testValidateRowValidateNewProductTypeGetNewSkuCall()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => 'value',
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'value',
+            Product::COL_SKU => $sku,
+            Product::COL_TYPE => 'value',
+            Product::COL_ATTR_SET => 'value',
         ];
         $_productTypeModels = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => 'value',
+            $rowData[Product::COL_TYPE] => 'value',
         ];
         $oldSku = [
             $sku => null,
         ];
         $_attrSetNameToId = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => 'attr_set_code_val'
+            $rowData[Product::COL_ATTR_SET] => 'attr_set_code_val'
         ];
         $expectedData = [
             'entity_id' => null,
-            'type_id' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE],//value
+            'type_id' => $rowData[Product::COL_TYPE],//value
             //attr_set_id_val
-            'attr_set_id' => $_attrSetNameToId[$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET]],
-            'attr_set_code' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET],//value
+            'attr_set_id' => $_attrSetNameToId[$rowData[Product::COL_ATTR_SET]],
+            'attr_set_code' => $rowData[Product::COL_ATTR_SET],//value
             'row_id' => null
         ];
         $importProduct = $this->createModelMockWithErrorAggregator(
@@ -1080,8 +1084,8 @@ public function testValidateRowSetAttributeSetCodeIntoRowData()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'col_attr_set_val',
+            Product::COL_SKU => $sku,
+            Product::COL_ATTR_SET => 'col_attr_set_val',
         ];
         $expectedAttrSetCode = 'new_attr_set_code';
         $newSku = [
@@ -1089,8 +1093,8 @@ public function testValidateRowSetAttributeSetCodeIntoRowData()
             'type_id' => 'new_type_id_val',
         ];
         $expectedRowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => $newSku['attr_set_code'],
+            Product::COL_SKU => $sku,
+            Product::COL_ATTR_SET => $newSku['attr_set_code'],
         ];
         $oldSku = [
             $sku => [
@@ -1124,8 +1128,8 @@ public function testValidateValidateOptionEntity()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'col_attr_set_val',
+            Product::COL_SKU => $sku,
+            Product::COL_ATTR_SET => 'col_attr_set_val',
         ];
         $oldSku = [
             $sku => [
@@ -1377,7 +1381,7 @@ public function validateRowDataProvider()
     {
         return [
             [
-                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$rowScope' => Product::SCOPE_DEFAULT,
                 '$oldSku' => null,
                 '$expectedResult' => false,
             ],
@@ -1392,12 +1396,12 @@ public function validateRowDataProvider()
                 '$expectedResult' => true,
             ],
             [
-                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$rowScope' => Product::SCOPE_DEFAULT,
                 '$oldSku' => true,
                 '$expectedResult' => true,
             ],
             [
-                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$rowScope' => Product::SCOPE_DEFAULT,
                 '$oldSku' => null,
                 '$expectedResult' => false,
                 '$behaviour' => Import::BEHAVIOR_REPLACE
@@ -1418,7 +1422,7 @@ public function isAttributeValidAssertAttrValidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH - 1
+                        Product::DB_MAX_VARCHAR_LENGTH - 1
                     ),
                 ],
             ],
@@ -1471,7 +1475,7 @@ public function isAttributeValidAssertAttrValidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH - 1
+                        Product::DB_MAX_TEXT_LENGTH - 1
                     ),
                 ],
             ],
@@ -1491,7 +1495,7 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH + 1
+                        Product::DB_MAX_VARCHAR_LENGTH + 1
                     ),
                 ],
             ],
@@ -1544,7 +1548,7 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH + 1
+                        Product::DB_MAX_TEXT_LENGTH + 1
                     ),
                 ],
             ],
@@ -1556,8 +1560,8 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
      */
     public function getRowScopeDataProvider()
     {
-        $colSku = \Magento\CatalogImportExport\Model\Import\Product::COL_SKU;
-        $colStore = \Magento\CatalogImportExport\Model\Import\Product::COL_STORE;
+        $colSku = Product::COL_SKU;
+        $colStore = Product::COL_STORE;
 
         return [
             [
@@ -1565,21 +1569,21 @@ public function getRowScopeDataProvider()
                     $colSku => null,
                     $colStore => 'store',
                 ],
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE
+                '$expectedResult' => Product::SCOPE_STORE
             ],
             [
                 '$rowData' => [
                     $colSku => 'sku',
                     $colStore => null,
                 ],
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT
+                '$expectedResult' => Product::SCOPE_DEFAULT
             ],
             [
                 '$rowData' => [
                     $colSku => 'sku',
                     $colStore => 'store',
                 ],
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE
+                '$expectedResult' => Product::SCOPE_STORE
             ],
         ];
     }
@@ -1656,7 +1660,7 @@ protected function overrideMethod(&$object, $methodName, array $parameters = [])
      *
      * @see _rewriteGetOptionEntityInImportProduct()
      * @see _setValidatorMockInImportProduct()
-     * @param \Magento\CatalogImportExport\Model\Import\Product
+     * @param Product
      *  Param should go with rewritten getOptionEntity method.
      * @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -1674,7 +1678,7 @@ private function _suppressValidateRowOptionValidatorInvalidRows($importProduct)
      * Used in group of validateRow method's tests.
      * Set validator mock in importProduct, return true for isValid method.
      *
-     * @param \Magento\CatalogImportExport\Model\Import\Product
+     * @param Product
      * @return \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject
      */
     private function _setValidatorMockInImportProduct($importProduct)
@@ -1689,7 +1693,7 @@ private function _setValidatorMockInImportProduct($importProduct)
      * Used in group of validateRow method's tests.
      * Make getOptionEntity return option mock.
      *
-     * @param \Magento\CatalogImportExport\Model\Import\Product
+     * @param Product
      *  Param should go with rewritten getOptionEntity method.
      * @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -1711,7 +1715,7 @@ private function _rewriteGetOptionEntityInImportProduct($importProduct)
     protected function createModelMockWithErrorAggregator(array $methods = [], array $errorAggregatorMethods = [])
     {
         $methods[] = 'getErrorAggregator';
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods($methods)
             ->getMock();

From e386966de9f90c1478cc8081b11f68bf5151359e Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Fri, 11 Jan 2019 11:19:55 +0200
Subject: [PATCH 581/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Test/Unit/Model/Import/ProductTest.php    | 91 ++++++++++---------
 1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
index db3a1776ef02c..f85d33edb5d8c 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -10,6 +10,7 @@
 use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class ProductTest
@@ -28,122 +29,122 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
 
     const ENTITY_ID = 13;
 
-    /** @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\DB\Adapter\AdapterInterface| MockObject */
     protected $_connection;
 
-    /** @var \Magento\Framework\Json\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Json\Helper\Data| MockObject */
     protected $jsonHelper;
 
-    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data| MockObject */
     protected $_dataSourceModel;
 
-    /** @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\App\ResourceConnection| MockObject */
     protected $resource;
 
-    /** @var \Magento\ImportExport\Model\ResourceModel\Helper|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\ResourceModel\Helper| MockObject */
     protected $_resourceHelper;
 
-    /** @var \Magento\Framework\Stdlib\StringUtils|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Stdlib\StringUtils|MockObject */
     protected $string;
 
-    /** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Event\ManagerInterface|MockObject */
     protected $_eventManager;
 
-    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogInventory\Api\StockRegistryInterface|MockObject */
     protected $stockRegistry;
 
-    /** @var \Magento\CatalogImportExport\Model\Import\Product\OptionFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogImportExport\Model\Import\Product\OptionFactory|MockObject */
     protected $optionFactory;
 
-    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|MockObject */
     protected $stockConfiguration;
 
-    /** @var \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface|MockObject */
     protected $stockStateProvider;
 
-    /** @var \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject */
     protected $optionEntity;
 
-    /** @var \Magento\Framework\Stdlib\DateTime|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Stdlib\DateTime|MockObject */
     protected $dateTime;
 
     /** @var array */
     protected $data;
 
-    /** @var \Magento\ImportExport\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Helper\Data|MockObject */
     protected $importExportData;
 
-    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|MockObject */
     protected $importData;
 
-    /** @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Eav\Model\Config|MockObject */
     protected $config;
 
-    /** @var \Magento\ImportExport\Model\ResourceModel\Helper|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\ResourceModel\Helper|MockObject */
     protected $resourceHelper;
 
-    /** @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Catalog\Helper\Data|MockObject */
     protected $_catalogData;
 
-    /** @var \Magento\ImportExport\Model\Import\Config|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\ImportExport\Model\Import\Config|MockObject */
     protected $_importConfig;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    /** @var MockObject */
     protected $_resourceFactory;
 
     // @codingStandardsIgnoreStart
-    /** @var  \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory|MockObject */
     protected $_setColFactory;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Type\Factory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Type\Factory|MockObject */
     protected $_productTypeFactory;
 
-    /** @var  \Magento\Catalog\Model\ResourceModel\Product\LinkFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Catalog\Model\ResourceModel\Product\LinkFactory|MockObject */
     protected $_linkFactory;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Proxy\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Proxy\ProductFactory|MockObject */
     protected $_proxyProdFactory;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\UploaderFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\UploaderFactory|MockObject */
     protected $_uploaderFactory;
 
-    /** @var  \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Filesystem|MockObject */
     protected $_filesystem;
 
-    /** @var  \Magento\Framework\Filesystem\Directory\WriteInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Filesystem\Directory\WriteInterface|MockObject */
     protected $_mediaDirectory;
 
-    /** @var  \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory|MockObject */
     protected $_stockResItemFac;
 
-    /** @var  \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Stdlib\DateTime\TimezoneInterface|MockObject */
     protected $_localeDate;
 
-    /** @var \Magento\Framework\Indexer\IndexerRegistry|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Indexer\IndexerRegistry|MockObject */
     protected $indexerRegistry;
 
-    /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Psr\Log\LoggerInterface|MockObject */
     protected $_logger;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|MockObject */
     protected $storeResolver;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor|MockObject */
     protected $skuProcessor;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor|MockObject */
     protected $categoryProcessor;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\Validator|MockObject */
     protected $validator;
 
-    /** @var  \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor|MockObject */
     protected $objectRelationProcessor;
 
-    /** @var  \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface|MockObject */
     protected $transactionManager;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor|MockObject */
     // @codingStandardsIgnoreEnd
     protected $taxClassProcessor;
 
@@ -155,13 +156,13 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
      */
     protected $errorAggregator;
 
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject */
     protected $scopeConfig;
 
-    /** @var \Magento\Catalog\Model\Product\Url|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Catalog\Model\Product\Url|MockObject */
     protected $productUrl;
 
-    /** @var  ImageTypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  ImageTypeProcessor|MockObject */
     protected $imageTypeProcessor;
 
     /**
@@ -1662,7 +1663,7 @@ protected function overrideMethod(&$object, $methodName, array $parameters = [])
      * @see _setValidatorMockInImportProduct()
      * @param Product
      *  Param should go with rewritten getOptionEntity method.
-     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject
      */
     private function _suppressValidateRowOptionValidatorInvalidRows($importProduct)
     {
@@ -1679,7 +1680,7 @@ private function _suppressValidateRowOptionValidatorInvalidRows($importProduct)
      * Set validator mock in importProduct, return true for isValid method.
      *
      * @param Product
-     * @return \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\CatalogImportExport\Model\Import\Product\Validator|MockObject
      */
     private function _setValidatorMockInImportProduct($importProduct)
     {
@@ -1695,7 +1696,7 @@ private function _setValidatorMockInImportProduct($importProduct)
      *
      * @param Product
      *  Param should go with rewritten getOptionEntity method.
-     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject
      */
     private function _rewriteGetOptionEntityInImportProduct($importProduct)
     {
@@ -1710,7 +1711,7 @@ private function _rewriteGetOptionEntityInImportProduct($importProduct)
     /**
      * @param array $methods
      * @param array $errorAggregatorMethods
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     protected function createModelMockWithErrorAggregator(array $methods = [], array $errorAggregatorMethods = [])
     {

From 7c94b13c97484af9dbfa196d8b3b379ce7faea6e Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal.solanki@krishtechnolabs.com>
Date: Fri, 11 Jan 2019 15:07:14 +0530
Subject: [PATCH 582/932] meassage icon alignment issue resolved

---
 .../Magento/backend/web/css/source/components/_messages.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
index de24bf89620d4..4964a691e6453 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
@@ -76,7 +76,7 @@
         position: absolute;
         speak: none;
         text-shadow: none;
-        top: 1.3rem;
+        top: 1.5rem;
         width: auto;
     }
 }

From dd7c19ee5bfb218c5de32072f490df781dc00db7 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 11 Jan 2019 13:00:13 +0300
Subject: [PATCH 583/932] MAGETWO-97434: MFTF test cases have parsing error

- Stabilize functional tests.
---
 .../Mftf/ActionGroup/CheckoutActionGroup.xml  | 14 +++++-----
 .../StorefrontProductCartActionGroup.xml      | 14 +++++-----
 .../Section/CheckoutCartSummarySection.xml    |  2 +-
 .../Mftf/Test/EndToEndB2CGuestUserTest.xml    | 24 ++++++-----------
 .../Mftf/Test/EndToEndB2CLoggedInUserTest.xml | 24 ++++++-----------
 .../Mftf/Test/EndToEndB2CGuestUserTest.xml    | 27 +++++++------------
 .../Mftf/Test/EndToEndB2CLoggedInUserTest.xml | 27 +++++++------------
 7 files changed, 49 insertions(+), 83 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
index 464ccc1913335..2c5444da6d974 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -187,16 +187,16 @@
     <!-- Check order summary in checkout -->
     <actionGroup name="CheckOrderSummaryInCheckoutActionGroup">
         <arguments>
-            <argument name="subtotal"/>
-            <argument name="shippingTotal"/>
-            <argument name="shippingMethod"/>
-            <argument name="total"/>
+            <argument name="subtotal" type="string"/>
+            <argument name="shippingTotal" type="string"/>
+            <argument name="shippingMethod" type="string"/>
+            <argument name="total" type="string"/>
         </arguments>
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
-        <see userInput="${{subtotal}}" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
-        <see userInput="${{shippingTotal}}" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
+        <see userInput="{{subtotal}}" selector="{{CheckoutPaymentSection.orderSummarySubtotal}}" stepKey="assertSubtotal"/>
+        <see userInput="{{shippingTotal}}" selector="{{CheckoutPaymentSection.orderSummaryShippingTotal}}" stepKey="assertShipping"/>
         <see userInput="{{shippingMethod}}" selector="{{CheckoutPaymentSection.orderSummaryShippingMethod}}" stepKey="assertShippingMethod"/>
-        <see userInput="${{total}}" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
+        <see userInput="{{total}}" selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="assertTotal"/>
    </actionGroup>
 
     <actionGroup name="CheckTotalsSortOrderInSummarySection">
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
index 72c5648991ef5..24ed05583b6fb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml
@@ -78,20 +78,20 @@
     <!-- Check the Cart -->
     <actionGroup name="StorefrontCheckCartActionGroup">
         <arguments>
-            <argument name="subtotal"/>
-            <argument name="shipping"/>
-            <argument name="shippingMethod"/>
-            <argument name="total"/>
+            <argument name="subtotal" type="string"/>
+            <argument name="shipping" type="string"/>
+            <argument name="shippingMethod" type="string"/>
+            <argument name="total" type="string"/>
         </arguments>
         <seeInCurrentUrl url="{{CheckoutCartPage.url}}" stepKey="assertUrl"/>
         <waitForPageLoad stepKey="waitForCartPage"/>
         <conditionalClick selector="{{CheckoutCartSummarySection.shippingHeading}}" dependentSelector="{{CheckoutCartSummarySection.shippingMethodForm}}" visible="false" stepKey="openEstimateShippingSection"/>
         <waitForElementVisible selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="waitForShippingSection"/>
         <checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectShippingMethod"/>
-        <see userInput="${{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
+        <see userInput="{{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
         <see userInput="({{shippingMethod}})" selector="{{CheckoutCartSummarySection.shippingMethod}}" stepKey="assertShippingMethod"/>
-        <waitForText userInput="${{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="45" stepKey="assertShipping"/>
-        <see userInput="${{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
+        <waitForText userInput="{{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="45" stepKey="assertShipping"/>
+        <see userInput="{{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
     </actionGroup>
 
     <!-- Open the Cart from Minicart-->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
index d84df3401bab0..8d14a9a561900 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml
@@ -23,6 +23,6 @@
         <element name="country" type="select" selector="select[name='country_id']" timeout="10"/>
         <element name="countryParameterized" type="select" selector="select[name='country_id'] > option:nth-child({{var}})" timeout="10" parameterized="true"/>
         <element name="estimateShippingAndTax" type="text" selector="#block-shipping-heading" timeout="5"/>
-        <element name="flatRateShippingMethod" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
+        <element name="flatRateShippingMethod" type="input" selector="#s_method_flatrate_flatrate" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 35e0058440f6e..5335ec2ad775d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -96,14 +96,10 @@
         <comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shipping" value="E2EB2CQuote.shipping"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="E2EB2CQuote.total"/>
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shipping" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="495.00"/>
         </actionGroup>
 
         <!-- Check simple product 1 in cart -->
@@ -157,14 +153,10 @@
         <!-- Check order summary in checkout -->
         <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="guestCheckoutFillingShippingSection" />
         <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="guestCheckoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="{{E2EB2CQuote.subtotal}}"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingTotal" value="{{E2EB2CQuote.shipping}}"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="{{E2EB2CQuote.shippingMethod}}"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="{{E2EB2CQuote.total}}"/>
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shippingTotal" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="495.00"/>
         </actionGroup>
 
         <!-- Check ship to information in checkout -->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 371826c9e7841..65627787e2a05 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -96,14 +96,10 @@
         <comment userInput="Check cart information" stepKey="commentCheckCartInformation" after="cartMinicartAssertSimpleProduct2PageImageNotDefault" />
         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="cartOpenCart" after="commentCheckCartInformation"/>
         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCart" after="cartOpenCart">
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shipping" value="E2EB2CQuote.shipping"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="E2EB2CQuote.total"/>
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shipping" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="495.00"/>
         </actionGroup>
 
         <!-- Check simple product 1 in cart -->
@@ -157,14 +153,10 @@
         <!-- Check order summary in checkout -->
         <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="checkoutFillingShippingSection" />
         <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="checkoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="{{E2EB2CQuote.subtotal}}"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingTotal" value="{{E2EB2CQuote.shipping}}"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="{{E2EB2CQuote.shippingMethod}}"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="{{E2EB2CQuote.total}}"/>
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shippingTotal" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="495.00"/>
         </actionGroup>
 
         <!-- Check ship to information in checkout -->
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index da9eb8e19790e..0d365dc089e43 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -29,30 +29,21 @@
 
         <actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
             <argument name="rule" value="$$createSalesRule$$"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
+            <argument name="discount" value="48.00"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shipping" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="447.00"/>
         </actionGroup>
 
         <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shipping" value="E2EB2CQuote.shipping"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="E2EB2CQuote.total"/>
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shipping" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="495.00"/>
         </actionGroup>
         <comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon" />
     </test>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index d735d5a73f0f5..7a995b1feeeda 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -29,30 +29,21 @@
 
         <actionGroup ref="StorefrontCheckCouponAppliedActionGroup" stepKey="couponCheckAppliedDiscount" after="couponApplyCoupon">
             <argument name="rule" value="$$createSalesRule$$"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="discount" value="E2EB2CQuoteWith10PercentDiscount.discount"/>
+            <argument name="discount" value="48.00"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="couponCheckCartWithDiscount" after="couponCheckAppliedDiscount">
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="E2EB2CQuoteWith10PercentDiscount.subtotal"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shipping" value="E2EB2CQuoteWith10PercentDiscount.shipping"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="E2EB2CQuoteWith10PercentDiscount.shippingMethod"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="E2EB2CQuoteWith10PercentDiscount.total"/>
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shipping" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="447.00"/>
         </actionGroup>
 
         <actionGroup ref="StorefrontCancelCouponActionGroup" stepKey="couponCancelCoupon" after="couponCheckCartWithDiscount"/>
         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssertCartAfterCancelCoupon" after="couponCancelCoupon">
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shipping" value="E2EB2CQuote.shipping"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
-            <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="E2EB2CQuote.total"/>
+            <argument name="subtotal" value="480.00"/>
+            <argument name="shipping" value="15.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="495.00"/>
         </actionGroup>
         <comment userInput="End of using coupon code" stepKey="endOfUsingCouponCode" after="cartAssertCartAfterCancelCoupon"/>
     </test>

From 2072a2abb8f75b0cd86c97028b9d87cf2369e18e Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 11 Jan 2019 12:40:47 +0300
Subject: [PATCH 584/932] MAGETWO-96410: [2.3.x] The cart rule cannot effect
 the cart

- Update automated test script
---
 .../Section/AdminCartPriceRulesFormSection.xml  | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index 16be5a325adbb..ffea782694a8e 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -32,6 +32,13 @@
         <element name="conditionsHeaderOpen" type="button" selector="div[data-index='conditions'] div[data-state-collapsible='open']" timeout="30"/>
         <element name="conditionsValue" type="input" selector=".rule-param-edit input"/>
         <element name="conditionsOperator" type="select" selector=".rule-param-edit select"/>
+        <element name="addCondition" type="button" selector="//*[@id='conditions__{{arg}}__children']//span" parameterized="true"/>
+        <element name="ruleCondition" type="select" selector="rule[conditions][{{arg}}][new_child]" parameterized="true"/>
+        <element name="ruleParameter" type="text" selector="//span[@class='rule-param']/a[contains(text(), '{{arg}}')]" parameterized="true"/>
+        <element name="ruleParameterSelect" type="select" selector="rule[conditions][{{arg}}][operator]" parameterized="true"/>
+        <element name="ruleParameterInput" type="input" selector="rule[conditions][{{arg}}][value]" parameterized="true"/>
+        <element name="openChooser" type="button" selector="//label[@for='conditions__{{arg}}__value']" parameterized="true"/>
+        <element name="categoryCheckbox" type="checkbox" selector="//span[contains(text(), '{{arg}}')]/parent::a/preceding-sibling::input[@type='checkbox']" parameterized="true"/>
 
         <!-- Actions sub-form -->
         <element name="actionsTab" type="text" selector="//div[@data-index='actions']//span[contains(.,'Actions')][1]"/>
@@ -57,15 +64,5 @@
         <element name="couponQty" type="input" selector="#coupons_qty"/>
         <element name="generateCouponsButton" type="button" selector="#coupons_generate_button" timeout="30"/>
         <element name="generatedCouponByIndex" type="text" selector="#couponCodesGrid_table > tbody > tr:nth-child({{var}}) > td.col-code" parameterized="true"/>
-
-        <!--Conditions sub-form-->
-        <element name="conditionsHeader" type="button" selector="div[data-index='conditions']" timeout="30"/>
-        <element name="addCondition" type="button" selector="//*[@id='conditions__{{arg}}__children']//span" parameterized="true"/>
-        <element name="ruleCondition" type="select" selector="rule[conditions][{{arg}}][new_child]" parameterized="true"/>
-        <element name="ruleParameter" type="text" selector="//span[@class='rule-param']/a[contains(text(), '{{arg}}')]" parameterized="true"/>
-        <element name="ruleParameterSelect" type="select" selector="rule[conditions][{{arg}}][operator]" parameterized="true"/>
-        <element name="ruleParameterInput" type="input" selector="rule[conditions][{{arg}}][value]" parameterized="true"/>
-        <element name="openChooser" type="button" selector="//label[@for='conditions__{{arg}}__value']" parameterized="true"/>
-        <element name="categoryCheckbox" type="checkbox" selector="//span[contains(text(), '{{arg}}')]/parent::a/preceding-sibling::input[@type='checkbox']" parameterized="true"/>
     </section>
 </sections>

From 740fbd09d12a6d9175d45b88ec35e4bc1e8c1c77 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 11 Jan 2019 12:32:17 +0200
Subject: [PATCH 585/932] ENGCOM-3558: MTF test fix.

---
 .../Model/Condition/AbstractCondition.php     | 79 +++++++++++++++++--
 .../Mtf/Client/Element/ConditionsElement.php  | 27 +++++--
 .../Mtf/Client/Element/DatepickerElement.php  |  7 +-
 .../Data/Form/Element/AbstractElement.php     |  4 +
 4 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
index dcf742ee91103..d2be99757df47 100644
--- a/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
+++ b/app/code/Magento/Rule/Model/Condition/AbstractCondition.php
@@ -62,7 +62,8 @@ abstract class AbstractCondition extends \Magento\Framework\DataObject implement
     protected $_layout;
 
     /**
-     * Base name for hidden elements
+     * Base name for hidden elements.
+     *
      * @var string
      */
     protected $elementName = 'rule';
@@ -116,8 +117,9 @@ public function getDefaultOperatorInputByType()
     }
 
     /**
-     * Default operator options getter
-     * Provides all possible operator options
+     * Default operator options getter.
+     *
+     * Provides all possible operator options.
      *
      * @return array
      */
@@ -141,6 +143,8 @@ public function getDefaultOperatorOptions()
     }
 
     /**
+     * Get rule form.
+     *
      * @return Form
      */
     public function getForm()
@@ -149,6 +153,8 @@ public function getForm()
     }
 
     /**
+     * Get condition as array.
+     *
      * @param array $arrAttributes
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -195,6 +201,8 @@ public function getMappedSqlField()
     }
 
     /**
+     * Get condition as xml.
+     *
      * @return string
      */
     public function asXml()
@@ -214,6 +222,8 @@ public function asXml()
     }
 
     /**
+     * Load condition from array.
+     *
      * @param array $arr
      * @return $this
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -229,6 +239,8 @@ public function loadArray($arr)
     }
 
     /**
+     * Load condition from xml.
+     *
      * @param string|array $xml
      * @return $this
      */
@@ -242,6 +254,8 @@ public function loadXml($xml)
     }
 
     /**
+     * Load attribute options.
+     *
      * @return $this
      */
     public function loadAttributeOptions()
@@ -250,6 +264,8 @@ public function loadAttributeOptions()
     }
 
     /**
+     * Get attribute options.
+     *
      * @return array
      */
     public function getAttributeOptions()
@@ -258,6 +274,8 @@ public function getAttributeOptions()
     }
 
     /**
+     * Get attribute select options.
+     *
      * @return array
      */
     public function getAttributeSelectOptions()
@@ -270,6 +288,8 @@ public function getAttributeSelectOptions()
     }
 
     /**
+     * Get attribute name.
+     *
      * @return string
      */
     public function getAttributeName()
@@ -278,6 +298,8 @@ public function getAttributeName()
     }
 
     /**
+     * Load operator options.
+     *
      * @return $this
      */
     public function loadOperatorOptions()
@@ -300,6 +322,8 @@ public function getInputType()
     }
 
     /**
+     * Get operator select options.
+     *
      * @return array
      */
     public function getOperatorSelectOptions()
@@ -316,6 +340,8 @@ public function getOperatorSelectOptions()
     }
 
     /**
+     * Get operator name.
+     *
      * @return array
      */
     public function getOperatorName()
@@ -324,6 +350,8 @@ public function getOperatorName()
     }
 
     /**
+     * Load value options.
+     *
      * @return $this
      */
     public function loadValueOptions()
@@ -333,6 +361,8 @@ public function loadValueOptions()
     }
 
     /**
+     * Get value select options.
+     *
      * @return array
      */
     public function getValueSelectOptions()
@@ -380,6 +410,8 @@ public function isArrayOperatorType()
     }
 
     /**
+     * Get value.
+     *
      * @return mixed
      */
     public function getValue()
@@ -395,6 +427,8 @@ public function getValue()
     }
 
     /**
+     * Get value name.
+     *
      * @return array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -446,6 +480,8 @@ public function getNewChildSelectOptions()
     }
 
     /**
+     * Get new child name.
+     *
      * @return string
      */
     public function getNewChildName()
@@ -454,6 +490,8 @@ public function getNewChildName()
     }
 
     /**
+     * Get this condition as html.
+     *
      * @return string
      */
     public function asHtml()
@@ -467,6 +505,8 @@ public function asHtml()
     }
 
     /**
+     * Get this condition with subconditions as html.
+     *
      * @return string
      */
     public function asHtmlRecursive()
@@ -475,6 +515,8 @@ public function asHtmlRecursive()
     }
 
     /**
+     * Get type element.
+     *
      * @return AbstractElement
      */
     public function getTypeElement()
@@ -493,6 +535,8 @@ public function getTypeElement()
     }
 
     /**
+     * Get type element html.
+     *
      * @return string
      */
     public function getTypeElementHtml()
@@ -501,6 +545,8 @@ public function getTypeElementHtml()
     }
 
     /**
+     * Get attribute element.
+     *
      * @return $this
      */
     public function getAttributeElement()
@@ -528,6 +574,8 @@ public function getAttributeElement()
     }
 
     /**
+     * Get attribute element html.
+     *
      * @return string
      */
     public function getAttributeElementHtml()
@@ -536,8 +584,9 @@ public function getAttributeElementHtml()
     }
 
     /**
-     * Retrieve Condition Operator element Instance
-     * If the operator value is empty - define first available operator value as default
+     * Retrieve Condition Operator element Instance.
+     *
+     * If the operator value is empty - define first available operator value as default.
      *
      * @return \Magento\Framework\Data\Form\Element\Select
      */
@@ -568,6 +617,8 @@ public function getOperatorElement()
     }
 
     /**
+     * Get operator element html.
+     *
      * @return string
      */
     public function getOperatorElementHtml()
@@ -587,6 +638,8 @@ public function getValueElementType()
     }
 
     /**
+     * Get value element renderer.
+     *
      * @return \Magento\Rule\Block\Editable
      */
     public function getValueElementRenderer()
@@ -598,6 +651,8 @@ public function getValueElementRenderer()
     }
 
     /**
+     * Get value element.
+     *
      * @return $this
      */
     public function getValueElement()
@@ -629,6 +684,8 @@ public function getValueElement()
     }
 
     /**
+     * Get value element html.
+     *
      * @return string
      */
     public function getValueElementHtml()
@@ -637,6 +694,8 @@ public function getValueElementHtml()
     }
 
     /**
+     * Get add link html.
+     *
      * @return string
      */
     public function getAddLinkHtml()
@@ -646,6 +705,8 @@ public function getAddLinkHtml()
     }
 
     /**
+     * Get remove link html.
+     *
      * @return string
      */
     public function getRemoveLinkHtml()
@@ -658,6 +719,8 @@ public function getRemoveLinkHtml()
     }
 
     /**
+     * Get chooser container html.
+     *
      * @return string
      */
     public function getChooserContainerHtml()
@@ -667,6 +730,8 @@ public function getChooserContainerHtml()
     }
 
     /**
+     * Get this condition as string.
+     *
      * @param string $format
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -677,6 +742,8 @@ public function asString($format = '')
     }
 
     /**
+     * Get this condition with subconditions as string.
+     *
      * @param int $level
      * @return string
      */
@@ -819,6 +886,8 @@ protected function _compareValues($validatedValue, $value, $strict = true)
     }
 
     /**
+     * Validate model.
+     *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @return bool
      */
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
index d1fd351302414..6dbf2b1aa6a12 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Mtf\Client\Element;
 
-use Magento\Mtf\ObjectManager;
-use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Client\ElementInterface;
+use Magento\Mtf\Client\Locator;
+use Magento\Mtf\ObjectManager;
 
 /**
  * Typified element class for conditions.
@@ -135,6 +135,13 @@ class ConditionsElement extends SimpleElement
      */
     protected $chooserGridLocator = 'div[id*=chooser]';
 
+    /**
+     * Datepicker xpath.
+     *
+     * @var string
+     */
+    private $datepicker = './/*[contains(@class,"ui-datepicker-trigger")]';
+
     /**
      * Key of last find param.
      *
@@ -189,10 +196,7 @@ class ConditionsElement extends SimpleElement
     protected $exception;
 
     /**
-     * Set value to conditions.
-     *
-     * @param string $value
-     * @return void
+     * @inheritdoc
      */
     public function setValue($value)
     {
@@ -411,7 +415,16 @@ protected function fillText($rule, ElementInterface $param)
     {
         $value = $param->find('input', Locator::SELECTOR_TAG_NAME);
         if ($value->isVisible()) {
-            $value->setValue($rule);
+            if (!$value->getAttribute('readonly')) {
+                $value->setValue($rule);
+            } else {
+                $datepicker = $param->find(
+                    $this->datepicker,
+                    Locator::SELECTOR_XPATH,
+                    DatepickerElement::class
+                );
+                $datepicker->setValue($rule);
+            }
 
             $apply = $param->find('.//*[@class="rule-param-apply"]', Locator::SELECTOR_XPATH);
             if ($apply->isVisible()) {
diff --git a/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
index a0e350cb3da43..eb277c2cc43dd 100644
--- a/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
+++ b/dev/tests/functional/lib/Magento/Mtf/Client/Element/DatepickerElement.php
@@ -66,13 +66,16 @@ public function setValue($value)
         $date = $this->parseDate($value);
         $date[1] = ltrim($date[1], '0');
         $this->click();
-        $this->find($this->datePickerButton, Locator::SELECTOR_XPATH)->click();
         $datapicker = $this->find($this->datePickerBlock, Locator::SELECTOR_XPATH);
+        $datepickerClose = $datapicker->find($this->datePickerButtonClose, Locator::SELECTOR_XPATH);
+        if (!$datepickerClose->isVisible()) {
+            $this->find($this->datePickerButton, Locator::SELECTOR_XPATH)->click();
+        }
         $datapicker->find($this->datePickerYear, Locator::SELECTOR_XPATH, 'select')->setValue($date[2]);
         $datapicker->find($this->datePickerMonth, Locator::SELECTOR_XPATH, 'select')->setValue($date[0]);
         $datapicker->find(sprintf($this->datePickerCalendar, $date[1]), Locator::SELECTOR_XPATH)->click();
         if ($datapicker->isVisible()) {
-            $datapicker->find($this->datePickerButtonClose, Locator::SELECTOR_XPATH)->click();
+            $datepickerClose->click();
         }
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index ac9cdd3822ec5..3638ff921fa9d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -201,6 +201,8 @@ public function setType($type)
     }
 
     /**
+     * Set form.
+     *
      * @param AbstractForm $form
      * @return $this
      */
@@ -327,6 +329,8 @@ public function getRenderer()
     }
 
     /**
+     * Get Ui Id.
+     *
      * @param null|string $suffix
      * @return string
      */

From 1eab92ef055b5b0ef190573cbf270fc5aa1798d9 Mon Sep 17 00:00:00 2001
From: David91 <davitzakharyand@mail.ru>
Date: Fri, 11 Jan 2019 14:45:39 +0400
Subject: [PATCH 586/932] MAGETWO-82221: [CE 2.1.0 rc3] - Cancel an order
 [configurable product]#5313

- Added automated test script.
---
 .../ProductsQtyReturnAfterOrderCancelTest.xml | 98 +++++++++++++++++++
 .../ActionGroup/AdminOrderActionGroup.xml     | 76 +++++++++++++-
 2 files changed, 172 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
new file mode 100644
index 0000000000000..ab607d9ba55cd
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
@@ -0,0 +1,98 @@
+<?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="ProductsQtyReturnAfterOrderCancel">
+
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <title value="Product qunatity return after order cancel"/>
+            <description value="Check Product qunatity return after order cancel"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-97228"/>
+            <useCaseId value="MAGETWO-82221"/>
+            <group value="ConfigurableProduct"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
+        </after>
+
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage1"/>
+
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+        </actionGroup>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="changeProductQuantity"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveChanges"/>
+        <waitForPageLoad stepKey="waitProductGridToBeLoaded"/>
+
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <fillField selector="{{StorefrontProductInfoMainSection.qty}}" userInput="4" stepKey="fillQuantity"/>
+
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createConfigProduct.name$$"/>
+        </actionGroup>
+
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne"/>
+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
+        </actionGroup>
+
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
+        </actionGroup>
+
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
+
+        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+
+        <click selector="{{AdminOrdersGridSection.firstRow}}" stepKey="clickOrderRow"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceButton"/>
+        <waitForPageLoad stepKey="waitForNewInvoicePageLoad"/>
+        <fillField selector="{{AdminInvoiceItemsSection.qtyToInvoiceColumn}}" userInput="1" stepKey="ChangeQtyToInvoice"/>
+        <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQunatity"/>
+        <waitForPageLoad stepKey="waitPageToBeLoaded"/>
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <waitForPageLoad stepKey="waitForSuccessMessageLoad"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
+        <waitForPageLoad stepKey="waitOrderDetailToLoad"/>
+        <fillField selector="{{AdminShipmentItemsSection.itemQtyToShip('1')}}" userInput="1" stepKey="changeItemQtyToShip"/>
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
+        <waitForPageLoad stepKey="waitShipmentSectionToLoad"/>
+        <actionGroup ref="cancelPendingOrder" stepKey="cancelPendingOption">
+            <argument name="orderStatus" value="Complete"/>
+        </actionGroup>
+
+        <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Canceled 3" stepKey="seeCanceledQuantity"/>
+
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
+
+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGridBySku">
+            <argument name="sku" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Quantity')}}" userInput="99.0000" stepKey="seeProductSkuInGrid"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index 10d791ddc487d..aea04c8abfa60 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -39,20 +39,35 @@
     <actionGroup name="navigateToNewOrderPageExistingCustomer">
         <arguments>
             <argument name="customer"/>
+            <argument name="storeView" defaultValue="_defaultStore"/>
         </arguments>
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
         <waitForPageLoad stepKey="waitForIndexPageLoad"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <waitForPageLoad stepKey="waitForCustomerGridLoad"/>
+        <!--Clear grid filters-->
+        <conditionalClick selector="{{AdminOrderCustomersGridSection.resetButton}}" dependentSelector="{{AdminOrderCustomersGridSection.resetButton}}" visible="true" stepKey="clearExistingCustomerFilters"/>
         <fillField userInput="{{customer.email}}" selector="{{AdminOrderCustomersGridSection.emailInput}}" stepKey="filterEmail"/>
         <click selector="{{AdminOrderCustomersGridSection.apply}}" stepKey="applyFilter"/>
         <waitForPageLoad stepKey="waitForFilteredCustomerGridLoad"/>
         <click selector="{{AdminOrderCustomersGridSection.firstRow}}" stepKey="clickOnCustomer"/>
         <waitForPageLoad stepKey="waitForCreateOrderPageLoad" />
+        <!-- Select store view if appears -->
+        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(storeView.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
+        <waitForPageLoad stepKey="waitForCreateOrderPageLoadAfterStoreSelect" />
         <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"/>
@@ -307,13 +322,70 @@
         <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
     </actionGroup>
 
+    <actionGroup name="CreateOrderInStoreChoosingPaymentMethodActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="customer"/>
+            <argument name="storeView"/>
+        </arguments>
+        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
+        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
+        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
+        <click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
+        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
+        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
+        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethods"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
+    </actionGroup>
+
     <!--Cancel order that is in pending status-->
     <actionGroup name="cancelPendingOrder">
+        <arguments>
+            <argument name="orderStatus" type="string" defaultValue="Canceled"/>
+        </arguments>
         <click selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="clickCancelOrder"/>
         <waitForElement selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForCancelConfirmation"/>
         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to cancel this order?" stepKey="seeConfirmationMessage"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmOrderCancel"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{orderStatus}}" stepKey="seeOrderStatusCanceled"/>
+    </actionGroup>
+
+    <!--Select Check Money payment method-->
+    <actionGroup name="SelectCheckMoneyPaymentMethod">
+        <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
+        <conditionalClick selector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" dependentSelector="{{AdminOrderFormPaymentSection.checkMoneyOption}}" visible="true" stepKey="checkCheckMoneyOption"/>
+    </actionGroup>
+
+    <!-- Create Order -->
+    <actionGroup name="CreateOrderActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="customer"/>
+        </arguments>
+        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
+        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
+        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
+        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
+        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
+        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethods"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>

From a0bfa97e97e09ba7d1d25b5bec28d276cfb3aa18 Mon Sep 17 00:00:00 2001
From: amol 2jcommerce <amol@2jcommerce.in>
Date: Fri, 11 Jan 2019 16:18:15 +0530
Subject: [PATCH 587/932] Fixed-Hamburger-Icon-was-available-Page

---
 app/design/frontend/Magento/blank/web/css/print.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/design/frontend/Magento/blank/web/css/print.less b/app/design/frontend/Magento/blank/web/css/print.less
index ebfc6ce4300b7..d902b747f92d5 100644
--- a/app/design/frontend/Magento/blank/web/css/print.less
+++ b/app/design/frontend/Magento/blank/web/css/print.less
@@ -16,6 +16,9 @@
         float: none;
         text-align: left;
     }
+    .nav-toggle {
+        display: none;
+    }
 }
 
 @media print {

From bbe41a20060aa878a65f30bd53c09cc3f784ec08 Mon Sep 17 00:00:00 2001
From: amol 2jcommerce <amol@2jcommerce.in>
Date: Fri, 11 Jan 2019 16:59:04 +0530
Subject: [PATCH 588/932] Fixed-Hamburger-Icon-was-available-Page

---
 app/design/frontend/Magento/blank/web/css/print.less        | 3 ---
 .../Magento/luma/Magento_Theme/web/css/source/_module.less  | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/design/frontend/Magento/blank/web/css/print.less b/app/design/frontend/Magento/blank/web/css/print.less
index d902b747f92d5..ebfc6ce4300b7 100644
--- a/app/design/frontend/Magento/blank/web/css/print.less
+++ b/app/design/frontend/Magento/blank/web/css/print.less
@@ -16,9 +16,6 @@
         float: none;
         text-align: left;
     }
-    .nav-toggle {
-        display: none;
-    }
 }
 
 @media print {
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index bafe1be57ee35..583a2d64e5f68 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -144,6 +144,12 @@
         }
     }
 
+    .page-print {
+        .nav-toggle {
+            display: none;
+        }
+    }
+
     .page-main {
         > .page-title-wrapper {
             .page-title + .action {

From 8ad7b1f92f1288213112e695fd0db357b66e936d Mon Sep 17 00:00:00 2001
From: priti <priti@2jcommerce.in>
Date: Fri, 11 Jan 2019 17:32:36 +0530
Subject: [PATCH 589/932] Wishlist-alignment-issue-at-mobile

---
 .../Magento_MultipleWishlist/web/css/source/_module.less      | 2 +-
 .../blank/Magento_Wishlist/web/css/source/_module.less        | 4 ++--
 .../luma/Magento_MultipleWishlist/web/css/source/_module.less | 2 +-
 .../Magento/luma/Magento_Wishlist/web/css/source/_module.less | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
index 2761a2f74f990..c572c983d80d9 100644
--- a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
@@ -350,7 +350,7 @@
         .product {
             &-item {
                 &-checkbox {
-                    left: 20px;
+                    left: 0;
                     position: absolute;
                     top: 20px;
                 }
diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
index 0e8350261e002..b8ae5b6713297 100644
--- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
@@ -177,10 +177,10 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .products-grid.wishlist {
         margin-bottom: @indent__l;
-        margin-right: -@indent__s;
+        margin-right: 0;
         .product {
             &-item {
-                padding: @indent__base @indent__s @indent__base @indent__base;
+                padding: @indent__base 0 @indent__base 0;
                 position: relative;
 
                 &-photo {
diff --git a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
index 0b01c54a64378..7ed4a9e64e943 100644
--- a/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_MultipleWishlist/web/css/source/_module.less
@@ -429,7 +429,7 @@
         .product {
             &-item {
                 &-checkbox {
-                    left: 20px;
+                    left: 0;
                     position: absolute;
                     top: 20px;
                 }
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 584eefb9bc643..c41270d8e427d 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -185,11 +185,11 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .products-grid.wishlist {
         margin-bottom: @indent__l;
-        margin-right: -@indent__s;
+        margin-right: 0;
 
         .product {
             &-item {
-                padding: @indent__base @indent__s @indent__base @indent__base;
+                padding: @indent__base 0 @indent__base 0;
                 position: relative;
 
                 &-photo {

From 09e2b43e1d03c4b80614be2da414286653216e4e Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 11 Jan 2019 14:33:17 +0200
Subject: [PATCH 590/932] Fix integration tests.

---
 .../Multishipping/Model/Checkout/Type/Multishipping.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index d1df064f57140..42f5289d2109a 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -1182,7 +1182,7 @@ private function removePlacedItemsFromQuote(array $shippingAddresses, array $pla
     {
         foreach ($shippingAddresses as $address) {
             foreach ($address->getAllItems() as $addressItem) {
-                if (in_array($addressItem->getId(), $placedAddressItems)) {
+                if (in_array($addressItem->getQuoteItemId(), $placedAddressItems)) {
                     if ($addressItem->getProduct()->getIsVirtual()) {
                         $addressItem->isDeleted(true);
                     } else {
@@ -1232,7 +1232,7 @@ private function searchQuoteAddressId(OrderInterface $order, array $addresses):
         $item = array_pop($items);
         foreach ($addresses as $address) {
             foreach ($address->getAllItems() as $addressItem) {
-                if ($addressItem->getId() == $item->getQuoteItemId()) {
+                if ($addressItem->getQuoteItemId() == $item->getQuoteItemId()) {
                     return (int)$address->getId();
                 }
             }

From 1e7bae1eda1148fab178e9ae43366f6ae35d876f Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 11 Jan 2019 14:45:45 +0200
Subject: [PATCH 591/932] ENGCOM-3825: Static test fix.

---
 .../luma/Magento_Theme/web/css/source/_module.less        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
index 456cef112dcef..2ef30ee9e40aa 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -312,18 +312,18 @@
             }
         }
     }
-    .page-header{
+    .page-header {
         .switcher {
             .options {
                 ul.dropdown {
                     right: 0;
-                    &:before{
-                        right: 10px;
+                    &:before {
                         left: auto;
+                        right: 10px;
                     }
                     &:after {
-                        right: 9px;
                         left: auto;
+                        right: 9px;
                     }
                 }
             }

From ff786af483f9ad6f1d5e7150632199978a46b71d Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 11 Jan 2019 15:27:33 +0200
Subject: [PATCH 592/932] ENGCOM-3821: Static test fix.

---
 .../Magento_VisualMerchandiser/web/css/source/_module.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
index 8eee978318d83..554b6394a1094 100644
--- a/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_VisualMerchandiser/web/css/source/_module.less
@@ -68,15 +68,15 @@
 
             a {
                 color: @color-gray85;
+                cursor: move;
                 display: block;
                 float: left;
                 text-decoration: none;
-                cursor: move;
             }
 
             a:last-child {
-                float: right;
                 cursor: pointer;
+                float: right;
             }
         }
 

From 928618327fb83e52a564631e56b9e3ce3d38caef Mon Sep 17 00:00:00 2001
From: Tristan Hofman <tristan@baldwin.be>
Date: Fri, 11 Jan 2019 14:34:02 +0100
Subject: [PATCH 593/932] Las Palmas and Tenerife should be represented by
 Canary Islands in UPS

---
 .../Shipping/Model/Carrier/AbstractCarrierOnline.php      | 6 ++++++
 app/code/Magento/Ups/Model/Carrier.php                    | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 27047ae46bf1f..52c40083ba0db 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -29,6 +29,12 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
 
     const GUAM_REGION_CODE = 'GU';
 
+    const CANARY_ISLANDS_COUNTRY_ID = 'IC';
+
+    const SANTA_CRUZ_DE_TENERIFE_REGION_ID = 'Santa Cruz de Tenerife';
+
+    const LAS_PALMAS_REGION_ID = 'Las Palmas';
+
     /**
      * Array of quotes
      *
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 06f68db05398f..f5990ed098c8f 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -332,6 +332,14 @@ public function setRequest(RateRequest $request)
             $destCountry = self::GUAM_COUNTRY_ID;
         }
 
+        // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
+        if (
+            $destCountry == self::SPAIN_COUNTRY_ID &&
+            ($request->getDestRegionCode() == self::LAS_PALMAS_REGION_ID || $request->getDestRegionCode() == self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
+        ) {
+            $destCountry = self::CANARY_ISLANDS_COUNTRY_ID;
+        }
+
         $country = $this->_countryFactory->create()->load($destCountry);
         $rowRequest->setDestCountry($country->getData('iso2_code') ?: $destCountry);
 

From 16b480ff2cfc8de1e11110c6bee6f3050e256e52 Mon Sep 17 00:00:00 2001
From: Nainesh <nainesh@2jcommerce.in>
Date: Fri, 11 Jan 2019 19:41:21 +0530
Subject: [PATCH 594/932] 'review-text-is-not-show-uniformly' :: add your
 review text is not show uniformly in Mobile view

---
 .../Magento/luma/Magento_Review/web/css/source/_module.less    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
index 2c66420f65fbd..f4fdf01a24ab5 100644
--- a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
@@ -297,6 +297,9 @@
             a:not(:last-child) {
                 margin-right: 30px;
             }
+          .action.add {
+            white-space: nowrap;
+          }
         }
     }
 

From e7154fb3384a5332a7c2941ed902e109bc4b0534 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Fri, 11 Jan 2019 09:19:12 -0600
Subject: [PATCH 595/932] MAGETWO-97411:
 \Magento\Customer\Model\Customer::getDataModel method takes to much time to
 load with many addresses customer

---
 app/code/Magento/Customer/Model/Address.php  |  9 +++-----
 app/code/Magento/Customer/Model/Customer.php | 22 +++++++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 4976ec546609f..236c47aa1cc38 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -172,12 +172,9 @@ public function updateData(AddressInterface $address)
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
         if ($this->getCustomerId() || $this->getParentId()) {
-            if ($this->getCustomer()->getDefaultBillingAddress()) {
-                $defaultBillingAddressId = $this->getCustomer()->getDefaultBillingAddress()->getId();
-            }
-            if ($this->getCustomer()->getDefaultShippingAddress()) {
-                $defaultShippingAddressId = $this->getCustomer()->getDefaultShippingAddress()->getId();
-            }
+            $primaryAddresses = $this->getCustomer()->getPrimaryAddressIds();
+            $defaultBillingAddressId = $primaryAddresses['billing_address'] ?: $defaultBillingAddressId;
+            $defaultShippingAddressId = $primaryAddresses['shipping_address'] ?: $defaultShippingAddressId;
         }
         return parent::getDataModel($defaultBillingAddressId, $defaultShippingAddressId);
     }
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 972cb63ed452e..fe55243130319 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -219,6 +219,11 @@ class Customer extends \Magento\Framework\Model\AbstractModel
      */
     private $accountConfirmation;
 
+    /**
+     * @var array
+     */
+    private $storedAddress;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -311,10 +316,13 @@ public function _construct()
     public function getDataModel()
     {
         $customerData = $this->getData();
-        $addressesData = [];
-        /** @var \Magento\Customer\Model\Address $address */
-        foreach ($this->getAddresses() as $address) {
-            $addressesData[] = $address->getDataModel();
+        if (!isset($this->storedAddress[$customerData['entity_id']])) {
+            $addressesData = [];
+            /** @var \Magento\Customer\Model\Address $address */
+            foreach ($this->getAddresses() as $address) {
+                $addressesData[] = $address->getDataModel();
+            }
+            $this->storedAddress[$customerData['entity_id']] = $addressesData;
         }
         $customerDataObject = $this->customerDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
@@ -322,7 +330,7 @@ public function getDataModel()
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
-        $customerDataObject->setAddresses($addressesData)
+        $customerDataObject->setAddresses($this->storedAddress[$customerData['entity_id']])
             ->setId($this->getId());
         return $customerDataObject;
     }
@@ -676,10 +684,10 @@ public function getPrimaryAddressIds()
     {
         $ids = [];
         if ($this->getDefaultBilling()) {
-            $ids[] = $this->getDefaultBilling();
+            $ids['billing_address'] = $this->getDefaultBilling();
         }
         if ($this->getDefaultShipping()) {
-            $ids[] = $this->getDefaultShipping();
+            $ids['shipping_address'] = $this->getDefaultShipping();
         }
         return $ids;
     }

From 42833572b51f73eb321cd327ec1283f32a08eb15 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 11 Jan 2019 09:26:48 -0600
Subject: [PATCH 596/932] MC-6283: [System Configuration] Introduce the new
 settings related to Smart buttons

- add installment period to configuration
---
 app/code/Magento/Paypal/Model/Config.php      |  2 +
 .../Paypal/Model/ExpressConfigProvider.php    | 44 +++++++++++++++--
 .../ExpressButtons/InstallmentPeriod.php      | 48 +++++++++++++++++++
 .../etc/adminhtml/system/express_checkout.xml | 20 ++++++++
 4 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/InstallmentPeriod.php

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 02ea30e6bc003..5c26fe5d07f98 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1666,6 +1666,8 @@ protected function _mapButtonStyleFieldset($fieldName)
             case 'checkout_page_button_color':
             case 'checkout_page_button_shape':
             case 'checkout_page_button_label':
+            case 'checkout_page_button_mx_installment_period':
+            case 'checkout_page_button_br_installment_period':
             case 'disable_funding_options':
                 return "payment/{$this->_methodCode}/{$fieldName}";
             default:
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 92ca97a4da198..db2ace91b0d0e 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -132,7 +132,7 @@ public function getConfig()
                     ],
                     'allowedFunding' => [],
                     'disallowedFunding' => $this->getDisallowedFunding(),
-                    'styles' => $this->getButtonStyles(),
+                    'styles' => $this->getButtonStyles($locale),
                     'startUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData'),
                     'onAuthorizeUrl' => $this->urlBuilder->getUrl('paypal/express/onAuthorization'),
                     'onCancelUrl' => $this->urlBuilder->getUrl('paypal/express/cancel')
@@ -189,9 +189,10 @@ protected function getBillingAgreementCode($code)
     /**
      * Returns button styles based on configuration
      *
+     * @param string $locale
      * @return array
      */
-    private function getButtonStyles()
+    private function getButtonStyles($locale)
     {
         $this->config->setMethod(Config::METHOD_EXPRESS);
 
@@ -209,11 +210,44 @@ private function getButtonStyles()
             $styles['shape'] = $this->config->getValue('checkout_page_button_shape');
             $styles['label'] = $this->config->getValue('checkout_page_button_label');
 
-            if ($styles['label'] === 'credit') {
-                $styles['color'] = 'darkblue';
-                $styles['layout'] = 'horizontal';
+            $styles = $this->updateStyles($styles, $locale);
+        }
+        return $styles;
+    }
+
+    /**
+     * Update styles based on locale and labels
+     *
+     * @param array $styles
+     * @param string $locale
+     * @return array
+     */
+    private function updateStyles($styles, $locale)
+    {
+        $installmentPeriodLocale = [
+            'en_MX' => 'mx',
+            'es_MX' => 'mx',
+            'en_BR' => 'br',
+            'pt_BR' => 'br'
+        ];
+
+        // Credit label cannot be used with any custom color option or vertical layout.
+        if ($styles['label'] === 'credit') {
+            $styles['color'] = 'darkblue';
+            $styles['layout'] = 'horizontal';
+        }
+
+        // Installment label is only available for specific locales
+        if ($styles['label'] === 'installment') {
+            if (array_key_exists($locale, $installmentPeriodLocale)) {
+                $styles['installmentperiod'] = (int)$this->config->getValue(
+                    "checkout_page_button_{$installmentPeriodLocale[$locale]}_installment_period"
+                );
+            } else {
+                $styles['label'] = 'paypal';
             }
         }
+
         return $styles;
     }
 
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/InstallmentPeriod.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/InstallmentPeriod.php
new file mode 100644
index 0000000000000..2856fbc6c7e3a
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/InstallmentPeriod.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
+
+class InstallmentPeriod
+{
+    /**
+     * Brazil button installment period source getter for Checkout Page
+     *
+     * @return array
+     */
+    public function getCheckoutBrInstallmentPeriod(): array
+    {
+        return [
+            2 => 2,
+            3 => 3,
+            4 => 4,
+            5 => 5,
+            6 => 6,
+            7 => 7,
+            8 => 8,
+            9 => 9,
+            10 => 10,
+            11 => 11,
+            12 => 12
+        ];
+    }
+
+    /**
+     * Mexico button installment period source getter for Checkout Page
+     *
+     * @return array
+     */
+    public function getCheckoutMxInstallmentPeriod(): array
+    {
+        return [
+            3 => 3,
+            6 => 6,
+            9 => 9,
+            12 => 12
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 71ea376128625..bc540f1083101 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -668,6 +668,26 @@
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
+                        <field id="checkout_page_button_mx_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                            <label>Mexico Installment Period</label>
+                            <config_path>payment/paypal_express/checkout_page_button_mx_installment_period</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutMxInstallmentPeriod</source_model>
+                            <depends>
+                                <field id="checkout_page_button_customize">1</field>
+                                <field id="checkout_page_button_label">installment</field>
+                            </depends>
+                            <attribute type="shared">1</attribute>
+                        </field>
+                        <field id="checkout_page_button_br_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                            <label>Brazil Installment Period</label>
+                            <config_path>payment/paypal_express/checkout_page_button_br_installment_period</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutBrInstallmentPeriod</source_model>
+                            <depends>
+                                <field id="checkout_page_button_customize">1</field>
+                                <field id="checkout_page_button_label">installment</field>
+                            </depends>
+                            <attribute type="shared">1</attribute>
+                        </field>
                         <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
                             <label>Layout</label>
                             <config_path>payment/paypal_express/checkout_page_button_layout</config_path>

From b22c0568d593612b538a076eb7f0d4a663be35d0 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 11 Jan 2019 12:08:24 -0600
Subject: [PATCH 597/932] MC-6281: [Backend]: Create Controller to getToken
 from PayPal

- clean up GetTokenData code
---
 .../Controller/Express/GetTokenData.php       | 48 +++++++++----------
 .../Paypal/Model/ExpressConfigProvider.php    |  2 +-
 .../express-checkout-smart-buttons.js         |  2 +-
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
index 02631d194c97b..e279faafc29f6 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -13,6 +13,7 @@
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Paypal\Model\Express\Checkout;
+use Magento\Paypal\Model\Config;
 
 class GetTokenData extends AbstractExpress implements HttpGetActionInterface
 {
@@ -21,21 +22,21 @@ class GetTokenData extends AbstractExpress implements HttpGetActionInterface
      *
      * @var string
      */
-    protected $_configType = \Magento\Paypal\Model\Config::class;
+    protected $_configType = Config::class;
 
     /**
      * Config method type
      *
      * @var string
      */
-    protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
+    protected $_configMethod = Config::METHOD_WPP_EXPRESS;
 
     /**
      * Checkout mode type
      *
      * @var string
      */
-    protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
+    protected $_checkoutType = Checkout::class;
 
     /**
      * @var \Psr\Log\LoggerInterface
@@ -43,19 +44,19 @@ class GetTokenData extends AbstractExpress implements HttpGetActionInterface
     private $logger;
 
     /**
-     * @var \Magento\Quote\Api\CartRepositoryInterface
+     * @var \Magento\Customer\Model\ResourceModel\CustomerRepository
      */
-    private $quoteRepository;
+    private $customerRepository;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\CustomerRepository
+     * @var \Magento\Quote\Api\CartRepositoryInterface
      */
-    private $customerRepository;
+    private $cartRepository;
 
     /**
-     * @var \Magento\Quote\Model\QuoteIdMaskFactory
+     * @var \Magento\Quote\Api\GuestCartRepositoryInterface
      */
-    private $quoteIdMaskFactory;
+    private $guestCartRepository;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
@@ -67,9 +68,9 @@ class GetTokenData extends AbstractExpress implements HttpGetActionInterface
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Quote\Api\CartRepositoryInterface $quoteRepository
      * @param \Magento\Customer\Model\ResourceModel\CustomerRepository $customerRepository
-     * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
+     * @param \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -81,11 +82,10 @@ public function __construct(
         \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Customer\Model\Url $customerUrl,
         \Psr\Log\LoggerInterface $logger,
-        \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
         \Magento\Customer\Model\ResourceModel\CustomerRepository $customerRepository,
-        \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
-    )
-    {
+        \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
+        \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
+    ) {
         parent::__construct(
             $context,
             $customerSession,
@@ -98,15 +98,17 @@ public function __construct(
         );
 
         $this->logger = $logger;
-        $this->quoteRepository = $quoteRepository;
         $this->customerRepository = $customerRepository;
-        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->cartRepository = $cartRepository;
+        $this->guestCartRepository = $guestCartRepository;
     }
 
     /**
-     * @return \Magento\Framework\App\ResponseInterface|ResultInterface
+     * Get token data
+     *
+     * @return \Magento\Framework\Controller\ResultInterface
      */
-    public function execute()
+    public function execute(): ResultInterface
     {
         $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         $responseContent = [
@@ -143,18 +145,14 @@ public function execute()
      * @return string|null
      * @throws LocalizedException
      */
-    protected function getToken()
+    private function getToken(): ?string
     {
         $quoteId = $this->getRequest()->getParam('quote_id');
         $customerId = $this->getRequest()->getParam('customer_id');
         $hasButton = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_BUTTON);
         $isBaRequested = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT);
 
-        if (!$customerId) {
-            $quoteIdMask = $this->quoteIdMaskFactory->create()->load($quoteId, 'masked_id');
-            $quoteId = $quoteIdMask->getQuoteId();
-        }
-        $quote = $this->quoteRepository->get((int)$quoteId);
+        $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
         $this->_initCheckout($quote);
 
         if ($quote->getIsMultiShipping()) {
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index db2ace91b0d0e..776d2041c9c79 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -133,7 +133,7 @@ public function getConfig()
                     'allowedFunding' => [],
                     'disallowedFunding' => $this->getDisallowedFunding(),
                     'styles' => $this->getButtonStyles($locale),
-                    'startUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData'),
+                    'getTokenUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData'),
                     'onAuthorizeUrl' => $this->urlBuilder->getUrl('paypal/express/onAuthorization'),
                     'onCancelUrl' => $this->urlBuilder->getUrl('paypal/express/cancel')
                 ],
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 6cbb190b4a7ee..9ebb5af0e9305 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -108,7 +108,7 @@ define([
                 if (!clientConfig.button) {
                     return new paypal.Promise(function (resolve, reject) {
                         clientConfig.additionalAction(clientConfig.messageContainer).done(function () {
-                                paypal.request.post(clientConfig.startUrl, params)
+                                paypal.request.post(clientConfig.getTokenUrl, params)
                                     .then(function (res) {
                                         if (res.success) {
                                             return resolve(res.token);

From 26cc72c0e3ff8d698a69459679b221bcf9f28a6c Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Fri, 11 Jan 2019 13:14:08 -0600
Subject: [PATCH 598/932] MC-4378: Convert UpdateCategoryEntityTest to MFTF

---
 .../Section/AdminCategoryContentSection.xml   |  1 -
 ...ryAndCheckDefaultUrlKeyOnStoreViewTest.xml | 20 +++++-----
 ...AdminUpdateCategoryAndMakeInactiveTest.xml |  3 +-
 ...minUpdateCategoryNameWithStoreViewTest.xml | 11 ++++--
 ...nUpdateCategoryUrlKeyWithStoreViewTest.xml |  8 +++-
 ...eCategoryWithInactiveIncludeInMenuTest.xml | 39 ++++++-------------
 .../AdminUpdateCategoryWithProductsTest.xml   |  8 ++--
 .../Section/AdminUrlRewriteIndexSection.xml   |  2 +
 8 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
index 86ca7f3064311..e3d224904671b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml
@@ -24,6 +24,5 @@
         <element name="productTableColumnName" type="input" selector="#catalog_category_products_filter_name"/>
         <element name="productTableRow" type="button" selector="#catalog_category_products_table tbody tr"/>
         <element name="productSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
-        <element name="showHideEditor" type="button" selector="#togglecategory_form_description"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
index d0b717eeeca44..047824b71ce64 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
@@ -31,9 +31,10 @@
             <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <!--Create Custom Store -->
+        <!--Open Store Page -->
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
         <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <!--Create Custom Store -->
         <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
         <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
         <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
@@ -58,18 +59,15 @@
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
-        <!--<seeInField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="seeUrlKey" userInput="{{SimpleRootSubCategory.name_lwr}}" />-->
-        <grabValueFrom selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="getUrlKey"/>
-        <assertNotEmpty stepKey="verifyDefaultUrlKey">
-            <actualResult type="variable">getUrlKey</actualResult>
-        </assertNotEmpty>
-        <!--Verify Category UrlKey in Store View-->
+        <seeInField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="seeCategoryUrlKey" userInput="2{{SimpleRootSubCategory.name_lwr}}" />
+        <!--Open Category in Store Front  Page-->
         <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
-        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
-        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="clickSwitchStoreButtonOnDefaultStore"/>
+        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="selectSecondStoreToSwitchOn"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeUpdatedCatergoryInStoreFront"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategoryOnStoreFront"/>
         <waitForPageLoad stepKey="waitForProductToLoad"/>
-        <!--<seeInCurrentUrl stepKey="verifyUrlKey" url="{{_defaultCategory.name_lwr}}.html"/>-->
+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(_defaultCategory.name)}}" stepKey="seeTheUpdatedCategoryTitle"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
index c1f5238e0dad2..546655142aaee 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
@@ -25,9 +25,10 @@
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <!--Update Category and make it inactive-->
+        <!--Open category page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <!--Update category and make category inactive-->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
index 8ed5676c8a628..0155eaa9eb2a7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
@@ -31,9 +31,10 @@
             <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <!--Create Custom Store -->
+        <!--Open store page -->
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
         <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <!--Create Custom Store -->
         <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
         <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
         <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
@@ -46,24 +47,28 @@
         </actionGroup>
         <!--Verify created SubCAtegory is present on Store Front -->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
         <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
         <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
-        <!--Update Category-->
+        <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <!--Update Category-->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTreeUnderRoot(SimpleRootSubCategory.name)}}" stepKey="clickOnSubcategoryIsUndeRootCategory"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="updateCategoryName"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
         <waitForPageLoad stepKey="waitForCateforyToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!--Verify the Category is not present in Store Front-->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded2"/>
         <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="dontSeeCatergoryInStoreFront"/>
         <!--Verify the Updated Category is present in Store Front-->
         <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheUpdatedCategoryInStoreFront"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded3"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeUpdatedCatergoryInStoreFront"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
index 7349f09deabe0..16116c22fc4bf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
@@ -31,9 +31,10 @@
             <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <!--Create Custom Store -->
+        <!--Open Store Page -->
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
         <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <!--Create Custom Store -->
         <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
         <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
         <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
@@ -46,6 +47,7 @@
         </actionGroup>
         <!--Verify Category in Store View-->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage1"/>
         <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
         <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
@@ -53,7 +55,7 @@
         <waitForPageLoad stepKey="waitForProductToLoad"/>
         <!--Update URL Key-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded2"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCategory1"/>
         <scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSearchEngineOptimization"/>
@@ -63,7 +65,9 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <!--Open Category Store Front Page-->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
+        <waitForPageLoad stepKey="waitForSystemStorePage3"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCategoryOnNavigation1"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory2"/>
         <waitForPageLoad stepKey="waitForProductToLoad1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
index c4b13c0346488..96945e96f8476 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
@@ -25,18 +25,17 @@
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <!--Update Category and disable Include in Menu-->
+        <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <!--Update Category name,description, urlKey, meta title and disable Include in Menu-->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="fillCategoryName"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIncludeInMenu"/>
-        <!--Select Content and fill the options-->
         <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
         <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent"/>
-        <click selector="{{AdminCategoryContentSection.showHideEditor}}" stepKey="clickONShowHideButton"/>
         <fillField selector="{{AdminCategoryContentSection.description}}"  userInput="Updated category Description Fields" stepKey="fillUpdatedDescription"/>
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
@@ -45,16 +44,18 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForCategorySaved"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-        <!--Verify Updated Category in UrlRewrite Page-->
+        <!--Open UrlRewrite Page-->
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
         <waitForPageLoad stepKey="waitForUrlRewritePage"/>
+        <!--Verify Updated Category UrlKey-->
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleRootSubCategory.urlKey}}" stepKey="fillUpdatedCategoryUrlKey"/>
-        <click selector="button[data-ui-id='widget-button-1']" stepKey="clickOnSearchButton"/>
-        <see selector="[data-column='request_path']" userInput="{{SimpleRootSubCategory.urlKey}}" stepKey="seeUpdatedCategoryUrlKey"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <see stepKey="seeCategoryUrlKey" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{SimpleRootSubCategory.urlKey}}.html" />
         <!--Verify Updated Category UrlKey directs to category Store Front-->
         <amOnPage url="{{SimpleRootSubCategory.urlKey}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
-        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleRootSubCategory.name)}}" stepKey="seeSubCategoryInStoreFrontPage"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleRootSubCategory.name)}}" stepKey="seeUpdatedCategoryInStoreFrontPage"/>
         <!--Verify Updated fields in Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoaded1"/>
@@ -63,30 +64,14 @@
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
         <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
-        <grabValueFrom selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}"  stepKey="getCategoryName"/>
-        <assertEquals stepKey="getUpdatedCategoryName">
-            <expectedResult type="string">{{SimpleRootSubCategory.name}}</expectedResult>
-            <actualResult type="variable">getCategoryName</actualResult>
-        </assertEquals>
+        <seeInField  selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="seeUpdatedCategoryName"/>
         <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent1"/>
         <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent1"/>
         <scrollTo selector="{{AdminCategoryContentSection.description}}" stepKey="scrollToDescription1"/>
-        <grabValueFrom selector="{{AdminCategoryContentSection.description}}"   stepKey="getUpdatedDescription"/>
-        <assertEquals stepKey="getDescription">
-            <expectedResult type="string">Updated category Description Fields</expectedResult>
-            <actualResult type="variable">getUpdatedDescription</actualResult>
-        </assertEquals>
+        <seeInField stepKey="seeUpdatedDiscription" selector="{{AdminCategoryContentSection.description}}" userInput="Updated category Description Fields"/>
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
-        <grabValueFrom selector="{{AdminCategorySEOSection.UrlKeyInput}}"   stepKey="getUrkKey"/>
-        <assertEquals stepKey="getUpdatedUrkKey">
-            <expectedResult type="string">{{SimpleRootSubCategory.urlKey}}</expectedResult>
-            <actualResult type="variable">getUrkKey</actualResult>
-        </assertEquals>
-        <grabValueFrom selector="{{AdminCategorySEOSection.MetaTitleInput}}"   stepKey="getMetaTitleInput"/>
-        <assertEquals stepKey="getUpdatedMetaTitleInput">
-            <expectedResult type="string">{{SimpleRootSubCategory.name}}</expectedResult>
-            <actualResult type="variable">getMetaTitleInput</actualResult>
-        </assertEquals>
+        <seeInField stepKey="seeUpdatedUrlKey" selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleRootSubCategory.urlKey}}"/>
+        <seeInField stepKey="seeUpdatedMetaTitleInput" selector="{{AdminCategorySEOSection.MetaTitleInput}}" userInput="{{SimpleRootSubCategory.name}}"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
index 6b7c43b38b701..155670230e715 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
@@ -27,13 +27,13 @@
             <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <!--Create Category-->
+        <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-        <!--Select Product Display Setting and fill the options-->
+        <!--Update Product Display Setting-->
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
         <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
         <scrollToTopOfPage stepKey="scfrollToTop"/>
@@ -42,7 +42,7 @@
         <scrollTo selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" x="0" y="-80" stepKey="scrollToDefaultProductList"/>
         <click selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" stepKey="enableTheDefaultProductList"/>
         <selectOption selector="{{CategoryDisplaySettingsSection.defaultProductList}}" userInput="name" stepKey="selectProductName"/>
-        <!--Select Products in Category-->
+        <!--Add Products in Category-->
         <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
         <scrollToTopOfPage stepKey="scrollOnTopOfPage"/>
@@ -57,7 +57,7 @@
         <waitForPageLoad stepKey="waitForCategorySaved"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
-        <!--Verify the Category Title-->
+        <!--Verify Category Title-->
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
         <!--Verify Category in store front page-->
         <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}" stepKey="seeDefaultProductPage"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
index 0880b50950e15..916dffb282978 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -11,5 +11,7 @@
     <section name="AdminUrlRewriteIndexSection">
         <element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
         <element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
+        <element name="searchButton" type="button" selector="button[data-ui-id='widget-button-1']" timeout="30"/>
+        <element name="requestPathColumn" type="text" selector="//tr[@data-role='row']['{{var1}}']/td[@data-column='request_path']" parameterized="true"/>
     </section>
 </sections>

From bbf4e7aa3ba8991f2942674ed7903ae2b9021150 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Fri, 11 Jan 2019 14:38:16 -0600
Subject: [PATCH 599/932] MC-4385: Convert MoveCategoryEntityTest to MFTF

---
 ...nMoveAnchoredCategoryToDefaultCategoryTest.xml | 15 +++++++--------
 .../AdminMoveCategoryAndCheckUrlRewritesTest.xml  | 15 +++++++--------
 ...MoveCategoryFromParentAnchoredCategoryTest.xml | 15 ++++++++-------
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
index 50403dfa0668d..405b20ef2d929 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
@@ -30,19 +30,18 @@
         <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
-        <!--Create Subcategory under Anchored category and select product-->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <waitForPageLoad stepKey="waitForCategoryToLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <!--Select Display Setting and verify Anchor option is enabled in First level Category-->
+        <!--Enable Anchor for _defaultCategory Category-->
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
         <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
         <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
         <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
-        <!--Create Second level anchored category-->
+        <!--Enable Anchor for FirstLevelSubCat Category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="addSubCategoryName"/>
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting1"/>
@@ -51,7 +50,7 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
         <waitForPageLoad stepKey="waitForSecondCategoryToSave1"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage1"/>
-        <!--Create Third level anchored category and add a product-->
+        <!--Enable Anchor for SimpleSubCategory Category and add products to the Category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName1"/>
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting2"/>
@@ -65,16 +64,16 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory2"/>
         <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
-        <!--Check Category breadcrumbs in store  front page-->
+        <!--Open Category in store front page-->
         <amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
         <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
-        <!--<Verify category displayed in store front page-->
+        <!--<Verify breadcrumbs in store front page-->
         <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
         <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
-        <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{FirstLevelSubCat.name}}, {{SimpleSubCategory.name}}]</expectedResult>
-        <actualResult type="variable">breadcrumbs</actualResult>
+            <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{FirstLevelSubCat.name}}, {{SimpleSubCategory.name}}]</expectedResult>
+            <actualResult type="variable">breadcrumbs</actualResult>
         </assertEquals>
         <!--Verify Product displayed in category store front page-->
         <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
index 4515c7c7ef9ee..012e671016106 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
@@ -25,7 +25,7 @@
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-        <!--Open category page and select created category-->
+        <!--Open category page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
@@ -55,7 +55,6 @@
         <!--Verify Category RedirectType-->
         <see stepKey="verifyTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="No" />
         <!--Verify Redirect Path -->
-        <!--ToDo Need to update and remove '2' from the userInput, url key value output has 2 added on it-->
         <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="verifyTheRedirectPath"/>
         <!--Verify Category Target Path-->
         <see stepKey="verifyTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn(1)}}" userInput="catalog/category/view/id/{$categoryId}"/>
@@ -73,23 +72,23 @@
         <!--Open Url Rewrite page  -->
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage1"/>
         <waitForPageLoad stepKey="waitForUrlRewritePage1"/>
-        <!--ToDo Need to update and remove '2' from the userInput, url key value output has 2 added on it-->
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" stepKey="fillCategoryUrlKey1"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
-        <!--Verify new RedirectType after move -->
-        <see stepKey="verifyTheRedirectTypeAfterMove" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="No" />
+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
         <!--Verify new Redirect Path after move -->
-        <see stepKey="verifyTheRequestPathAfterMove" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(2)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
+        <see stepKey="verifyTheRequestPathAfterMove" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
         <!--Verify new Target Path after move -->
         <see stepKey="verifyTheTargetPathAfterMove" selector="{{AdminUrlRewriteIndexSection.targetPathColumn(1)}}" userInput="catalog/category/view/id/{$categoryId}" />
+        <!--Verify new RedirectType after move -->
+        <see stepKey="verifyTheRedirectTypeAfterMove" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="No" />
         <!--Verify before move Redirect Path displayed with associated Target Path and Redirect Type-->
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="fillCategoryUrlKey2"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad5"/>
         <see stepKey="verifyTheRedirectTypeAfterMove1" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="Permanent (301)" />
-        <!--ToDo Need to update and remove '2' from the userInput, url key value output has 2 added on it-->
         <see stepKey="verifyTheRequestPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(2)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" />
         <see stepKey="verifyTheTargetPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.targetPathColumn(1)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
-        <!--Verify before move  Redirect Path directs to the category page-->
+        <!--Verify before move Redirect Path directs to the category page-->
         <amOnPage url="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnStoreNavigationBar"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
index b6eb3d492e3a3..27cfac0dd479f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
@@ -33,19 +33,19 @@
         <!--Open Category page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
-        <!--Create Subcategory under Anchored category-->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <waitForPageLoad stepKey="waitForCategoryToLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <!--Select Display Setting and verify Anchor option is enabled-->
+        <!--Enable Anchor for _defaultCategory category -->
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
         <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
         <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <!--Create a Subcategory under _defaultCategory category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-        <!--Select and add the Product -->
+        <!--Add a product to SimpleSubCategory category-->
         <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
         <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
@@ -58,11 +58,11 @@
         <amOnPage url="/$$createDefaultCategory.name$$/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
-        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
         <!--Check category breadcrumbs in store  front page-->
         <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
         <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
-            <expectedResult type="array">['Home', $$createDefaultCategory.name$$, {{SimpleSubCategory.name}}]</expectedResult>
+            <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{SimpleSubCategory.name}}]</expectedResult>
             <actualResult type="variable">breadcrumbs</actualResult>
         </assertEquals>
         <!--Verify Product displayed in category store front page-->
@@ -74,12 +74,13 @@
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
-        <!--Move SubCategory to Default Category-->
+        <!--Move SubCategory under Default Category-->
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
         <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
         <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
         <waitForPageLoad stepKey="waitForPageToLoad3"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
+        <!--Open category in store front page-->
         <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageLoad1"/>
         <!--Verify breadcrumbs after the move in store front page-->
@@ -93,7 +94,7 @@
         <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
         <!--Verify Category in store front-->
         <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleSubCategory.name)}}" stepKey="seeCategoryInTitle"/>
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSubCategoryOnStoreNavigationBarAfterMove"/>
         <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct1"/>
         <waitForPageLoad  stepKey="waitForProductToLoad2"/>
         <!--Verify product name on Store Front-->

From f6a2f2a7c1fbff444b996a7df97f6856414df98d Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Fri, 11 Jan 2019 15:47:12 -0600
Subject: [PATCH 600/932] MC-11005: Create functions for DHL message timestamp
 and reference

---
 app/code/Magento/Dhl/Model/Carrier.php        | 42 +++++++++++++++++++
 .../Dhl/Test/Unit/Model/CarrierTest.php       | 27 ++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index d997db6ac1a3e..7840820d91253 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -56,6 +56,13 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      */
     const CODE = 'dhl';
 
+    /**
+     * DHL service prefixes used for message reference
+     */
+    const SERVICE_PREFIX_QUOTE = 'QUOT';
+    const SERVICE_PREFIX_SHIPVAL = 'SHIP';
+    const SERVICE_PREFIX_TRACKING = 'TRCK';
+
     /**
      * Rate request data
      *
@@ -1972,4 +1979,39 @@ protected function isDutiable($origCountryId, $destCountryId)
             self::DHL_CONTENT_TYPE_NON_DOC == $this->getConfigData('content_type')
             || !$this->_isDomestic;
     }
+
+    /**
+     * Builds a datetime string to be used as the MessageTime in accordance to the expected format.
+     *
+     * @param string|null $datetime
+     * @return string
+     */
+    protected function buildMessageTimestamp(string $datetime = null): string
+    {
+        return $this->_coreDate->date(\DATE_RFC3339, $datetime);
+    }
+
+    /**
+     * Builds a string to be used as the MessageReference.
+     *
+     * @param string $servicePrefix
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function buildMessageReference(string $servicePrefix): string
+    {
+        $validPrefixes = [
+            self::SERVICE_PREFIX_QUOTE,
+            self::SERVICE_PREFIX_SHIPVAL,
+            self::SERVICE_PREFIX_TRACKING
+        ];
+
+        if (!in_array($servicePrefix, $validPrefixes)) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __("Invalid service prefix \"$servicePrefix\" provided while attempting to build MessageReference")
+            );
+        }
+
+        return str_replace('.', '', uniqid("MAGE_{$servicePrefix}_", true));
+    }
 }
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 96c76a17bc317..e90f22e2a150d 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -537,6 +537,33 @@ public function dhlProductsDataProvider() : array
         ];
     }
 
+    /**
+     * Tests that the built message reference string is of the appropriate format.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Invalid service prefix
+     * @throws \ReflectionException
+     */
+    public function testBuildMessageReference()
+    {
+        $method = new \ReflectionMethod($this->model, 'buildMessageReference');
+        $method->setAccessible(true);
+
+        $msgRefQuote = $method->invoke($this->model, Carrier::SERVICE_PREFIX_QUOTE);
+        self::assertGreaterThanOrEqual(28, strlen($msgRefQuote));
+        self::assertLessThanOrEqual(32, strlen($msgRefQuote));
+
+        $msgRefShip = $method->invoke($this->model, Carrier::SERVICE_PREFIX_SHIPVAL);
+        self::assertGreaterThanOrEqual(28, strlen($msgRefShip));
+        self::assertLessThanOrEqual(32, strlen($msgRefShip));
+
+        $msgRefTrack = $method->invoke($this->model, Carrier::SERVICE_PREFIX_TRACKING);
+        self::assertGreaterThanOrEqual(28, strlen($msgRefTrack));
+        self::assertLessThanOrEqual(32, strlen($msgRefTrack));
+
+        $method->invoke($this->model, 'TEST');
+    }
+
     /**
      * Creates mock for XML factory.
      *

From 3a4d363081ddccc521b6a71cc8cc366580b6d658 Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Fri, 11 Jan 2019 16:06:20 -0600
Subject: [PATCH 601/932] MC-11005: Create functions for DHL message timestamp
 and reference

---
 app/code/Magento/Dhl/Model/Carrier.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 7840820d91253..9bbe0f2beed9a 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1986,7 +1986,7 @@ protected function isDutiable($origCountryId, $destCountryId)
      * @param string|null $datetime
      * @return string
      */
-    protected function buildMessageTimestamp(string $datetime = null): string
+    private function buildMessageTimestamp(string $datetime = null): string
     {
         return $this->_coreDate->date(\DATE_RFC3339, $datetime);
     }
@@ -1998,7 +1998,7 @@ protected function buildMessageTimestamp(string $datetime = null): string
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function buildMessageReference(string $servicePrefix): string
+    private function buildMessageReference(string $servicePrefix): string
     {
         $validPrefixes = [
             self::SERVICE_PREFIX_QUOTE,

From 53d777b145141fa034c34b6f6ad73ab6bba17271 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Fri, 11 Jan 2019 17:24:39 -0600
Subject: [PATCH 602/932] MC-11006: Build stabilization

---
 .../Controller/Express/AbstractExpress.php    |   5 +-
 .../Controller/Express/OnAuthorization.php    |  11 +-
 .../Magento/Paypal/Model/AbstractConfig.php   |   6 +-
 .../Magento/Paypal/Model/Express/Checkout.php |   3 +-
 .../Paypal/Model/ExpressConfigProvider.php    |   7 +-
 .../Paypal/Test/Unit/Model/ConfigTest.php     |  35 ++++--
 .../Magento/Paypal/etc/frontend/sections.xml  |   4 +
 .../paypal-express-abstract.js                |   2 +-
 .../Reader/_files/expected/config.xml         | 101 +++++++++++++++++-
 9 files changed, 148 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
index db337fc2749ba..7ad8fe658ec16 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress.php
@@ -9,6 +9,7 @@
 use Magento\Framework\App\Action\Action as AppAction;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Quote\Api\Data\CartInterface;
 
 /**
  * Abstract Express Checkout Controller
@@ -132,10 +133,12 @@ public function __construct(
     /**
      * Instantiate quote and checkout
      *
+     * @param CartInterface|null $quoteObject
+     *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function _initCheckout(\Magento\Quote\Model\Quote $quoteObject = null)
+    protected function _initCheckout(CartInterface $quoteObject = null)
     {
         $quote = $quoteObject ? $quoteObject : $this->_getQuote();
         if (!$quote->hasItems() || $quote->getHasError()) {
diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index 15a9773ca187e..e5acdaef5e1cc 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -5,14 +5,14 @@
  */
 declare(strict_types=1);
 
-
 namespace Magento\Paypal\Controller\Express;
 
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 class OnAuthorization
-    extends \Magento\Paypal\Controller\Express\AbstractExpress
-    implements \Magento\Framework\App\Action\HttpPostActionInterface
+    extends AbstractExpress
+    implements HttpPostActionInterface
 {
     /**
      * Config mode type
@@ -122,9 +122,6 @@ public function execute()
             if ($this->_checkout->canSkipOrderReviewStep()) {
                 $this->_checkout->place($tokenId);
                 $order = $this->_checkout->getOrder();
-                // prepare session to success or cancellation page
-                $this->_getCheckoutSession()->clearHelperData();
-
                 // "last successful quote"
                 $this->_getCheckoutSession()->setLastQuoteId($quote->getId())->setLastSuccessQuoteId($quote->getId());
 
@@ -154,7 +151,7 @@ public function execute()
 
         } catch (\Exception $e) {
             $responseContent['success'] = false;
-            $responseContent['error_message'] = 'We can\'t process Express Checkout approval.';
+            $responseContent['error_message'] = __('We can\'t process Express Checkout approval.');
         }
 
         return $controllerResult->setData($responseContent);
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index 72f9143f90281..b889bd4c4f1c9 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -9,8 +9,8 @@
 use Magento\Payment\Model\Method\ConfigInterface;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Paypal\Model\Config;
 use Magento\Framework\App\ObjectManager;
+use Magento\Paypal\Model\Express\Checkout;
 
 /**
  * Class AbstractConfig
@@ -298,7 +298,9 @@ public function isMethodActive($method)
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
                 );
-                $isExpressCreditEnabled = $disabledFunding ? !!strpos('CREDIT', $disabledFunding) : true;
+                $isExpressCreditEnabled = $disabledFunding
+                    ? !!strpos(Checkout::PAYPAL_FUNDING_CREDIT, $disabledFunding)
+                    : true;
                 $isEnabled = $isExpressCreditEnabled
                 || $this->_scopeConfig->isSetFlag(
                     'payment/' . Config::METHOD_WPP_BML .'/active',
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index a84e4a457cead..2fa4fcf26311a 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -614,6 +614,7 @@ public function canSkipOrderReviewStep()
      * export shipping address in case address absence
      *
      * @param string $token
+     * @param string|null $payerData
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -693,7 +694,7 @@ public function returnFromPaypal($token, $payerData = null)
         $payment = $quote->getPayment();
         $payment->setMethod($this->_methodType);
         $this->_paypalInfo->importToPayment($this->_getApi(), $payment);
-        $payerId = $payerData ? $payerData : $this->_getApi()->getPayerId();
+        $payerId = $payerData ? : $this->_getApi()->getPayerId();
         $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_PAYER_ID, $payerId)
             ->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_TOKEN, $token);
         $quote->collectTotals();
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 776d2041c9c79..3e90a3fcd273b 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -192,7 +192,7 @@ protected function getBillingAgreementCode($code)
      * @param string $locale
      * @return array
      */
-    private function getButtonStyles($locale)
+    private function getButtonStyles($locale) : array
     {
         $this->config->setMethod(Config::METHOD_EXPRESS);
 
@@ -222,7 +222,7 @@ private function getButtonStyles($locale)
      * @param string $locale
      * @return array
      */
-    private function updateStyles($styles, $locale)
+    private function updateStyles($styles, $locale) : array
     {
         $installmentPeriodLocale = [
             'en_MX' => 'mx',
@@ -255,8 +255,9 @@ private function updateStyles($styles, $locale)
      * Returns disallowed funding from configuration
      *
      * @return array
+     *
      */
-    private function getDisallowedFunding()
+    private function getDisallowedFunding() : array
     {
         $this->config->setMethod(Config::METHOD_EXPRESS);
         $disallowedFunding = $this->config->getValue('disable_funding_options');
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
index 113aa5766ed3f..2578f21173c32 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Paypal\Model\Config;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
@@ -16,7 +17,7 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $scopeConfig;
 
@@ -117,14 +118,30 @@ public function testIsMethodAvailableWPPPE()
      */
     public function testIsMethodAvailableForIsMethodActive($methodName, $expected)
     {
-        $this->scopeConfig->expects($this->any())
-            ->method('getValue')
-            ->with('paypal/general/merchant_country')
-            ->will($this->returnValue('US'));
-        $this->scopeConfig->expects($this->exactly(2))
-            ->method('isSetFlag')
-            ->withAnyParameters()
-            ->will($this->returnValue(true));
+        if ($methodName == Config::METHOD_WPP_BML) {
+            $valueMap = [
+                ['paypal/general/merchant_country', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, 'US'],
+                ['paypal/general/merchant_country', ScopeInterface::SCOPE_STORE, null, 'US'],
+                ['payment/paypal_express/disable_funding_options', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, []],
+            ];
+            $this->scopeConfig
+                ->expects($this->any())
+                ->method('getValue')
+                ->will($this->returnValueMap($valueMap));
+            $this->scopeConfig->expects($this->exactly(1))
+                ->method('isSetFlag')
+                ->withAnyParameters()
+                ->will($this->returnValue(true));
+        } else {
+            $this->scopeConfig->expects($this->any())
+                ->method('getValue')
+                ->with('paypal/general/merchant_country')
+                ->will($this->returnValue('US'));
+            $this->scopeConfig->expects($this->exactly(2))
+                ->method('isSetFlag')
+                ->withAnyParameters()
+                ->will($this->returnValue(true));
+        }
 
         $this->model->setMethod($methodName);
         $this->assertEquals($expected, $this->model->isMethodAvailable($methodName));
diff --git a/app/code/Magento/Paypal/etc/frontend/sections.xml b/app/code/Magento/Paypal/etc/frontend/sections.xml
index 466b930fb9bee..ca32d57cd9d28 100644
--- a/app/code/Magento/Paypal/etc/frontend/sections.xml
+++ b/app/code/Magento/Paypal/etc/frontend/sections.xml
@@ -15,4 +15,8 @@
         <section name="cart"/>
         <section name="checkout-data"/>
     </action>
+    <action name="paypal/express/onAuthorization">
+        <section name="cart"/>
+        <section name="checkout-data"/>
+    </action>
 </config>
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js
index d038f08c348ec..b01d0454b55d9 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/paypal-express-abstract.js
@@ -15,7 +15,7 @@ define([
 
     return Component.extend({
         defaults: {
-            template: 'Magento_Paypal/payment/paypal-express-bml',
+            template: 'Magento_Paypal/payment/payflow-express-bml',
             billingAgreement: ''
         },
 
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index 2bd346a6e8f7b..778929f06c816 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -640,6 +640,7 @@
                             </depends>
                         </field>
                         <field id="api_wizard" translate="button_label attribute sandbox_button_label" sortOrder="70" showInDefault="1" showInWebsite="1">
+
                             <attribute type="button_label">Get Credentials from PayPal</attribute>
                             <attribute type="button_url">
                                 <![CDATA[https://www.paypal.com/webapps/merchantboarding/webflow/externalpartnerflow]]>
@@ -727,7 +728,7 @@
                         </depends>
                         <validate>required-entry</validate>
                     </field>
-                    <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="1" showInWebsite="1">
+                    <field id="enable_express_checkout_bml" translate="label comment" type="select" sortOrder="23" showInDefault="0" showInWebsite="0">
                         <label>Enable PayPal Credit</label>
                         <comment><![CDATA[PayPal Express Checkout lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
@@ -740,7 +741,7 @@
                             <field id="enable_express_checkout"/>
                         </requires>
                     </field>
-                    <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="express_checkout_bml_sort_order" translate="label" type="text" sortOrder="25" showInDefault="0" showInWebsite="0" showInStore="0">
                         <label>Sort Order PayPal Credit</label>
                         <config_path>payment/paypal_express_bml/sort_order</config_path>
                         <frontend_class>validate-number</frontend_class>
@@ -1214,6 +1215,102 @@
                                 </tooltip>
                                 <attribute type="shared">1</attribute>
                             </field>
+                            <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+                                <label>Checkout Display</label>
+                                <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
+                                <attribute type="shared">1</attribute>
+                            </field>
+                            <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
+                                <label>PayPal Button - Checkout Page</label>
+                                <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
+                                    <label>Customize Button</label>
+                                    <comment><![CDATA[Customize the display of the PayPal button in the Checkout.]]></comment>
+                                    <config_path>payment/paypal_express/checkout_page_button_customize</config_path>
+                                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                                    <attribute type="shared">1</attribute>
+                                </field>
+                                <field id="checkout_page_button_label" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                                    <label>Label</label>
+                                    <config_path>payment/paypal_express/checkout_page_button_label</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Label::getCheckoutLabel</source_model>
+                                    <depends>
+                                        <field id="checkout_page_button_customize">1</field>
+                                    </depends>
+                                    <attribute type="shared">1</attribute>
+                                </field>
+                                <field id="checkout_page_button_mx_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                                    <label>Mexico Installment Period</label>
+                                    <config_path>payment/paypal_express/checkout_page_button_mx_installment_period</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutMxInstallmentPeriod</source_model>
+                                    <depends>
+                                        <field id="checkout_page_button_customize">1</field>
+                                        <field id="checkout_page_button_label">installment</field>
+                                    </depends>
+                                    <attribute type="shared">1</attribute>
+                                </field>
+                                <field id="checkout_page_button_br_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                                    <label>Brazil Installment Period</label>
+                                    <config_path>payment/paypal_express/checkout_page_button_br_installment_period</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutBrInstallmentPeriod</source_model>
+                                    <depends>
+                                        <field id="checkout_page_button_customize">1</field>
+                                        <field id="checkout_page_button_label">installment</field>
+                                    </depends>
+                                    <attribute type="shared">1</attribute>
+                                </field>
+                                <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
+                                    <label>Layout</label>
+                                    <config_path>payment/paypal_express/checkout_page_button_layout</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Layout::getCheckoutLayout</source_model>
+                                    <depends>
+                                        <field id="checkout_page_button_customize">1</field>
+                                        <field id="checkout_page_button_label" negative="1">credit</field>
+                                    </depends>
+                                    <attribute type="shared">1</attribute>
+                                </field>
+                                <field id="checkout_page_button_size" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
+                                    <label>Size</label>
+                                    <config_path>payment/paypal_express/checkout_page_button_size</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Size::getCheckoutSize</source_model>
+                                    <depends>
+                                        <field id="checkout_page_button_customize">1</field>
+                                    </depends>
+                                    <attribute type="shared">1</attribute>
+                                </field>
+                                <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
+                                    <label>Shape</label>
+                                    <config_path>payment/paypal_express/checkout_page_button_shape</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Shape::getCheckoutShape</source_model>
+                                    <depends>
+                                        <field id="checkout_page_button_customize">1</field>
+                                    </depends>
+                                    <attribute type="shared">1</attribute>
+                                </field>
+                                <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
+                                    <label>Color</label>
+                                    <config_path>payment/paypal_express/checkout_page_button_color</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Color::getCheckoutColor</source_model>
+                                    <depends>
+                                        <field id="checkout_page_button_customize">1</field>
+                                        <field id="checkout_page_button_label" negative="1">credit</field>
+                                    </depends>
+                                    <attribute type="shared">1</attribute>
+                                </field>
+                            </group>
+                            <group id="features" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                                <label>Features</label>
+                                <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                                    <label>Disable Funding Options</label>
+                                    <comment>
+                                        <![CDATA[PayPal will automatically display each enabled funding option to eligible buyers.
+                                For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is
+                                offered and the currency offered by the merchant is USD.]]>
+                                    </comment>
+                                    <config_path>payment/paypal_express/disable_funding_options</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\DisableFundingOptions</source_model>
+                                    <attribute type="shared">1</attribute>
+                                </field>
+                            </group>
                         </group>
                     </group>
                 </group>

From 5598b97e47bb6d25b13e198d5acfc23bc8101440 Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal.solanki@krishtechnolabs.com>
Date: Sat, 12 Jan 2019 11:16:16 +0530
Subject: [PATCH 603/932] checkbox alignment issue resolved

---
 .../Magento/Braintree/view/adminhtml/templates/form/cc.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
index 535a5a852fe70..4c15fffa8189f 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
@@ -83,7 +83,7 @@ $ccType = $block->getInfoData('cc_type');
                    id="<?= /* @noEscape */ $code ?>_vault"
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
-            <label class="label" for="<?= /* @noEscape */ $code ?>_vault">
+            <label class="label admin__field-label" for="<?= /* @noEscape */ $code ?>_vault">
                 <span><?= $block->escapeHtml(__('Save for later use.')) ?></span>
             </label>
         </div>

From a958f5b3f333917766bc7d31c63480945a605f2c Mon Sep 17 00:00:00 2001
From: Milind Singh <milind7@live.com>
Date: Sat, 12 Jan 2019 13:55:54 +0530
Subject: [PATCH 604/932] Magento widgets source models forced to use
 deprecated interface #20064

---
 lib/internal/Magento/Framework/Option/ArrayPool.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Option/ArrayPool.php b/lib/internal/Magento/Framework/Option/ArrayPool.php
index 5ac349d99b82e..c417909cc9ddf 100644
--- a/lib/internal/Magento/Framework/Option/ArrayPool.php
+++ b/lib/internal/Magento/Framework/Option/ArrayPool.php
@@ -28,13 +28,13 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $model
      * @throws \InvalidArgumentException
-     * @return \Magento\Framework\Option\ArrayInterface
+     * @return \Magento\Framework\Data\OptionSourceInterface
      */
     public function get($model)
     {
         $modelInstance = $this->_objectManager->get($model);
-        if (false == $modelInstance instanceof \Magento\Framework\Option\ArrayInterface) {
-            throw new \InvalidArgumentException($model . 'doesn\'t implement \Magento\Framework\Option\ArrayInterface');
+        if (false == $modelInstance instanceof \Magento\Framework\Data\OptionSourceInterface) {
+            throw new \InvalidArgumentException($model . 'doesn\'t implement \Magento\Framework\Data\OptionSourceInterface');
         }
         return $modelInstance;
     }

From 860e4e3aef7984b4595bf3deddd6d617f9e527e1 Mon Sep 17 00:00:00 2001
From: niravkrish <nirav.patel@krishtechnolabs.com>
Date: Sat, 12 Jan 2019 14:18:37 +0530
Subject: [PATCH 605/932] Fixed admin multiselect and select ui arrow toggle
 issue

---
 .../base/web/templates/grid/filters/elements/ui-select.html   | 4 ++--
 .../Magento/backend/web/css/source/forms/_controls.less       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
index bf3e2df8a82d0..82205de4156ad 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
@@ -36,7 +36,7 @@
             class="action-select admin__action-multiselect"
             data-role="advanced-select"
             data-bind="
-            css: {_active: multiselectFocus},
+            css: {_active: listVisible},
             click: function(data, event) {
                 toggleListVisible(data, event)
             }
@@ -73,7 +73,7 @@
             class="action-select admin__action-multiselect"
             data-role="advanced-select"
             data-bind="
-            css: {_active: multiselectFocus},
+            css: {_active: listVisible},
             click: function(data, event) {
                 toggleListVisible(data, event)
             }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
index f971246ab469d..6c3756370d9ce 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less
@@ -85,7 +85,7 @@
         cursor: pointer;
     }
 
-    &:focus {
+    &:active {
         background-image+: url('../images/arrows-bg.svg');
         background-position+: ~'calc(100% - 12px)' 13px;
 

From db1e816b8bef968491b6875e7886900bfe2007e8 Mon Sep 17 00:00:00 2001
From: Khodu Vaishnav <khodu.vaishnav@krishtechnolabs.com>
Date: Sat, 12 Jan 2019 15:35:03 +0530
Subject: [PATCH 606/932] wishlist-patch : remove the comment from wishlist
 product.

---
 app/code/Magento/Wishlist/Controller/Index/Update.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index 056d58b4c70be..332edbedc6ef4 100755
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -83,8 +83,6 @@ public function execute()
                 )->defaultCommentString()
                 ) {
                     $description = '';
-                } elseif (!strlen($description)) {
-                    $description = $item->getDescription();
                 }
 
                 $qty = null;

From eab547224baf316903b5a469463969625af93340 Mon Sep 17 00:00:00 2001
From: Tristan Hofman <hofmantristan@gmail.com>
Date: Sat, 12 Jan 2019 11:59:02 +0100
Subject: [PATCH 607/932] added missing spain_country_id constant

---
 .../Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 52c40083ba0db..0dadb0e243864 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -29,6 +29,8 @@ abstract class AbstractCarrierOnline extends AbstractCarrier
 
     const GUAM_REGION_CODE = 'GU';
 
+    const SPAIN_COUNTRY_ID = 'ES';
+
     const CANARY_ISLANDS_COUNTRY_ID = 'IC';
 
     const SANTA_CRUZ_DE_TENERIFE_REGION_ID = 'Santa Cruz de Tenerife';

From 40e7a81b5bd48cbd885aac7dd63e9f1433874794 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Sat, 12 Jan 2019 17:46:33 +0530
Subject: [PATCH 608/932] Correct spelling

---
 app/code/Magento/Ui/view/base/web/js/grid/editing/record.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
index aa83083cac3c9..c648875e62d7c 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
@@ -280,7 +280,7 @@ define([
         },
 
         /**
-         * Counts total errors ammount accros all fields.
+         * Counts total errors amount across all fields.
          *
          * @returns {Number}
          */

From 476206ce2deb11f8c84566c170c7c7ebfe789cf5 Mon Sep 17 00:00:00 2001
From: Amrit Man Shrestha <1658188+amritms@users.noreply.github.com>
Date: Sun, 13 Jan 2019 22:05:12 +0545
Subject: [PATCH 609/932] Update README.md

---
 phpserver/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpserver/README.md b/phpserver/README.md
index 563d2ed7c9fc9..484c3c8fdb8cb 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -31,7 +31,7 @@ For more informations about the installation process using the CLI, you can cons
 
 ### How to run Magento
 
-Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ./phpserver/router.php```
+Example usage: ```php -S 127.0.0.1:8082 -t ./pub/  ./phpserver/router.php```
 
 ### What exactly the script does
 

From 233391b7e423a93b3711b45bc99eb12d30500db7 Mon Sep 17 00:00:00 2001
From: Amrit Man Shrestha <1658188+amritms@users.noreply.github.com>
Date: Sun, 13 Jan 2019 22:50:44 +0545
Subject: [PATCH 610/932] Update README.md

---
 phpserver/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpserver/README.md b/phpserver/README.md
index 484c3c8fdb8cb..563d2ed7c9fc9 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -31,7 +31,7 @@ For more informations about the installation process using the CLI, you can cons
 
 ### How to run Magento
 
-Example usage: ```php -S 127.0.0.1:8082 -t ./pub/  ./phpserver/router.php```
+Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ./phpserver/router.php```
 
 ### What exactly the script does
 

From 630c1ca8e832e4e851499c418ce2d4ab0ee4aa1a Mon Sep 17 00:00:00 2001
From: Chris Snedaker <df2002@gmail.com>
Date: Mon, 14 Jan 2019 00:42:43 -0500
Subject: [PATCH 611/932] Missing echo of php vars in widget template file -
 tabshoriz.phtml

---
 .../Backend/view/adminhtml/templates/widget/tabshoriz.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
index 062528e742201..7b68a379caae9 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -18,7 +18,7 @@
     <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
     <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
     <li>
-        <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
+        <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?= $_tabClass ?>" data-tab-type="<?= $_tabType ?>">
             <span>
                 <span class="changed" title="<?= /* @escapeNotVerified */ __('The information in this tab has been changed.') ?>"></span>
                 <span class="error" title="<?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>

From 8bc0309bf756c59333dbbe75d24cd612b1353507 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Mon, 14 Jan 2019 12:17:05 +0530
Subject: [PATCH 612/932] issue fixed #20259 Store switcher not sliding up and
 down, only dropdown arrow working

issue fixed #20259 Store switcher not sliding up and down, only dropdown arrow working
---
 .../Magento/blank/web/css/source/_navigation.less        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index 4499886ef0f10..88d597ec0d0e7 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -135,8 +135,15 @@
         .switcher-dropdown {
             .lib-list-reset-styles();
             padding: @indent__s 0;
+            display: none;
         }
-
+        .switcher-options{
+            &.active{
+                .switcher-dropdown{
+                    display: block;
+                }
+            }
+        } 
         .header.links {
             .lib-list-reset-styles();
             border-bottom: 1px solid @color-gray82;

From 452c11b33b3273a1d69d39c2ed17071f3e33a8df Mon Sep 17 00:00:00 2001
From: Chris Snedaker <df2002@gmail.com>
Date: Mon, 14 Jan 2019 02:29:49 -0500
Subject: [PATCH 613/932] Escaped output of html attributes

---
 .../Backend/view/adminhtml/templates/widget/tabshoriz.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
index 7b68a379caae9..c76f10da0f927 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -18,7 +18,7 @@
     <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
     <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
     <li>
-        <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?= $_tabClass ?>" data-tab-type="<?= $_tabType ?>">
+        <a href="<?= $block->escapeHtmlAttr($_tabHref) ?>" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>" title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>" class="<?= $block->escapeHtmlAttr($_tabClass) ?>" data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
             <span>
                 <span class="changed" title="<?= /* @escapeNotVerified */ __('The information in this tab has been changed.') ?>"></span>
                 <span class="error" title="<?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>

From 80d87ec4ec795d03fea7ec96fd851666a5226069 Mon Sep 17 00:00:00 2001
From: Dipti 2Jcommerce <dipti@2jcommerce.in>
Date: Mon, 14 Jan 2019 13:04:20 +0530
Subject: [PATCH 614/932] 
 My-Accounttele-phone-field-require-no-validation-appear

---
 .../Customer/view/frontend/templates/widget/telephone.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
index 1b61dc45573b3..3371ee42129ec 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
@@ -27,7 +27,7 @@
                id="telephone"
                value="<?= $block->escapeHtmlAttr($block->getTelephone()) ?>"
                title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>"
-               class="input-text <?= $_validationClass ?: '' ?>"
+               class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('telephone')) ?>"
         >
     </div>
 </div>

From eb299974db03f86b0e9e827def4cf9ecfb38a4df Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 14 Jan 2019 11:18:25 +0200
Subject: [PATCH 615/932] Fix functional test.

---
 .../AssertProductRegularPriceOnStorefront.php    | 16 ++++++++++------
 .../TestCase/AddProductToWishlistEntityTest.xml  |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
index 68e30e13558ca..a865cd8884f6e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
@@ -75,13 +75,17 @@ public function processAssert(
         }
 
         $productItem = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product);
-        $wishListProductRegularPrice = (float)$productItem->getRegularPrice();
+        $wishListProductRegularPrice = $product instanceof BundleProduct
+            ? (float)$productItem->getPrice()
+            : (float)$productItem->getRegularPrice();
 
-        \PHPUnit\Framework\Assert::assertEquals(
-            $this->regularPriceLabel,
-            $productItem->getPriceLabel(),
-            'Wrong product regular price is displayed.'
-        );
+        if (!$product instanceof BundleProduct) {
+            \PHPUnit\Framework\Assert::assertEquals(
+                $this->regularPriceLabel,
+                $productItem->getPriceLabel(),
+                'Wrong product regular price is displayed.'
+            );
+        }
 
         \PHPUnit\Framework\Assert::assertNotEmpty(
             $wishListProductRegularPrice,
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
index 06b1a6078d5c7..e5fa4b6fc11ee 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.xml
@@ -108,7 +108,7 @@
         </variation>
         <variation name="AddProductToWishlistEntityTestVariation14" ticketId="MAGETWO-90131">
             <data name="product" xsi:type="array">
-                <item name="0" xsi:type="string">bundleProduct::with_special_price_and_custom_options</item>
+                <item name="0" xsi:type="string">bundleProduct::default_with_one_simple_product</item>
             </data>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertAddProductToWishlistSuccessMessage"/>
             <constraint name="Magento\Wishlist\Test\Constraint\AssertProductIsPresentInWishlist"/>

From 1c139107ee6f6f55a403f5f826aeea5ec4665b03 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Mon, 14 Jan 2019 13:13:10 +0300
Subject: [PATCH 616/932] MAGETWO-96106: CMS Block status is not staged

- Updated automated
---
 .../Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml
index 05c56f588c5d0..c303b7cc8e900 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminWidgetActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminCreateWidgetActionGroup">
+    <actionGroup name="AdminCreateWidgetWithBlockActionGroup">
     <arguments>
         <argument name="widget"/>
         <argument name="block" type="string"/>

From 5c4d71b98c740a7a5630f696aa76b17592042c59 Mon Sep 17 00:00:00 2001
From: ajay-2jcommerce <ajay@2jcommerce.in>
Date: Mon, 14 Jan 2019 18:54:32 +0530
Subject: [PATCH 617/932] Apply-discount-code-placeholder-get-cut ::Apply
 discount code placeholder gets cut in Tab portriat view on cart page

---
 .../luma/Magento_Checkout/web/css/source/module/_cart.less     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 58582d344e75a..807658769a29e 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -694,6 +694,9 @@
                     position: static;
                 }
             }
+            &.discount{
+                width:auto;
+            }
         }
     }
 

From 63c9293ce759234add97d84340174bef5d41cdf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Tr=C3=B8ndheim?= <richardtroendheim@gmail.com>
Date: Mon, 14 Jan 2019 14:52:18 +0100
Subject: [PATCH 618/932] Adjusted doc for ReadInterface regarding Exception

---
 .../Magento/Framework/Filesystem/Directory/ReadInterface.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
index 61108c64dda44..85d41b6932629 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
@@ -89,6 +89,7 @@ public function isDirectory($path = null);
      *
      * @param string $path
      * @return \Magento\Framework\Filesystem\File\ReadInterface
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function openFile($path);
 

From 4a149505a71c883a2c93740d3e4fb5c265a2d267 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 14 Jan 2019 16:12:51 +0200
Subject: [PATCH 619/932] Fix functional tests.

---
 .../Customer/Wishlist/Items/TopToolbar.php    | 98 +++++++++++++++++++
 .../AssertProductIsPresentInWishlist.php      |  7 ++
 .../AssertProductRegularPriceOnStorefront.php |  7 ++
 .../Wishlist/Test/Page/WishlistIndex.xml      |  1 +
 4 files changed, 113 insertions(+)
 create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/TopToolbar.php

diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/TopToolbar.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/TopToolbar.php
new file mode 100644
index 0000000000000..9d2d0fee46b53
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Customer/Wishlist/Items/TopToolbar.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Test\Block\Customer\Wishlist\Items;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Pager block for wishlist items page.
+ */
+class TopToolbar extends Block
+{
+    /**
+     * Selector next active element
+     *
+     * @var string
+     */
+    private $nextPageSelector = '.item.current + .item a';
+
+    /**
+     * Selector first element
+     *
+     * @var string
+     */
+    private $firstPageSelector = '.item>.page';
+
+    /**
+     * Selector option element
+     *
+     * @var string
+     */
+    private $optionSelector = './/option';
+
+    /**
+     * Go to the next page
+     *
+     * @return bool
+     */
+    public function nextPage()
+    {
+        $nextPageItem = $this->_rootElement->find($this->nextPageSelector);
+        if ($nextPageItem->isVisible()) {
+            $nextPageItem->click();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Go to the first page
+     *
+     * @return bool
+     */
+    public function firstPage()
+    {
+        $firstPageItem = $this->_rootElement->find($this->firstPageSelector);
+        if ($firstPageItem->isVisible()) {
+            $firstPageItem->click();
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Set value for limiter element by index
+     *
+     * @param int $index
+     * @return $this
+     */
+    public function setLimiterValueByIndex($index)
+    {
+        $options = $this->_rootElement->getElements($this->optionSelector, Locator::SELECTOR_XPATH);
+        if (isset($options[$index])) {
+            $options[$index]->click();
+        }
+        return $this;
+    }
+
+    /**
+     * Get value for limiter element by index
+     *
+     * @param int $index
+     * @return int|null
+     */
+    public function getLimitedValueByIndex($index)
+    {
+        $options = $this->_rootElement->getElements($this->optionSelector, Locator::SELECTOR_XPATH);
+        if (isset($options[$index])) {
+            return $options[$index]->getValue();
+        }
+        return null;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
index ae994f84c47f7..058c764be16a4 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
@@ -36,6 +36,13 @@ public function processAssert(
         $cmsIndex->getLinksBlock()->openLink('My Account');
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List');
 
+        $isProductVisible = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)
+            ->isVisible();
+        while (!$isProductVisible && $wishlistIndex->getTopToolbar()->nextPage()) {
+            $isProductVisible = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)
+                ->isVisible();
+        }
+
         \PHPUnit\Framework\Assert::assertTrue(
             $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)->isVisible(),
             $product->getName() . ' is not visible on Wish List page.'
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
index 68e30e13558ca..e0e174b652f2c 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
@@ -44,6 +44,13 @@ public function processAssert(
         $cmsIndex->getLinksBlock()->openLink('My Account');
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List');
 
+        $isProductVisible = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)
+            ->isVisible();
+        while (!$isProductVisible && $wishlistIndex->getTopToolbar()->nextPage()) {
+            $isProductVisible = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)
+                ->isVisible();
+        }
+
         $productRegularPrice = 0;
         if ($product instanceof GroupedProduct) {
             $associatedProducts = $product->getAssociated();
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml
index 141bc8c5898c2..4e67c8d4e1dd4 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Page/WishlistIndex.xml
@@ -9,5 +9,6 @@
   <page name="WishlistIndex" mca="wishlist/index/index" module="Magento_Wishlist">
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".messages" strategy="css selector"/>
     <block name="wishlistBlock" class="Magento\Wishlist\Test\Block\Customer\Wishlist" locator="#wishlist-view-form" strategy="css selector"/>
+    <block name="topToolbar" class="Magento\Wishlist\Test\Block\Customer\Wishlist\Items\TopToolbar" locator=".//*[contains(@class,'wishlist-toolbar')][2]" strategy="xpath"/>
   </page>
 </config>

From 6ebbe3d4142f83b76c18ce35e4cdadc2799c0232 Mon Sep 17 00:00:00 2001
From: Dipti 2Jcommerce <dipti@2jcommerce.in>
Date: Mon, 14 Jan 2019 19:44:28 +0530
Subject: [PATCH 620/932] 
 My-Accounttele-phone-field-require-no-validation-appear

---
 .../Customer/view/frontend/templates/widget/telephone.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
index 3371ee42129ec..9a865b124909d 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
@@ -19,7 +19,7 @@
         <?php
             $_validationClass = $block->escapeHtmlAttr(
                 $this->helper('Magento\Customer\Helper\Address')
-                     ->getAttributeValidationClass('fax')
+                     ->getAttributeValidationClass('telephone')
             );
         ?>
         <input type="text"

From 495393458d660afec46d5395d7e7b2835dbebb45 Mon Sep 17 00:00:00 2001
From: Oksana_Kremen <Oksana_Kremen@epam.com>
Date: Mon, 14 Jan 2019 16:24:06 +0200
Subject: [PATCH 621/932] MAGETWO-91513: Password reset email cannot be sent if
 the customer does not have customer attribute set that is changed to required
 after original account creation

- Avoiding customer validation and customer address validation for the use cases where it is not needed
---
 .../Customer/Controller/Account/EditPost.php  |  30 ++++-
 .../Controller/Adminhtml/Index/InlineEdit.php |  29 ++++-
 .../Adminhtml/Index/MassAssignGroup.php       |  14 ++
 .../Controller/Adminhtml/Index/Save.php       | 121 ++++++++++++++++++
 .../Customer/Model/AccountManagement.php      |   5 +-
 .../Customer/Model/ResourceModel/Address.php  |  16 ++-
 .../UpgradeCustomerPasswordObserver.php       |  17 +++
 .../Adminhtml/Index/InlineEditTest.php        |  63 ++++++++-
 .../Adminhtml/Index/MassAssignGroupTest.php   |  28 +++-
 .../Controller/Adminhtml/Index/SaveTest.php   |   6 +
 .../UpgradeCustomerPasswordObserverTest.php   |  14 +-
 .../Newsletter/Controller/Manage/Save.php     |  21 ++-
 12 files changed, 346 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
index 38bc52eac4266..4eb41cedea29a 100644
--- a/app/code/Magento/Customer/Controller/Account/EditPost.php
+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\AddressRegistry;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Customer\Model\Customer\Mapper;
@@ -25,6 +27,7 @@
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Customer\Controller\AbstractAccount;
 use Magento\Framework\Phrase;
@@ -85,6 +88,11 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface, Http
      */
     private $escaper;
 
+    /**
+     * @var AddressRegistry
+     */
+    private $addressRegistry;
+
     /**
      * @param Context $context
      * @param Session $customerSession
@@ -93,6 +101,7 @@ class EditPost extends AbstractAccount implements CsrfAwareActionInterface, Http
      * @param Validator $formKeyValidator
      * @param CustomerExtractor $customerExtractor
      * @param Escaper|null $escaper
+     * @param AddressRegistry|null $addressRegistry
      */
     public function __construct(
         Context $context,
@@ -101,7 +110,8 @@ public function __construct(
         CustomerRepositoryInterface $customerRepository,
         Validator $formKeyValidator,
         CustomerExtractor $customerExtractor,
-        ?Escaper $escaper = null
+        ?Escaper $escaper = null,
+        AddressRegistry $addressRegistry = null
     ) {
         parent::__construct($context);
         $this->session = $customerSession;
@@ -110,6 +120,7 @@ public function __construct(
         $this->formKeyValidator = $formKeyValidator;
         $this->customerExtractor = $customerExtractor;
         $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
+        $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
     }
 
     /**
@@ -195,6 +206,9 @@ public function execute()
                 // whether a customer enabled change password option
                 $isPasswordChanged = $this->changeCustomerPassword($currentCustomerDataObject->getEmail());
 
+                // No need to validate customer address while editing customer profile
+                $this->disableAddressValidation($customerCandidateDataObject);
+
                 $this->customerRepository->save($customerCandidateDataObject);
                 $this->getEmailNotification()->credentialsChanged(
                     $customerCandidateDataObject,
@@ -352,4 +366,18 @@ private function getCustomerMapper()
         }
         return $this->customerMapper;
     }
+
+    /**
+     * Disable Customer Address Validation
+     *
+     * @param CustomerInterface $customer
+     * @throws NoSuchEntityException
+     */
+    private function disableAddressValidation($customer)
+    {
+        foreach ($customer->getAddresses() as $address) {
+            $addressModel = $this->addressRegistry->retrieve($address->getId());
+            $addressModel->setShouldIgnoreValidation(true);
+        }
+    }
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
index 3c3808d0a1ee6..7220de0356817 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
@@ -8,10 +8,13 @@
 use Magento\Backend\App\Action;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\AddressRegistry;
 use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\Customer\Ui\Component\Listing\AttributeRepository;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Customer inline edit action
@@ -62,6 +65,11 @@ class InlineEdit extends \Magento\Backend\App\Action implements HttpPostActionIn
      */
     private $emailNotification;
 
+    /**
+     * @var AddressRegistry
+     */
+    private $addressRegistry;
+
     /**
      * @param Action\Context $context
      * @param CustomerRepositoryInterface $customerRepository
@@ -69,6 +77,7 @@ class InlineEdit extends \Magento\Backend\App\Action implements HttpPostActionIn
      * @param \Magento\Customer\Model\Customer\Mapper $customerMapper
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param \Psr\Log\LoggerInterface $logger
+     * @param AddressRegistry|null $addressRegistry
      */
     public function __construct(
         Action\Context $context,
@@ -76,13 +85,15 @@ public function __construct(
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Customer\Model\Customer\Mapper $customerMapper,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
-        \Psr\Log\LoggerInterface $logger
+        \Psr\Log\LoggerInterface $logger,
+        AddressRegistry $addressRegistry = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->resultJsonFactory = $resultJsonFactory;
         $this->customerMapper = $customerMapper;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->logger = $logger;
+        $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
         parent::__construct($context);
     }
 
@@ -219,6 +230,8 @@ protected function updateDefaultBilling(array $data)
     protected function saveCustomer(CustomerInterface $customer)
     {
         try {
+            // No need to validate customer address during inline edit action
+            $this->disableAddressValidation($customer);
             $this->customerRepository->save($customer);
         } catch (\Magento\Framework\Exception\InputException $e) {
             $this->getMessageManager()->addError($this->getErrorWithCustomerId($e->getMessage()));
@@ -304,4 +317,18 @@ protected function getErrorWithCustomerId($errorText)
     {
         return '[Customer ID: ' . $this->getCustomer()->getId() . '] ' . __($errorText);
     }
+
+    /**
+     * Disable Customer Address Validation
+     *
+     * @param CustomerInterface $customer
+     * @throws NoSuchEntityException
+     */
+    private function disableAddressValidation($customer)
+    {
+        foreach ($customer->getAddresses() as $address) {
+            $addressModel = $this->addressRegistry->retrieve($address->getId());
+            $addressModel->setShouldIgnoreValidation(true);
+        }
+    }
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
index a540ad9d7a70e..5a9c52bf9b1c0 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Customer\Model\Customer;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
@@ -52,6 +53,8 @@ protected function massAction(AbstractCollection $collection)
             // Verify customer exists
             $customer = $this->customerRepository->getById($customerId);
             $customer->setGroupId($this->getRequest()->getParam('group'));
+            // No need to validate customer and customer address during assigning customer to the group
+            $this->setIgnoreValidationFlag($customer);
             $this->customerRepository->save($customer);
             $customersUpdated++;
         }
@@ -65,4 +68,15 @@ protected function massAction(AbstractCollection $collection)
 
         return $resultRedirect;
     }
+
+    /**
+     * Set ignore_validation_flag to skip unnecessary address and customer validation
+     *
+     * @param Customer $customer
+     * @return void
+     */
+    private function setIgnoreValidationFlag($customer)
+    {
+        $customer->setData('ignore_validation_flag', true);
+    }
 }
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index adb420f983006..cb0343f4ec43b 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -5,6 +5,15 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Address\Mapper;
+use Magento\Customer\Model\AddressRegistry;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\DataObjectFactory as ObjectFactory;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
@@ -13,6 +22,8 @@
 use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Save customer action.
@@ -26,6 +37,100 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Index implements HttpP
      */
     private $emailNotification;
 
+    /**
+     * @var AddressRegistry
+     */
+    private $addressRegistry;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Customer\Model\CustomerFactory $customerFactory
+     * @param \Magento\Customer\Model\AddressFactory $addressFactory
+     * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
+     * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
+     * @param \Magento\Customer\Helper\View $viewHelper
+     * @param \Magento\Framework\Math\Random $random
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
+     * @param Mapper $addressMapper
+     * @param AccountManagementInterface $customerAccountManagement
+     * @param AddressRepositoryInterface $addressRepository
+     * @param CustomerInterfaceFactory $customerDataFactory
+     * @param AddressInterfaceFactory $addressDataFactory
+     * @param \Magento\Customer\Model\Customer\Mapper $customerMapper
+     * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
+     * @param DataObjectHelper $dataObjectHelper
+     * @param ObjectFactory $objectFactory
+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param AddressRegistry|null $addressRegistry
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Customer\Model\CustomerFactory $customerFactory,
+        \Magento\Customer\Model\AddressFactory $addressFactory,
+        \Magento\Customer\Model\Metadata\FormFactory $formFactory,
+        \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory,
+        \Magento\Customer\Helper\View $viewHelper,
+        \Magento\Framework\Math\Random $random,
+        CustomerRepositoryInterface $customerRepository,
+        \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter,
+        Mapper $addressMapper,
+        AccountManagementInterface $customerAccountManagement,
+        AddressRepositoryInterface $addressRepository,
+        CustomerInterfaceFactory $customerDataFactory,
+        AddressInterfaceFactory $addressDataFactory,
+        \Magento\Customer\Model\Customer\Mapper $customerMapper,
+        \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
+        DataObjectHelper $dataObjectHelper,
+        ObjectFactory $objectFactory,
+        \Magento\Framework\View\LayoutFactory $layoutFactory,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
+        AddressRegistry $addressRegistry = null
+    ) {
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $customerFactory,
+            $addressFactory,
+            $formFactory,
+            $subscriberFactory,
+            $viewHelper,
+            $random,
+            $customerRepository,
+            $extensibleDataObjectConverter,
+            $addressMapper,
+            $customerAccountManagement,
+            $addressRepository,
+            $customerDataFactory,
+            $addressDataFactory,
+            $customerMapper,
+            $dataObjectProcessor,
+            $dataObjectHelper,
+            $objectFactory,
+            $layoutFactory,
+            $resultLayoutFactory,
+            $resultPageFactory,
+            $resultForwardFactory,
+            $resultJsonFactory
+        );
+        $this->addressRegistry = $addressRegistry ?: ObjectManager::getInstance()->get(AddressRegistry::class);
+    }
+
     /**
      * Reformat customer account data to be compatible with customer service interface
      *
@@ -195,6 +300,8 @@ public function execute()
 
                 if ($customerId) {
                     $currentCustomer = $this->_customerRepository->getById($customerId);
+                    // No need to validate customer address while editing customer profile
+                    $this->disableAddressValidation($currentCustomer);
                     $customerData = array_merge(
                         $this->customerMapper->toFlatArray($currentCustomer),
                         $customerData
@@ -368,4 +475,18 @@ private function getCurrentCustomerId()
 
         return $customerId;
     }
+
+    /**
+     * Disable Customer Address Validation
+     *
+     * @param CustomerInterface $customer
+     * @throws NoSuchEntityException
+     */
+    private function disableAddressValidation($customer)
+    {
+        foreach ($customer->getAddresses() as $address) {
+            $addressModel = $this->addressRegistry->retrieve($address->getId());
+            $addressModel->setShouldIgnoreValidation(true);
+        }
+    }
 }
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index d7c5d7f47a4cf..eccfc1f0b5656 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -524,6 +524,8 @@ private function activateCustomer($customer, $confirmationKey)
         }
 
         $customer->setConfirmation(null);
+        // No need to validate customer and customer address while activating customer
+        $this->setIgnoreValidationFlag($customer);
         $this->customerRepository->save($customer);
         $this->getEmailNotification()->newAccount(
             $customer,
@@ -683,8 +685,9 @@ public function resetPassword($email, $resetToken, $newPassword)
             $customer = $this->customerRepository->get($email);
         }
 
-        // No need to validate customer address while saving customer reset password token
+        // No need to validate customer and customer address while saving customer reset password token
         $this->disableAddressValidation($customer);
+        $this->setIgnoreValidationFlag($customer);
 
         //Validate Token and new password strength
         $this->validateResetPasswordToken($customer->getId(), $resetToken);
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address.php b/app/code/Magento/Customer/Model/ResourceModel/Address.php
index a52c372310843..200eaabe6517d 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address.php
@@ -14,6 +14,7 @@
 
 /**
  * Class Address
+ *
  * @package Magento\Customer\Model\ResourceModel
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -31,8 +32,8 @@ class Address extends \Magento\Eav\Model\Entity\VersionControl\AbstractEntity
 
     /**
      * @param \Magento\Eav\Model\Entity\Context $context
-     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot,
-     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite,
+     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
+     * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
      * @param \Magento\Framework\Validator\Factory $validatorFactory
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param array $data
@@ -98,6 +99,9 @@ protected function _beforeSave(\Magento\Framework\DataObject $address)
      */
     protected function _validate($address)
     {
+        if ($address->getDataByKey('should_ignore_validation')) {
+            return;
+        };
         $validator = $this->_validatorFactory->createValidator('customer_address', 'save');
 
         if (!$validator->isValid($address)) {
@@ -110,7 +114,7 @@ protected function _validate($address)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete($object)
     {
@@ -120,6 +124,8 @@ public function delete($object)
     }
 
     /**
+     * Get instance of DeleteRelation class
+     *
      * @deprecated 100.2.0
      * @return DeleteRelation
      */
@@ -129,6 +135,8 @@ private function getDeleteRelation()
     }
 
     /**
+     * Get instance of CustomerRegistry class
+     *
      * @deprecated 100.2.0
      * @return CustomerRegistry
      */
@@ -138,6 +146,8 @@ private function getCustomerRegistry()
     }
 
     /**
+     * After delete entity process
+     *
      * @param \Magento\Customer\Model\Address $address
      * @return $this
      */
diff --git a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
index eb7e81009c92c..26c4c50009bb1 100644
--- a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
+++ b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
@@ -6,11 +6,15 @@
 
 namespace Magento\Customer\Observer;
 
+use Magento\Customer\Model\Customer;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\CustomerRegistry;
 
+/**
+ * Class observer UpgradeCustomerPasswordObserver to upgrade customer password hash when customer has logged in
+ */
 class UpgradeCustomerPasswordObserver implements ObserverInterface
 {
     /**
@@ -61,7 +65,20 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
         if (!$this->encryptor->validateHashVersion($customerSecure->getPasswordHash(), true)) {
             $customerSecure->setPasswordHash($this->encryptor->getHash($password, true));
+            // No need to validate customer and customer address while upgrading customer password
+            $this->setIgnoreValidationFlag($customer);
             $this->customerRepository->save($customer);
         }
     }
+
+    /**
+     * Set ignore_validation_flag to skip unnecessary address and customer validation
+     *
+     * @param Customer $customer
+     * @return void
+     */
+    private function setIgnoreValidationFlag($customer)
+    {
+        $customer->setData('ignore_validation_flag', true);
+    }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
index 78d9dd7003522..45e64f6557d51 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/InlineEditTest.php
@@ -5,10 +5,14 @@
  */
 namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
 
+use Magento\Customer\Model\AddressRegistry;
 use Magento\Customer\Model\EmailNotificationInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\Message\MessageInterface;
 
 /**
+ * Unit tests for Inline customer edit
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -68,14 +72,27 @@ class InlineEditTest extends \PHPUnit\Framework\TestCase
     /** @var EmailNotificationInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $emailNotification;
 
+    /** @var AddressRegistry|\PHPUnit_Framework_MockObject_MockObject */
+    private $addressRegistry;
+
     /** @var array */
     private $items;
 
+    /**
+     * Sets up mocks
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class, [], '', false);
+        $this->request = $this->getMockForAbstractClass(
+            \Magento\Framework\App\RequestInterface::class,
+            [],
+            '',
+            false
+        );
         $this->messageManager = $this->getMockForAbstractClass(
             \Magento\Framework\Message\ManagerInterface::class,
             [],
@@ -125,8 +142,12 @@ protected function setUp()
             '',
             false
         );
-        $this->logger = $this->getMockForAbstractClass(\Psr\Log\LoggerInterface::class, [], '', false);
-
+        $this->logger = $this->getMockForAbstractClass(
+            \Psr\Log\LoggerInterface::class,
+            [],
+            '',
+            false
+        );
         $this->emailNotification = $this->getMockBuilder(EmailNotificationInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -138,6 +159,7 @@ protected function setUp()
                 'messageManager' => $this->messageManager,
             ]
         );
+        $this->addressRegistry = $this->createMock(\Magento\Customer\Model\AddressRegistry::class);
         $this->controller = $objectManager->getObject(
             \Magento\Customer\Controller\Adminhtml\Index\InlineEdit::class,
             [
@@ -150,6 +172,7 @@ protected function setUp()
                 'addressDataFactory' => $this->addressDataFactory,
                 'addressRepository' => $this->addressRepository,
                 'logger' => $this->logger,
+                'addressRegistry' => $this->addressRegistry
             ]
         );
         $reflection = new \ReflectionClass(get_class($this->controller));
@@ -166,6 +189,8 @@ protected function setUp()
     }
 
     /**
+     * Prepare mocks for tests
+     *
      * @param int $populateSequence
      */
     protected function prepareMocksForTesting($populateSequence = 0)
@@ -204,6 +229,9 @@ protected function prepareMocksForTesting($populateSequence = 0)
             ->willReturn(12);
     }
 
+    /**
+     * Prepare mocks for update customers default billing address use case
+     */
     protected function prepareMocksForUpdateDefaultBilling()
     {
         $this->prepareMocksForProcessAddressData();
@@ -212,12 +240,15 @@ protected function prepareMocksForUpdateDefaultBilling()
             'firstname' => 'Firstname',
             'lastname' => 'Lastname',
         ];
-        $this->customerData->expects($this->once())
+        $this->customerData->expects($this->exactly(2))
             ->method('getAddresses')
             ->willReturn([$this->address]);
         $this->address->expects($this->once())
             ->method('isDefaultBilling')
             ->willReturn(true);
+        $this->addressRegistry->expects($this->once())
+            ->method('retrieve')
+            ->willReturn(new DataObject());
         $this->dataObjectHelper->expects($this->at(0))
             ->method('populateWithArray')
             ->with(
@@ -227,6 +258,9 @@ protected function prepareMocksForUpdateDefaultBilling()
             );
     }
 
+    /**
+     * Prepare mocks for processing customers address data use case
+     */
     protected function prepareMocksForProcessAddressData()
     {
         $this->customerData->expects($this->once())
@@ -237,6 +271,9 @@ protected function prepareMocksForProcessAddressData()
             ->willReturn('Lastname');
     }
 
+    /**
+     * Prepare mocks for error messages processing test
+     */
     protected function prepareMocksForErrorMessagesProcessing()
     {
         $this->messageManager->expects($this->atLeastOnce())
@@ -261,6 +298,9 @@ protected function prepareMocksForErrorMessagesProcessing()
             ->willReturnSelf();
     }
 
+    /**
+     * Unit test for updating customers billing address use case
+     */
     public function testExecuteWithUpdateBilling()
     {
         $this->prepareMocksForTesting(1);
@@ -281,6 +321,9 @@ public function testExecuteWithUpdateBilling()
         $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
+    /**
+     * Unit test for creating customer with empty data use case
+     */
     public function testExecuteWithoutItems()
     {
         $this->resultJsonFactory->expects($this->once())
@@ -305,6 +348,9 @@ public function testExecuteWithoutItems()
         $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
+    /**
+     * Unit test for verifying Localized Exception during inline edit
+     */
     public function testExecuteLocalizedException()
     {
         $exception = new \Magento\Framework\Exception\LocalizedException(__('Exception message'));
@@ -312,6 +358,9 @@ public function testExecuteLocalizedException()
         $this->customerData->expects($this->once())
             ->method('getDefaultBilling')
             ->willReturn(false);
+        $this->customerData->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([]);
         $this->customerRepository->expects($this->once())
             ->method('save')
             ->with($this->customerData)
@@ -327,6 +376,9 @@ public function testExecuteLocalizedException()
         $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
+    /**
+     * Unit test for verifying Execute Exception during inline edit
+     */
     public function testExecuteException()
     {
         $exception = new \Exception('Exception message');
@@ -334,6 +386,9 @@ public function testExecuteException()
         $this->customerData->expects($this->once())
             ->method('getDefaultBilling')
             ->willReturn(false);
+        $this->customerData->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([]);
         $this->customerRepository->expects($this->once())
             ->method('save')
             ->with($this->customerData)
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
index 884aab711d168..10144bdc318c1 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/MassAssignGroupTest.php
@@ -11,6 +11,7 @@
 
 /**
  * Class MassAssignGroupTest
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
@@ -70,12 +71,17 @@ class MassAssignGroupTest extends \PHPUnit\Framework\TestCase
      */
     protected $customerRepositoryMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
 
         $this->contextMock = $this->createMock(\Magento\Backend\App\Action\Context::class);
-        $resultRedirectFactory = $this->createMock(\Magento\Backend\Model\View\Result\RedirectFactory::class);
+        $resultRedirectFactory = $this->createMock(
+            \Magento\Backend\Model\View\Result\RedirectFactory::class
+        );
         $this->responseMock = $this->createMock(\Magento\Framework\App\ResponseInterface::class);
         $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()->getMock();
@@ -129,7 +135,8 @@ protected function setUp()
         $this->customerCollectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->customerCollectionMock);
-        $this->customerRepositoryMock = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+        $this->customerRepositoryMock = $this
+            ->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
             ->getMockForAbstractClass();
         $this->massAction = $objectManagerHelper->getObject(
             \Magento\Customer\Controller\Adminhtml\Index\MassAssignGroup::class,
@@ -142,12 +149,18 @@ protected function setUp()
         );
     }
 
+    /**
+     * Unit test to verify mass customer group assignment use case
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testExecute()
     {
         $customersIds = [10, 11, 12];
-        $customerMock = $this->getMockBuilder(
-            \Magento\Customer\Api\Data\CustomerInterface::class
-        )->getMockForAbstractClass();
+        $customerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->setMethods(['setData'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $this->customerCollectionMock->expects($this->any())
             ->method('getAllIds')
             ->willReturn($customersIds);
@@ -168,6 +181,11 @@ public function testExecute()
         $this->massAction->execute();
     }
 
+    /**
+     * Unit test to verify expected error during mass customer group assignment use case
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
     public function testExecuteWithException()
     {
         $customersIds = [10, 11, 12];
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
index c52d5b2fb370f..8d802e907a810 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/SaveTest.php
@@ -14,6 +14,8 @@
 use Magento\Framework\Controller\Result\Redirect;
 
 /**
+ * Testing Save Customer use case from admin page
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @covers \Magento\Customer\Controller\Adminhtml\Index\Save
@@ -435,6 +437,10 @@ public function testExecuteWithExistentCustomer()
         $customerEmail = 'customer@email.com';
         $customerMock->expects($this->once())->method('getEmail')->willReturn($customerEmail);
 
+        $customerMock->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([]);
+
         $this->emailNotificationMock->expects($this->once())
             ->method('credentialsChanged')
             ->with($customerMock, $customerEmail)
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
index 8971f155f782e..188bbde71c104 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/UpgradeCustomerPasswordObserverTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Customer\Observer\UpgradeCustomerPasswordObserver;
 
+/**
+ * Class UpgradeCustomerPasswordObserverTest for testing upgrade password observer
+ */
 class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -29,9 +32,13 @@ class UpgradeCustomerPasswordObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected $customerRegistry;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        $this->customerRepository = $this->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
+        $this->customerRepository = $this
+            ->getMockBuilder(\Magento\Customer\Api\CustomerRepositoryInterface::class)
             ->getMockForAbstractClass();
         $this->customerRegistry = $this->getMockBuilder(\Magento\Customer\Model\CustomerRegistry::class)
             ->disableOriginalConstructor()
@@ -47,6 +54,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * Unit test for verifying customers password upgrade observer
+     */
     public function testUpgradeCustomerPassword()
     {
         $customerId = '1';
@@ -57,6 +67,8 @@ public function testUpgradeCustomerPassword()
             ->setMethods(['getId'])
             ->getMock();
         $customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
+            ->setMethods(['setData'])
+            ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $customerSecure = $this->getMockBuilder(\Magento\Customer\Model\Data\CustomerSecure::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 419cbac10ffd1..2e56952c27e12 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,9 +7,14 @@
 namespace Magento\Newsletter\Controller\Manage;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Model\Customer;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Newsletter\Model\Subscriber;
 
-class Save extends \Magento\Newsletter\Controller\Manage
+/**
+ * Customers newsletter subscription save controller
+ */
+class Save extends \Magento\Newsletter\Controller\Manage implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
@@ -81,6 +85,8 @@ public function execute()
                 $isSubscribedParam = (boolean)$this->getRequest()
                     ->getParam('is_subscribed', false);
                 if ($isSubscribedParam !== $isSubscribedState) {
+                    // No need to validate customer and customer address while saving subscription preferences
+                    $this->setIgnoreValidationFlag($customer);
                     $this->customerRepository->save($customer);
                     if ($isSubscribedParam) {
                         $subscribeModel = $this->subscriberFactory->create()
@@ -105,4 +111,15 @@ public function execute()
         }
         $this->_redirect('customer/account/');
     }
+
+    /**
+     * Set ignore_validation_flag to skip unnecessary address and customer validation
+     *
+     * @param Customer $customer
+     * @return void
+     */
+    private function setIgnoreValidationFlag($customer)
+    {
+        $customer->setData('ignore_validation_flag', true);
+    }
 }

From 26523079a49974991afe0bdd95dde8fbdf5072a9 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 14 Jan 2019 16:34:18 +0200
Subject: [PATCH 622/932] MAGETWO-96308: Configurable "As low As" Product Price
 Not Updating Correctly

---
 .../Catalog/view/base/web/js/price-box.js     |  6 +-
 .../view/frontend/web/js/configurable.js      | 63 +++++--------------
 .../view/frontend/web/js/swatch-renderer.js   |  6 +-
 3 files changed, 17 insertions(+), 58 deletions(-)

diff --git a/app/code/Magento/Catalog/view/base/web/js/price-box.js b/app/code/Magento/Catalog/view/base/web/js/price-box.js
index de68d769885fd..783d39cddbc76 100644
--- a/app/code/Magento/Catalog/view/base/web/js/price-box.js
+++ b/app/code/Magento/Catalog/view/base/web/js/price-box.js
@@ -78,11 +78,7 @@ define([
                 pricesCode = [],
                 priceValue, origin, finalPrice;
 
-            if (typeof newPrices !== 'undefined' && newPrices.hasOwnProperty('prices')) {
-                this.cache.additionalPriceObject = {};
-            } else {
-                this.cache.additionalPriceObject = this.cache.additionalPriceObject || {};
-            }
+            this.cache.additionalPriceObject = this.cache.additionalPriceObject || {};
 
             if (newPrices) {
                 $.extend(this.cache.additionalPriceObject, newPrices);
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
index 6357bbd6c7c0c..1df84d27a5c30 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -376,7 +376,8 @@ define([
                 basePrice = parseFloat(this.options.spConfig.prices.basePrice.amount),
                 optionFinalPrice,
                 optionPriceDiff,
-                optionPrices = this.options.spConfig.optionPrices;
+                optionPrices = this.options.spConfig.optionPrices,
+                allowedProductMinPrice;
 
             this._clearSelect(element);
             element.options[0] = new Option('', '');
@@ -407,8 +408,8 @@ define([
 
                         if (typeof allowedProducts[0] !== 'undefined' &&
                             typeof optionPrices[allowedProducts[0]] !== 'undefined') {
-
-                            optionFinalPrice = parseFloat(optionPrices[allowedProducts[0]].finalPrice.amount);
+                            allowedProductMinPrice = this._getAllowedProductWithMinPrice(allowedProducts);
+                            optionFinalPrice = parseFloat(optionPrices[allowedProductMinPrice].finalPrice.amount);
                             optionPriceDiff = optionFinalPrice - basePrice;
 
                             if (optionPriceDiff !== 0) {
@@ -489,36 +490,27 @@ define([
         _getPrices: function () {
             var prices = {},
                 elements = _.toArray(this.options.settings),
-                hasProductPrice = false,
-                optionPriceDiff = 0,
-                allowedProduct, optionPrices, basePrice, optionFinalPrice;
+                allowedProduct;
 
             _.each(elements, function (element) {
                 var selected = element.options[element.selectedIndex],
                     config = selected && selected.config,
                     priceValue = {};
 
-                if (config && config.allowedProducts.length === 1 && !hasProductPrice) {
-                    prices = {};
+                if (config && config.allowedProducts.length === 1) {
                     priceValue = this._calculatePrice(config);
-                    hasProductPrice = true;
                 } else if (element.value) {
                     allowedProduct = this._getAllowedProductWithMinPrice(config.allowedProducts);
-                    optionPrices = this.options.spConfig.optionPrices;
-                    basePrice = parseFloat(this.options.spConfig.prices.basePrice.amount);
-
-                    if (!_.isEmpty(allowedProduct)) {
-                        optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
-                        optionPriceDiff = optionFinalPrice - basePrice;
-                    }
-
-                    if (optionPriceDiff !== 0) {
-                        prices = {};
-                        priceValue = this._calculatePriceDifference(allowedProduct);
-                    }
+                    priceValue = this._calculatePrice({
+                        'allowedProducts': [
+                            allowedProduct
+                        ]
+                    });
                 }
 
-                prices[element.attributeId] = priceValue;
+                if (!_.isEmpty(priceValue)) {
+                    prices.prices = priceValue;
+                }
             }, this);
 
             return prices;
@@ -539,40 +531,15 @@ define([
             _.each(allowedProducts, function (allowedProduct) {
                 optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
 
-                if (_.isEmpty(product)) {
+                if (_.isEmpty(product) || optionFinalPrice < optionMinPrice) {
                     optionMinPrice = optionFinalPrice;
                     product = allowedProduct;
                 }
-
-                if (optionFinalPrice < optionMinPrice) {
-                    product = allowedProduct;
-                }
             }, this);
 
             return product;
         },
 
-        /**
-         * Calculate price difference for allowed product
-         *
-         * @param {*} allowedProduct - Product
-         * @returns {*}
-         * @private
-         */
-        _calculatePriceDifference: function (allowedProduct) {
-            var displayPrices = $(this.options.priceHolderSelector).priceBox('option').prices,
-                newPrices = this.options.spConfig.optionPrices[allowedProduct];
-
-            _.each(displayPrices, function (price, code) {
-
-                if (newPrices[code]) {
-                    displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
-                }
-            });
-
-            return displayPrices;
-        },
-
         /**
          * Returns prices for configured products
          *
diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
index 938028f62502d..962ac8b171692 100644
--- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
@@ -1029,14 +1029,10 @@ define([
             _.each(allowedProducts, function (allowedProduct) {
                 optionFinalPrice = parseFloat(optionPrices[allowedProduct].finalPrice.amount);
 
-                if (_.isEmpty(product)) {
+                if (_.isEmpty(product) || optionFinalPrice < optionMinPrice) {
                     optionMinPrice = optionFinalPrice;
                     product = allowedProduct;
                 }
-
-                if (optionFinalPrice < optionMinPrice) {
-                    product = allowedProduct;
-                }
             }, this);
 
             return product;

From c0629117fcbc22c6b405efbe3e3a1fcc6eb88911 Mon Sep 17 00:00:00 2001
From: Stas Puga <stas.puga@transoftgroup.com>
Date: Mon, 14 Jan 2019 16:38:21 +0200
Subject: [PATCH 623/932] MAGETWO-58762: Customer grid does not open in
 MoveLastOrderedProductsOnOrderPageTestVariation2 on Jenkins

---
 .../Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
index 6f568df8f21ca..a9bd3fcacea8a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
@@ -14,7 +14,6 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />
         </variation>
         <variation name="MoveLastOrderedProductsOnOrderPageTestVariation2">
-            <data name="issue" xsi:type="string">MAGETWO-58762: Customer grid does not open in MoveLastOrderedProductsOnOrderPageTestVariation2 on Jenkins</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/entity_id/products" xsi:type="string">configurableProduct::configurable_with_qty_1</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />

From 44a21498df21c8112056da0d865251afbb7a521d Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 14 Jan 2019 17:14:57 +0200
Subject: [PATCH 624/932] ENGCOM-3814: Static test fix.

---
 .../Eav/Model/Attribute/Data/AbstractData.php |  3 +-
 .../Magento/Eav/Model/Attribute/Data/Text.php | 29 ++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
index 3189041d7f716..730734e59c50c 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php
@@ -143,6 +143,7 @@ public function setRequestScope($scope)
 
     /**
      * Set scope visibility
+     *
      * Search value only in scope or search value in scope and global
      *
      * @param bool $flag
@@ -296,7 +297,7 @@ protected function _applyOutputFilter($value)
      * Validate value by attribute input validation rule
      *
      * @param string $value
-     * @return string|true
+     * @return array|true
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
diff --git a/app/code/Magento/Eav/Model/Attribute/Data/Text.php b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
index 336e412435405..c5167821fdfce 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/Text.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/Text.php
@@ -72,20 +72,17 @@ public function validateValue($value)
             return true;
         }
 
-        if (empty($value) && $value !== '0' && $attribute->getDefaultValue() == NULL) {
+        if (empty($value) && $value !== '0' && $attribute->getDefaultValue() === null) {
             $label = __($attribute->getStoreLabel());
             $errors[] = __('"%1" is a required value.', $label);
         }
 
-        $result = $this->validateLength($attribute, $value);
-        if (count($result) !== 0) {
-            $errors = array_merge($errors, $result);
-        }
+        $validateLengthResult = $this->validateLength($attribute, $value);
+        $errors = array_merge($errors, $validateLengthResult);
+
+        $validateInputRuleResult = $this->validateInputRule($value);
+        $errors = array_merge($errors, $validateInputRuleResult);
 
-        $result = $this->_validateInputRule($value);
-        if ($result !== true) {
-            $errors = array_merge($errors, $result);
-        }
         if (count($errors) == 0) {
             return true;
         }
@@ -141,7 +138,7 @@ public function outputValue($format = \Magento\Eav\Model\AttributeDataFactory::O
      * @param string $value
      * @return array errors
      */
-    private function validateLength(\Magento\Eav\Model\Attribute $attribute, $value): array
+    private function validateLength(\Magento\Eav\Model\Attribute $attribute, string $value): array
     {
         $errors = [];
         $length = $this->_string->strlen(trim($value));
@@ -162,4 +159,16 @@ private function validateLength(\Magento\Eav\Model\Attribute $attribute, $value)
 
         return $errors;
     }
+
+    /**
+     * Validate value by attribute input validation rule.
+     *
+     * @param string $value
+     * @return array
+     */
+    private function validateInputRule(string $value): array
+    {
+        $result = $this->_validateInputRule($value);
+        return \is_array($result) ? $result : [];
+    }
 }

From 4090741cc8d2cc8837dce204f3d5272f22813513 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Mon, 14 Jan 2019 18:18:29 +0300
Subject: [PATCH 625/932] MC-5573: Refactoring tests. Improve specified test
 cases.

- Add new line in the end of file and change noNamespaceSchemaLocation.
---
 .../AdminAddDefaultVideoBundleProductTest.xml |   2 +-
 ...minRemoveDefaultVideoBundleProductTest.xml |   2 +-
 .../AdvanceCatalogSearchBundleProductTest.xml |   2 +-
 .../Mftf/Test/CaptchaFormsDisplayingTest.xml  |   2 +-
 .../AdminAddDefaultVideoSimpleProductTest.xml |   2 +-
 ...AdminAddDefaultVideoVirtualProductTest.xml |   2 +-
 ...minRemoveDefaultVideoSimpleProductTest.xml |   2 +-
 ...inRemoveDefaultVideoVirtualProductTest.xml |   2 +-
 ...AdvanceCatalogSearchVirtualProductTest.xml |   2 +-
 .../Test/CheckTierPricingOfProductsTest.xml   |   2 +-
 ...IncrementsWorkWithDecimalinventoryTest.xml |   2 +-
 .../Test/CheckoutSpecificDestinationsTest.xml | 172 +++++++++---------
 ...OfDefaultBillingAndShippingAddressTest.xml |   2 +-
 .../AdvanceCatalogSearchConfigurableTest.xml  |   2 +-
 ...AddDefaultVideoDownloadableProductTest.xml |   2 +-
 ...ceCatalogSearchDownloadableProductTest.xml |   2 +-
 ...AdminAddDefaultVideoGroupedProductTest.xml |   2 +-
 ...inRemoveDefaultVideoGroupedProductTest.xml |   2 +-
 ...AdvanceCatalogSearchGroupedProductTest.xml |   2 +-
 ...erifySubscribedNewsletterDisplayedTest.xml |   2 +-
 .../AdminAddDefaultVideoSimpleProductTest.xml |   2 +-
 ...minRemoveDefaultVideoSimpleProductTest.xml |   2 +-
 .../AdminCreateOrderWithBundleProductTest.xml |   2 +-
 ...dminSubmitConfigurableProductOrderTest.xml |   2 +-
 .../Test/StorefrontRedirectToOrderHistory.xml |   2 +-
 ...inRemoveProductWeeeAttributeOptionTest.xml |   3 +-
 .../Test/StorefrontUpdateWishlistTest.xml     | 118 ++++++------
 .../Test/EndToEndB2CGuestUserTest.xml         |   2 +-
 .../Test/EndToEndB2CLoggedInUserTest.xml      |   2 +-
 .../Test/EndToEndB2CLoggedInUserTest.xml      |   2 +-
 30 files changed, 174 insertions(+), 173 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml
index 3c00344697699..c49202f31aefb 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultVideoBundleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultVideoBundleProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
index e3cb68b6664e2..d050c5443d1fe 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultVideoBundleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultVideoBundleProductTest"  extends="AdminRemoveDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
index 0b220efaad49f..52bce67600888 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdvanceCatalogSearchBundleByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
             <features value="Bundle"/>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
index a088266f760a5..035e58de06ccf 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CaptchaFormsDisplayingTest">
         <annotations>
             <features value="Captcha"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
index 5456cb02e74ca..f657fbbdae607 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml
index f48c352c5290a..eab36bc90dc18 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoVirtualProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultVideoVirtualProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
index 1bd218d18c27d..876eedb9347c7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml
index e6d3978cad7bb..8b3b38d0ece31 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoVirtualProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultVideoVirtualProductTest" extends="AdminRemoveDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
index 0eb8f5668751a..84c3f81ef6dbf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdvanceCatalogSearchVirtualProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdvanceCatalogSearchVirtualProductByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
index 7da668df59022..cee40241185b4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CheckTierPricingOfProductsTest">
         <annotations>
             <features value="Shopping Cart"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
index f283a040ced41..e6c37c8dc15e3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest">
         <annotations>
             <features value="Catalog"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
index 269ca94b3f772..f3807388399b8 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
@@ -1,86 +1,86 @@
-<?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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <test name="CheckoutSpecificDestinationsTest">
-        <annotations>
-            <title value="Check that top destinations can be removed after a selection was previously saved"/>
-            <stories value="MAGETWO-91511: Top destinations cannot be removed after a selection was previously saved"/>
-            <description value="Check that top destinations can be removed after a selection was previously saved"/>
-            <features value="Checkout"/>
-            <severity value="AVERAGE"/>
-            <testCaseId value="MAGETWO-94195"/>
-            <group value="Checkout"/>
-        </annotations>
-
-        <before>
-            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
-            <createData entity="_defaultProduct" stepKey="simpleProduct">
-                <requiredEntity createDataKey="defaultCategory"/>
-            </createData>
-
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-        </before>
-
-        <!--Go to configuration general page-->
-        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage"/>
-
-        <!--Open country options section-->
-        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation"/>
-
-        <!--Select top destinations country-->
-        <actionGroup ref="SelectTopDestinationsCountry" stepKey="selectTopDestinationsCountry">
-            <argument name="countries" value="Countries"/>
-        </actionGroup>
-
-        <!--Go to product page-->
-        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.name$$)}}" stepKey="amOnStorefrontProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-
-        <!--Add product to cart-->
-        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCart">
-            <argument name="productName" value="$$simpleProduct.name$$"/>
-        </actionGroup>
-
-        <!--Go to shopping cart-->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
-
-        <!--Verify country options in checkout top destination section-->
-        <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry">
-            <argument name="country" value="Bahamas"/>
-            <argument name="placeNumber" value="2"/>
-        </actionGroup>
-
-        <!--Go to configuration general page-->
-        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage2"/>
-
-        <!--Open country options section-->
-        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation2"/>
-
-        <!--Deselect top destinations country-->
-        <actionGroup ref="UnSelectTopDestinationsCountry" stepKey="unSelectTopDestinationsCountry">
-            <argument name="countries" value="Countries"/>
-        </actionGroup>
-
-        <!--Go to shopping cart-->
-        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart2"/>
-
-        <!--Verify country options is shown by default-->
-        <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry2">
-            <argument name="country" value="Afghanistan"/>
-            <argument name="placeNumber" value="2"/>
-        </actionGroup>
-
-        <after>
-            <actionGroup ref="logout" stepKey="logout"/>
-
-            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
-            <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
-        </after>
-    </test>
-</tests>
\ No newline at end of file
+<?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="CheckoutSpecificDestinationsTest">
+        <annotations>
+            <title value="Check that top destinations can be removed after a selection was previously saved"/>
+            <stories value="MAGETWO-91511: Top destinations cannot be removed after a selection was previously saved"/>
+            <description value="Check that top destinations can be removed after a selection was previously saved"/>
+            <features value="Checkout"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MAGETWO-94195"/>
+            <group value="Checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="defaultCategory"/>
+            <createData entity="_defaultProduct" stepKey="simpleProduct">
+                <requiredEntity createDataKey="defaultCategory"/>
+            </createData>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+
+        <!--Go to configuration general page-->
+        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage"/>
+
+        <!--Open country options section-->
+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation"/>
+
+        <!--Select top destinations country-->
+        <actionGroup ref="SelectTopDestinationsCountry" stepKey="selectTopDestinationsCountry">
+            <argument name="countries" value="Countries"/>
+        </actionGroup>
+
+        <!--Go to product page-->
+        <amOnPage url="{{StorefrontProductPage.url($$simpleProduct.name$$)}}" stepKey="amOnStorefrontProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+
+        <!--Add product to cart-->
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToCart">
+            <argument name="productName" value="$$simpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to shopping cart-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart"/>
+
+        <!--Verify country options in checkout top destination section-->
+        <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry">
+            <argument name="country" value="Bahamas"/>
+            <argument name="placeNumber" value="2"/>
+        </actionGroup>
+
+        <!--Go to configuration general page-->
+        <actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToConfigurationGeneralPage2"/>
+
+        <!--Open country options section-->
+        <conditionalClick selector="{{CountryOptionsSection.countryOptions}}" dependentSelector="{{CountryOptionsSection.countryOptionsOpen}}" visible="false" stepKey="clickOnStoreInformation2"/>
+
+        <!--Deselect top destinations country-->
+        <actionGroup ref="UnSelectTopDestinationsCountry" stepKey="unSelectTopDestinationsCountry">
+            <argument name="countries" value="Countries"/>
+        </actionGroup>
+
+        <!--Go to shopping cart-->
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="amOnPageShoppingCart2"/>
+
+        <!--Verify country options is shown by default-->
+        <actionGroup ref="VerifyTopDestinationsCountry" stepKey="verifyTopDestinationsCountry2">
+            <argument name="country" value="Afghanistan"/>
+            <argument name="placeNumber" value="2"/>
+        </actionGroup>
+
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
index 9664ec47420cc..89028e146c358 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="IdentityOfDefaultBillingAndShippingAddressTest">
         <annotations>
             <features value="Customer"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
index 454f9f5f29a7a..c303e4d19db81 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdvanceCatalogSearchConfigurableTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdvanceCatalogSearchConfigurableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
             <features value="ConfigurableProduct"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
index 88dcca0958719..a7acdfded29b6 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultVideoDownloadableProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultVideoDownloadableProductTest" extends="AdminAddDefaultVideoSimpleProductTest">
         <annotations>
             <features value="Downloadable"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
index af5d20b075d12..66177b6875dd9 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdvanceCatalogSearchDownloadableProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdvanceCatalogSearchDownloadableByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
             <features value="Downloadable"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml
index 8634fc3f6f9dc..c3a95bbef3aa3 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultVideoGroupedProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultVideoGroupedProductTest"  extends="AdminAddDefaultVideoSimpleProductTest">
         <annotations>
             <features value="GroupedProduct"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml
index 25c45abdfe047..e322d4a1eb038 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultVideoGroupedProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultVideoGroupedProductTest" extends="AdminRemoveDefaultVideoSimpleProductTest">
         <annotations>
             <features value="GroupedProduct"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
index 0fd52ac4a65a4..2a600d38250f8 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdvanceCatalogSearchGroupedProductByNameTest" extends="AdvanceCatalogSearchSimpleProductByNameTest">
         <annotations>
             <features value="GroupedProduct"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
index faed8b1af952e..0ef4f69f565a8 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="VerifySubscribedNewsletterDisplayedTest">
         <annotations>
             <features value="Newsletter"/>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
index bd7cc0cdf5b4a..2b5f87f78d5e5 100644
--- a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddDefaultVideoSimpleProductTest">
         <annotations>
             <group value="ProductVideo"/>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
index f5a7886fed45c..d4da0ffa54451 100644
--- a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveDefaultVideoSimpleProductTest">
         <annotations>
             <group value="ProductVideo"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
index f15f5de5df696..93124ac0ffd89 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateOrderWithBundleProductTest">
         <annotations>
             <title value="Create Order in Admin and update bundle product configuration"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
index 041252af0ac5b..74784ed495f8a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminSubmitConfigurableProductOrderTest">
         <annotations>
             <title value="Create Order in Admin and update product configuration"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml
index 9790b5dfc47f3..ad3a411d92414 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontRedirectToOrderHistory.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontRedirectToOrderHistory">
         <annotations>
             <features value="Redirection Rules"/>
diff --git a/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
index 2e3467fe2c7c5..4f00f72720ef4 100644
--- a/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
+++ b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
@@ -6,7 +6,7 @@
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveProductWeeeAttributeOptionTest">
         <annotations>
             <features value="Weee attribute options can be removed in product page"/>
@@ -44,6 +44,7 @@
             <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
         </after>
+
         <!--  Test Steps  -->
         <!--  Step 1: Open created product edit page  -->
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
index 9f11de49adcd4..84b605747d08b 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
@@ -1,59 +1,59 @@
-<?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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <test name="StorefrontUpdateWishlistTest">
-        <annotations>
-            <title value="Displaying of message after Wish List update"/>
-            <stories value="MAGETWO-91666: Wishlist update does not return a success message"/>
-            <description value="Displaying of message after Wish List update"/>
-            <features value="Wishlist"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-94296"/>
-            <group value="Wishlist"/>
-        </annotations>
-
-        <before>
-            <createData entity="SimpleSubCategory" stepKey="category"/>
-            <createData entity="SimpleProduct" stepKey="product">
-                <requiredEntity createDataKey="category"/>
-            </createData>
-            <createData entity="Simple_US_Customer" stepKey="customer"/>
-        </before>
-
-        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-            <argument name="Customer" value="$$customer$$"/>
-        </actionGroup>
-
-        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory">
-            <argument name="category" value="$$category$$"/>
-            <argument name="product" value="$$product$$"/>
-        </actionGroup>
-
-        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
-            <argument name="productVar" value="$$product$$"/>
-        </actionGroup>
-
-        <actionGroup ref="StorefrontCustomerCheckProductInWishlist" stepKey="checkProductInWishlist">
-            <argument name="productVar" value="$$product$$"/>
-        </actionGroup>
-
-        <actionGroup ref="StorefrontCustomerEditProductInWishlist" stepKey="updateProductInWishlist">
-            <argument name="product" value="$$product$$"/>
-            <argument name="description" value="some text"/>
-            <argument name="quantity" value="2"/>
-        </actionGroup>
-
-        <after>
-            <deleteData createDataKey="category" stepKey="deleteCategory"/>
-            <deleteData createDataKey="product" stepKey="deleteProduct"/>
-            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
-        </after>
-
-    </test>
-</tests>
\ No newline at end of file
+<?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="StorefrontUpdateWishlistTest">
+        <annotations>
+            <title value="Displaying of message after Wish List update"/>
+            <stories value="MAGETWO-91666: Wishlist update does not return a success message"/>
+            <description value="Displaying of message after Wish List update"/>
+            <features value="Wishlist"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94296"/>
+            <group value="Wishlist"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <createData entity="SimpleProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+        </before>
+
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+
+        <actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory">
+            <argument name="category" value="$$category$$"/>
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
+            <argument name="productVar" value="$$product$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCustomerCheckProductInWishlist" stepKey="checkProductInWishlist">
+            <argument name="productVar" value="$$product$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCustomerEditProductInWishlist" stepKey="updateProductInWishlist">
+            <argument name="product" value="$$product$$"/>
+            <argument name="description" value="some text"/>
+            <argument name="quantity" value="2"/>
+        </actionGroup>
+
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+        </after>
+
+    </test>
+</tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
index f5cd41bda74d7..404bebfb719dc 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="EndToEndB2CGuestUserTest">
         <!-- Search configurable product -->
         <comment userInput="Search configurable product" stepKey="commentSearchConfigurableProduct" after="searchAssertSimpleProduct2ImageNotDefault" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
index 3e386a034eecc..9fe70c8b4dd3b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CLoggedInUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="EndToEndB2CLoggedInUserTest">
         <!-- Search configurable product -->
         <comment userInput="Search configurable product" stepKey="commentSearchConfigurableProduct" after="searchAssertSimpleProduct2ImageNotDefault" />
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
index d3b009eecf877..cb3d9edbc1cbb 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductWishlist/Test/EndToEndB2CLoggedInUserTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="EndToEndB2CLoggedInUserTest">
         <!-- Step 5: Add products to wishlist -->
         <!-- Add Configurable Product to wishlist -->

From a86cd1b05b8d2c1c608fdb2b49665f5491ba9226 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Mon, 14 Jan 2019 09:56:09 -0600
Subject: [PATCH 626/932] MC-10838: [Frontend]Process PayPal errors

- make sure errors are displaying correctly
---
 .../web/js/in-context/express-checkout-smart-buttons.js    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 9ebb5af0e9305..c3538bc937dfc 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -113,6 +113,9 @@ define([
                                         if (res.success) {
                                             return resolve(res.token);
                                         } else {
+                                            messageList.addErrorMessage({
+                                                message: res.error_message
+                                            });
                                             return reject(new Error(res.error_message));
                                         }
                                     })
@@ -125,6 +128,9 @@ define([
                                 } catch (exception) {
                                     error = $t('Something went wrong with your request. Please try again later.');
                                 }
+                                messageList.addErrorMessage({
+                                    message: error
+                                });
                                 return reject(new Error(error));
                             }
                         );
@@ -196,6 +202,7 @@ define([
              * @param {Object} err
              */
             onError: function (err) {
+                // Uncaught error isn't displayed in the console
             }
         }, element);
     };

From 8736ad32b81afe6ec531f9c83de89b404484658f Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Mon, 14 Jan 2019 10:18:29 -0600
Subject: [PATCH 627/932] MC-6281: [Backend]: Create Controller to getToken
 from PayPal

- change startUrl to getTokenUrl
---
 .../web/js/in-context/express-checkout-smart-buttons.js      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index c3538bc937dfc..2451783817617 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -136,7 +136,7 @@ define([
                         );
                     });
                 } else {
-                    return paypal.request.post(clientConfig.startUrl, params)
+                    return paypal.request.post(clientConfig.getTokenUrl, params)
                         .then(function (res) {
                             if (res.success) {
                                 //add logic to process negative cases
@@ -147,9 +147,6 @@ define([
                                     message: res.error_message
                                 });
                             }
-                        })
-                        .catch(function (err) {
-                            throw err;
                         });
                 }
             },

From c6c3a25ec2e5a1ab99117f65bb9a977f924a2bcf Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Mon, 14 Jan 2019 10:46:52 -0600
Subject: [PATCH 628/932] MC-11005 - Create functions for DHL message timestamp
 and reference

Changed visibility on constants to private
---
 app/code/Magento/Dhl/Model/Carrier.php               |  6 +++---
 app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 9bbe0f2beed9a..e765b33bfdba1 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -59,9 +59,9 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
     /**
      * DHL service prefixes used for message reference
      */
-    const SERVICE_PREFIX_QUOTE = 'QUOT';
-    const SERVICE_PREFIX_SHIPVAL = 'SHIP';
-    const SERVICE_PREFIX_TRACKING = 'TRCK';
+    private const SERVICE_PREFIX_QUOTE = 'QUOT';
+    private const SERVICE_PREFIX_SHIPVAL = 'SHIP';
+    private const SERVICE_PREFIX_TRACKING = 'TRCK';
 
     /**
      * Rate request data
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index e90f22e2a150d..311dfe2eac736 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -549,15 +549,19 @@ public function testBuildMessageReference()
         $method = new \ReflectionMethod($this->model, 'buildMessageReference');
         $method->setAccessible(true);
 
-        $msgRefQuote = $method->invoke($this->model, Carrier::SERVICE_PREFIX_QUOTE);
+        $constPrefixQuote = new \ReflectionClassConstant($this->model, 'SERVICE_PREFIX_QUOTE');
+        $constPrefixShipval = new \ReflectionClassConstant($this->model, 'SERVICE_PREFIX_SHIPVAL');
+        $constPrefixTracking = new \ReflectionClassConstant($this->model, 'SERVICE_PREFIX_TRACKING');
+
+        $msgRefQuote = $method->invoke($this->model, $constPrefixQuote->getValue());
         self::assertGreaterThanOrEqual(28, strlen($msgRefQuote));
         self::assertLessThanOrEqual(32, strlen($msgRefQuote));
 
-        $msgRefShip = $method->invoke($this->model, Carrier::SERVICE_PREFIX_SHIPVAL);
+        $msgRefShip = $method->invoke($this->model, $constPrefixShipval->getValue());
         self::assertGreaterThanOrEqual(28, strlen($msgRefShip));
         self::assertLessThanOrEqual(32, strlen($msgRefShip));
 
-        $msgRefTrack = $method->invoke($this->model, Carrier::SERVICE_PREFIX_TRACKING);
+        $msgRefTrack = $method->invoke($this->model, $constPrefixTracking->getValue());
         self::assertGreaterThanOrEqual(28, strlen($msgRefTrack));
         self::assertLessThanOrEqual(32, strlen($msgRefTrack));
 

From 6d058a360315217b372e5b2da19ca1c45721df4f Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@ip-192-168-0-5.ec2.internal>
Date: Mon, 14 Jan 2019 12:31:51 -0600
Subject: [PATCH 629/932] MC-5593: [Modularity] Braintree module MFTF contain
 wide used sections and action groups - updated element location to use

---
 .../Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
index 596b72070bf7e..3986ede9acf63 100644
--- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxActionGroup.xml
@@ -128,12 +128,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1" time="5"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />
@@ -156,12 +156,12 @@
         <!--Select Configuration menu from Store-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES" />
         <waitForPageLoad stepKey="waitForConfiguration"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations"/>
         <waitForPageLoad stepKey="waitForSales"/>
         <!--Double click the same to fix flaky issue with redirection to Dashboard-->
         <click selector="{{AdminMenuSection.stores}}" stepKey="clickOnSTORES1" />
         <waitForPageLoad stepKey="waitForConfiguration1"/>
-        <click selector="{{StoresSubmenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
+        <click selector="{{AdminMenuSection.configuration}}" stepKey="clickOnConfigurations1"/>
         <waitForPageLoad stepKey="waitForSales1"/>
         <!--Change default tax class for Shipping on Taxable Goods-->
         <click selector="{{ConfigurationListSection.sales}}" stepKey="clickOnSales" />

From 868b19fe974097063159e5a2e32fe551fa74eb80 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Mon, 14 Jan 2019 12:38:28 -0600
Subject: [PATCH 630/932] MAGETWO-97411:
 \Magento\Customer\Model\Customer::getDataModel method takes to much time to
 load with many addresses customer

---
 app/code/Magento/Customer/Model/Address.php   |  6 +-
 app/code/Magento/Customer/Model/Customer.php  |  6 +-
 .../Customer/Test/Unit/Model/CustomerTest.php | 88 +++++++++++++++++--
 .../Magento/Customer/Model/AddressTest.php    | 24 +++++
 .../Customer/_files/customer_sample.php       |  1 +
 5 files changed, 112 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 236c47aa1cc38..e9aa2839095d5 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -172,9 +172,9 @@ public function updateData(AddressInterface $address)
     public function getDataModel($defaultBillingAddressId = null, $defaultShippingAddressId = null)
     {
         if ($this->getCustomerId() || $this->getParentId()) {
-            $primaryAddresses = $this->getCustomer()->getPrimaryAddressIds();
-            $defaultBillingAddressId = $primaryAddresses['billing_address'] ?: $defaultBillingAddressId;
-            $defaultShippingAddressId = $primaryAddresses['shipping_address'] ?: $defaultShippingAddressId;
+            $customer = $this->getCustomer();
+            $defaultBillingAddressId = $customer->getDefaultBilling() ?: $defaultBillingAddressId;
+            $defaultShippingAddressId = $customer->getDefaultShipping() ?: $defaultShippingAddressId;
         }
         return parent::getDataModel($defaultBillingAddressId, $defaultShippingAddressId);
     }
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index fe55243130319..d3453efc9ffb0 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -220,6 +220,8 @@ class Customer extends \Magento\Framework\Model\AbstractModel
     private $accountConfirmation;
 
     /**
+     * Caching property to store customer addresses by the customer ID.
+     *
      * @var array
      */
     private $storedAddress;
@@ -684,10 +686,10 @@ public function getPrimaryAddressIds()
     {
         $ids = [];
         if ($this->getDefaultBilling()) {
-            $ids['billing_address'] = $this->getDefaultBilling();
+            $ids[] = $this->getDefaultBilling();
         }
         if ($this->getDefaultShipping()) {
-            $ids['shipping_address'] = $this->getDefaultShipping();
+            $ids[] = $this->getDefaultShipping();
         }
         return $ids;
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
index cb396e32509b7..90e55a6cf622b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
@@ -13,6 +13,8 @@
 
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\AccountConfirmation;
+use Magento\Customer\Model\ResourceModel\Address\CollectionFactory as AddressCollectionFactory;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -68,6 +70,21 @@ class CustomerTest extends \PHPUnit\Framework\TestCase
      */
     private $accountConfirmation;
 
+    /**
+     * @var AddressCollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressesFactory;
+
+    /**
+     * @var CustomerInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerDataFactory;
+
+    /**
+     * @var \Magento\Framework\Api\DataObjectHelper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dataObjectHelper;
+
     protected function setUp()
     {
         $this->_website = $this->createMock(\Magento\Store\Model\Website::class);
@@ -100,6 +117,19 @@ protected function setUp()
         $this->_encryptor = $this->createMock(\Magento\Framework\Encryption\EncryptorInterface::class);
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->accountConfirmation = $this->createMock(AccountConfirmation::class);
+        $this->addressesFactory = $this->getMockBuilder(AddressCollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->customerDataFactory = $this->getMockBuilder(CustomerInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->dataObjectHelper = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['populateWithArray'])
+            ->getMock();
+
         $this->_model = $helper->getObject(
             \Magento\Customer\Model\Customer::class,
             [
@@ -112,7 +142,10 @@ protected function setUp()
                 'registry' => $this->registryMock,
                 'resource' => $this->resourceMock,
                 'dataObjectProcessor' => $this->dataObjectProcessor,
-                'accountConfirmation' => $this->accountConfirmation
+                'accountConfirmation' => $this->accountConfirmation,
+                '_addressesFactory' => $this->addressesFactory,
+                'customerDataFactory' => $this->customerDataFactory,
+                'dataObjectHelper' => $this->dataObjectHelper
             ]
         );
     }
@@ -186,13 +219,13 @@ public function testSendNewAccountEmailWithoutStoreId()
             ->will($this->returnValue($transportMock));
 
         $this->_model->setData([
-                'website_id' => 1,
-                'store_id'   => 1,
-                'email'      => 'email@example.com',
-                'firstname'  => 'FirstName',
-                'lastname'   => 'LastName',
-                'middlename' => 'MiddleName',
-                'prefix'     => 'Name Prefix',
+            'website_id' => 1,
+            'store_id' => 1,
+            'email' => 'email@example.com',
+            'firstname' => 'FirstName',
+            'lastname' => 'LastName',
+            'middlename' => 'MiddleName',
+            'prefix' => 'Name Prefix',
         ]);
         $this->_model->sendNewAccountEmail('registered');
     }
@@ -310,4 +343,43 @@ public function testUpdateData()
 
         $this->assertEquals($this->_model->getData(), $expectedResult);
     }
+
+    /**
+     * Test for the \Magento\Customer\Model\Customer::getDataModel() method
+     */
+    public function testGetDataModel()
+    {
+        $customerId = 1;
+        $this->_model->setEntityId($customerId);
+        $this->_model->setId($customerId);
+        $addressDataModel = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\AddressInterface::class);
+        $address = $this->getMockBuilder(\Magento\Customer\Model\Address::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setCustomer', 'getDataModel'])
+            ->getMock();
+        $address->expects($this->atLeastOnce())->method('getDataModel')->willReturn($addressDataModel);
+        $addresses = new \ArrayIterator([$address, $address]);
+        $addressCollection = $this->getMockBuilder(\Magento\Customer\Model\ResourceModel\Address\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setCustomerFilter', 'addAttributeToSelect', 'getIterator', 'getItems'])
+            ->getMock();
+        $addressCollection->expects($this->atLeastOnce())->method('setCustomerFilter')->willReturnSelf();
+        $addressCollection->expects($this->atLeastOnce())->method('addAttributeToSelect')->willReturnSelf();
+        $addressCollection->expects($this->atLeastOnce())->method('getIterator')
+            ->willReturn($addresses);
+        $addressCollection->expects($this->atLeastOnce())->method('getItems')
+            ->willReturn($addresses);
+        $this->addressesFactory->expects($this->atLeastOnce())->method('create')->willReturn($addressCollection);
+        $customerDataObject = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $this->customerDataFactory->expects($this->atLeastOnce())->method('create')->willReturn($customerDataObject);
+        $this->dataObjectHelper->expects($this->atLeastOnce())->method('populateWithArray')
+            ->with($customerDataObject, $this->_model->getData(), \Magento\Customer\Api\Data\CustomerInterface::class)
+            ->willReturnSelf();
+        $customerDataObject->expects($this->atLeastOnce())->method('setAddresses')
+            ->with([$addressDataModel, $addressDataModel])
+            ->willReturnSelf();
+        $customerDataObject->expects($this->atLeastOnce())->method('setId')->with($customerId)->willReturnSelf();
+        $this->_model->getDataModel();
+        $this->assertEquals($customerDataObject, $this->_model->getDataModel());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AddressTest.php
index 017532fb392b5..b6e8cba82adae 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AddressTest.php
@@ -67,4 +67,28 @@ public function testUpdateDataOverrideExistingData()
         $this->assertEquals('CompanyZ', $updatedAddressData->getCompany());
         $this->assertEquals('99999', $updatedAddressData->getPostcode());
     }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_sample.php
+     */
+    public function testUpdateDataForExistingCustomer()
+    {
+        /** @var \Magento\Customer\Model\CustomerRegistry $customerRegistry */
+        $customerRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(CustomerRegistry::class);
+        /** @var \Magento\Customer\Model\Data\Address $addressData */
+        $updatedAddressData = $this->addressFactory->create()
+            ->setId(1)
+            ->setCustomerId($customerRegistry->retrieveByEmail('customer@example.com')->getId())
+            ->setCity('CityZ')
+            ->setCompany('CompanyZ')
+            ->setPostcode('99999');
+        $updatedAddressData = $this->addressModel->updateData($updatedAddressData)->getDataModel();
+
+        $this->assertEquals(1, $updatedAddressData->getId());
+        $this->assertEquals('CityZ', $updatedAddressData->getCity());
+        $this->assertEquals('CompanyZ', $updatedAddressData->getCompany());
+        $this->assertEquals('99999', $updatedAddressData->getPostcode());
+        $this->assertEquals(true, $updatedAddressData->isDefaultBilling());
+        $this->assertEquals(true, $updatedAddressData->isDefaultShipping());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_sample.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_sample.php
index e12eec293f2ad..1af6489870559 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_sample.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_sample.php
@@ -19,6 +19,7 @@
     'lastname' => 'test lastname',
     'email' => 'customer@example.com',
     'default_billing' => 1,
+    'default_shipping' => 1,
     'password' => '123123q',
     'attribute_set_id' => 1,
 ];

From bb8cb9ab0c2cddce3b3f38aa64ed2ad6c738491d Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Mon, 14 Jan 2019 12:39:31 -0600
Subject: [PATCH 631/932] MC-4396: Convert MassProductUpdateTest to MFTF

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  2 +-
 .../Mftf/Section/AdminProductGridSection.xml  |  1 +
 .../Test/AdminMassProductPriceUpdateTest.xml  | 67 +++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 23253ad6ad8f8..c1eb36b4213a8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -481,7 +481,7 @@
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="defaultSimpleProduct" type="product">
-        <data key="name" unique="suffix">Test </data>
+        <data key="name" unique="suffix">Testp</data>
         <data key="sku" unique="suffix">testsku</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index fe87c81ad6ac8..30d1088303214 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -9,6 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductGridSection">
         <element name="productRowBySku" type="block" selector="//div[@id='container']//tr//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
+        <element name="productRowCheckboxBySku" type="block" selector="//div[@id='container']//tr//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]/../td//input[@data-action='select-row']" parameterized="true" />
         <element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
new file mode 100644
index 0000000000000..ea71f2656b922
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -0,0 +1,67 @@
+<?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="AdminMassProductPriceUpdateTest">
+        <annotations>
+            <stories value="Mass product update "/>
+            <features value="Catalog"/>
+            <title value="Mass update simple product price"/>
+            <description value="Login as admin and update mass product price"/>
+            <testCaseId value="MC-8510"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct1"/>
+            <createData entity="defaultSimpleProduct" stepKey="simpleProduct2"/>
+        </before>
+        <after>
+            <deleteData  createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData  createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Open Product Index Page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <!--Search products using keyword -->
+        <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
+            <argument name="keyword" value="Testp"/>
+        </actionGroup>
+        <!--Sort Products by ID in descending order-->
+        <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
+        <!--Select products-->
+        <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct1.sku$$)}}" stepKey="selectFirstProduct"/>
+        <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct2.sku$$)}}" stepKey="selectSecondProduct"/>
+        <!-- Update product price-->
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickChangeStatus"/>
+        <waitForPageLoad stepKey="waitForProductAttributePageToLoad"/>
+        <scrollTo stepKey="scrollToPriceCheckBox" selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}"  x="0" y="-160"/>
+        <click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="selectPriceCheckBox"/>
+        <fillField stepKey="fillPrice" selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="90.99"/>
+        <click stepKey="clickOnSaveButton" selector="{{AdminEditProductAttributesSection.Save}}"/>
+        <waitForPageLoad stepKey="waitForUpdatedProductToSave" />
+        <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
+        <!--Verify product name, sku and updated price-->
+        <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct1.sku$$)}}"/>
+        <waitForPageLoad stepKey="waitForFirstProductToLoad"/>
+        <seeInField stepKey="seeFirstProductNameInField" selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct1.name$$"/>
+        <seeInField stepKey="seeFirstProductSkuInField" selector="{{AdminProductFormSection.productSku}}" userInput="$$simpleProduct1.sku$$"/>
+        <seeInField stepKey="seeFirstProductPriceInField" selector="{{AdminProductFormSection.productPrice}}" userInput="90.99"/>
+        <click stepKey="clickOnBackButton" selector="{{AdminGridMainControls.back}}"/>
+        <waitForPageLoad stepKey="waitForProductsToLoad"/>
+        <click stepKey="openSecondProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct2.sku$$)}}"/>
+        <waitForPageLoad stepKey="waitForSecondProductToLoad"/>
+        <seeInField stepKey="seeSecondProductNameInField" selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct2.name$$"/>
+        <seeInField stepKey="seeSecondProductSkuInField" selector="{{AdminProductFormSection.productSku}}" userInput="$$simpleProduct2.sku$$"/>
+        <seeInField stepKey="seeSecondProductPriceInField" selector="{{AdminProductFormSection.productPrice}}" userInput="90.99"/>
+    </test>
+</tests>

From 80061a668e3107aa8d5713d4819e824d92bff93d Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Mon, 14 Jan 2019 14:19:24 -0600
Subject: [PATCH 632/932] MC-6296 - Update DCTRequest

Updated productMetadata variable visibility to private
Updated building of quote request to use new messageTimestamp and messageReference function
---
 app/code/Magento/Dhl/Model/Carrier.php        | 23 +++++---
 .../Dhl/Test/Unit/Model/CarrierTest.php       | 52 +++++++++++--------
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 7a493460e0352..bd129eb6111a5 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -16,6 +16,7 @@
 use Magento\Shipping\Model\Rate\Result;
 use Magento\Framework\Xml\Security;
 use Magento\Dhl\Model\Validator\XmlValidator;
+use Magento\Framework\App\ProductMetadataInterface;
 
 /**
  * DHL International (API v1.4)
@@ -206,7 +207,10 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
         'SiteID', 'Password'
     ];
 
-    protected $productMetadata;
+    /**
+     * @var \Magento\Framework\App\ProductMetadataInterface
+     */
+    private $productMetadata;
 
     /**
      * Xml response validator
@@ -242,6 +246,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
      * @param array $data
      * @param \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator
+     * @param \Magento\Framework\App\ProductMetadataInterface $productMetadata
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -271,7 +276,7 @@ public function __construct(
         \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
         array $data = [],
         \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator = null,
-        \Magento\Framework\App\ProductMetadataInterface $productMetadata
+        \Magento\Framework\App\ProductMetadataInterface $productMetadata = null
     ) {
         $this->readFactory = $readFactory;
         $this->_carrierHelper = $carrierHelper;
@@ -282,7 +287,6 @@ public function __construct(
         $this->mathDivision = $mathDivision;
         $this->_dateTime = $dateTime;
         $this->_httpClientFactory = $httpClientFactory;
-        $this->productMetadata = $productMetadata;
         parent::__construct(
             $scopeConfig,
             $rateErrorFactory,
@@ -304,8 +308,10 @@ public function __construct(
         if ($this->getConfigData('content_type') == self::DHL_CONTENT_TYPE_DOC) {
             $this->_freeMethod = 'free_method_doc';
         }
-        $this->xmlValidator = $xmlValidator
-            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(XmlValidator::class);
+
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $this->xmlValidator = $xmlValidator ?: $objectManager->get(XmlValidator::class);
+        $this->productMetadata = $productMetadata ?: $objectManager->get(ProductMetadataInterface::class);
     }
 
     /**
@@ -1007,8 +1013,11 @@ protected function _buildQuotesRequestXml()
         $nodeRequest = $nodeGetQuote->addChild('Request');
 
         $nodeServiceHeader = $nodeRequest->addChild('ServiceHeader');
-        $nodeServiceHeader->addChild('MessageTime', date('Y-m-d\TH:i:sP'));
-        $nodeServiceHeader->addChild('MessageReference', uniqid('magento_quotereq_'));
+        $nodeServiceHeader->addChild('MessageTime', $this->buildMessageTimestamp());
+        $nodeServiceHeader->addChild(
+            'MessageReference',
+            $this->buildMessageReference(self::SERVICE_PREFIX_QUOTE)
+        );
         $nodeServiceHeader->addChild('SiteID', (string) $this->getConfigData('id'));
         $nodeServiceHeader->addChild('Password', (string) $this->getConfigData('password'));
 
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 35d998b1108df..785ddb854fe7a 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -117,15 +117,6 @@ protected function setUp()
 
         $this->scope = $this->getMockForAbstractClass(ScopeConfigInterface::class);
 
-        $xmlElFactory = $this->getXmlFactory();
-        $rateFactory = $this->getRateFactory();
-        $rateMethodFactory = $this->getRateMethodFactory();
-        $httpClientFactory = $this->getHttpClientFactory();
-        $configReader = $this->getConfigReader();
-        $readFactory = $this->getReadFactory();
-        $storeManager = $this->getStoreManager();
-        $productMetadata = $this->getProductMetadata();
-
         $this->error = $this->getMockBuilder(Error::class)
             ->setMethods(['setCarrier', 'setCarrierTitle', 'setErrorMessage'])
             ->getMock();
@@ -136,8 +127,6 @@ protected function setUp()
         $this->errorFactory->method('create')
             ->willReturn($this->error);
 
-        $carrierHelper = $this->getCarrierHelper();
-
         $this->xmlValidator = $this->getMockBuilder(XmlValidator::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -148,20 +137,21 @@ protected function setUp()
             Carrier::class,
             [
                 'scopeConfig' => $this->scope,
-                'xmlSecurity' => new Security(),
-                'logger' => $this->logger,
-                'xmlElFactory' => $xmlElFactory,
-                'rateFactory' => $rateFactory,
                 'rateErrorFactory' => $this->errorFactory,
-                'rateMethodFactory' => $rateMethodFactory,
-                'httpClientFactory' => $httpClientFactory,
-                'readFactory' => $readFactory,
-                'storeManager' => $storeManager,
-                'configReader' => $configReader,
-                'carrierHelper' => $carrierHelper,
+                'logger' => $this->logger,
+                'xmlSecurity' => new Security(),
+                'xmlElFactory' => $this->getXmlFactory(),
+                'rateFactory' => $this->getRateFactory(),
+                'rateMethodFactory' => $this->getRateMethodFactory(),
+                'carrierHelper' => $this->getCarrierHelper(),
+                'coreDate' => $this->getCoreDate(),
+                'configReader' => $this->getConfigReader(),
+                'storeManager' => $this->getStoreManager(),
+                'readFactory' => $this->getReadFactory(),
+                'httpClientFactory' => $this->getHttpClientFactory(),
                 'data' => ['id' => 'dhl', 'store' => '1'],
                 'xmlValidator' => $this->xmlValidator,
-                'productMetadata' => $productMetadata
+                'productMetadata' => $this->getProductMetadata()
             ]
         );
     }
@@ -721,6 +711,21 @@ private function getCarrierHelper(): CarrierHelper
         return $carrierHelper;
     }
 
+    /**
+     * @return MockObject
+     */
+    private function getCoreDate(): MockObject
+    {
+        $coreDate = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTime::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $coreDate->method('date')->willReturnCallback(function () {
+            return date(\DATE_RFC3339);
+        });
+
+        return $coreDate;
+    }
+
     /**
      * @return MockObject
      */
@@ -744,6 +749,9 @@ private function getHttpClientFactory(): MockObject
         return $httpClientFactory;
     }
 
+    /**
+     * @return MockObject
+     */
     private function getProductMetadata(): MockObject
     {
         $productMetadata = $this->createMock(\Magento\Framework\App\ProductMetadata::class);

From f51b5b14e46b9e1a7812dd9e5733509aaaf0d3fc Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Mon, 14 Jan 2019 14:13:00 -0600
Subject: [PATCH 633/932] MC-11006: Build stabilization

---
 .../Controller/Express/GetTokenData.php       |   6 +-
 .../Controller/Express/OnAuthorization.php    |  15 +--
 .../Paypal/Model/ExpressConfigProvider.php    |   5 +-
 .../Patch/Data/UpdatePaypalCreditOption.php   |  11 +-
 .../express-checkout-smart-buttons.js         |   6 +-
 .../in-context/checkout-express.js            |  53 +++++----
 .../in-context/checkout-express.test.js       | 101 ++++--------------
 7 files changed, 72 insertions(+), 125 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
index e279faafc29f6..cc64773cd1702 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -15,6 +14,9 @@
 use Magento\Paypal\Model\Express\Checkout;
 use Magento\Paypal\Model\Config;
 
+/**
+ * Retrieve paypal token
+ */
 class GetTokenData extends AbstractExpress implements HttpGetActionInterface
 {
     /**
@@ -185,4 +187,4 @@ private function getToken(): ?string
             $hasButton
         );
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index e5acdaef5e1cc..1f4b35af40f6e 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -10,9 +10,10 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 
-class OnAuthorization
-    extends AbstractExpress
-    implements HttpPostActionInterface
+/**
+ * Processes data after returning from PayPal
+ */
+class OnAuthorization extends AbstractExpress implements HttpPostActionInterface
 {
     /**
      * Config mode type
@@ -53,6 +54,7 @@ class OnAuthorization
     private $guestCartRepository;
 
     /**
+     * OnAuthorization constructor.
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
@@ -62,7 +64,9 @@ class OnAuthorization
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
-     * @param \Magento\Sales\Api\PaymentFailuresInterface|null $paymentFailures
+     * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
+     * @param \Magento\Framework\UrlInterface $urlBuilder
+     * @param \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -139,16 +143,13 @@ public function execute()
                     ]
                 );
                 $responseContent['redirectUrl'] = $this->urlBuilder->getUrl('checkout/onepage/success/');
-
             } else {
                 $responseContent['redirectUrl'] = $this->urlBuilder->getUrl('paypal/express/review');
                 $this->_checkoutSession->setQuoteId($quote->getId());
-
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $responseContent['success'] = false;
             $responseContent['error_message'] = $e->getMessage();
-
         } catch (\Exception $e) {
             $responseContent['success'] = false;
             $responseContent['error_message'] = __('We can\'t process Express Checkout approval.');
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 3e90a3fcd273b..1c556e541c3c7 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -96,7 +96,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig()
     {
@@ -152,6 +152,8 @@ public function getConfig()
     }
 
     /**
+     * Return setting value for in context checkout
+     *
      * @return bool
      */
     protected function isInContextCheckout()
@@ -255,7 +257,6 @@ private function updateStyles($styles, $locale) : array
      * Returns disallowed funding from configuration
      *
      * @return array
-     *
      */
     private function getDisallowedFunding() : array
     {
diff --git a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
index 977623c4d9b38..ce7e59bbd8e5e 100644
--- a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
+++ b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
@@ -11,10 +11,8 @@
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
-
 /**
  * Class AddPaypalOrderStates
- * @package Magento\Paypal\Setup\Patch
  */
 class UpdatePaypalCreditOption implements DataPatchInterface, PatchVersionInterface
 {
@@ -34,7 +32,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -58,14 +56,13 @@ public function apply()
                         'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CREDIT
                     ]
                 );
-
             }
         }
         $this->moduleDataSetup->getConnection()->endSetup();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -73,7 +70,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -81,7 +78,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 2451783817617..ea0548192fe4c 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -10,6 +10,7 @@ define([
     'domReady!'
 ], function ($, paypal, messageList, _) {
     'use strict';
+
     /**
      * Returns array of allowed funding
      *
@@ -42,7 +43,6 @@ define([
          */
         function isValid() {
             return clientConfig.validator.validate();
-
         }
 
         /**
@@ -63,7 +63,9 @@ define([
         paypal.Button.render({
 
             env: clientConfig.environment,
-            client: {[clientConfig.environment]:clientConfig.merchantId},
+            client: {
+                [clientConfig.environment]: clientConfig.merchantId
+            },
             locale: clientConfig.locale,
             funding: {
                 allowed: getFunding(clientConfig.allowedFunding),
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index 626c6cc0b3f29..993dcd433b325 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -25,9 +25,6 @@ define(
     ) {
         'use strict';
 
-        // State of PayPal module initialization
-        var clientInit = false;
-
         return Component.extend({
 
             defaults: {
@@ -38,18 +35,43 @@ define(
              * Render PayPal buttons using checkout.js
              */
             renderPayPalButtons: function () {
+                checkoutSmartButtons(this.prepareClientConfig(), '#' + this.getButtonId());
+            },
+
+            /**
+             * @returns {String}
+             */
+            getButtonId: function () {
+                return this.inContextId;
+            },
+
+            /**
+             * @returns {String}
+             */
+            getAgreementId: function () {
+                return this.inContextId + '-agreement';
+            },
+
+            /**
+             * Populate client config with all required data
+             *
+             * @return {Object}
+             */
+            prepareClientConfig: function () {
                 this.clientConfig.payment = {
                     'method': this.item.method
                 };
-                this.clientConfig.quoteId = window.checkoutConfig.quoteData.entity_id;
+                this.clientConfig.quoteId = window.checkoutConfig.quoteData['entity_id'];
                 this.clientConfig.formKey = window.checkoutConfig.formKey;
                 this.clientConfig.customerId = window.customerData.id;
                 this.clientConfig.button = 0;
                 this.clientConfig.merchantId = this.merchantId;
                 this.clientConfig.validator = additionalValidators;
-                    this.clientConfig.onClick = function () {
-                        additionalValidators.validate();
-                        this.selectPaymentMethod();
+
+                /** Add logic to be triggered onClick action for smart buttons component*/
+                this.clientConfig.onClick = function () {
+                    additionalValidators.validate();
+                    this.selectPaymentMethod();
                 };
                 this.clientConfig.additionalAction = setPaymentMethodAction;
                 this.clientConfig.rendererComponent = this;
@@ -59,22 +81,9 @@ define(
                         this.clientConfig[name] = fn.bind(this);
                     }
                 }, this);
-                checkoutSmartButtons(this.clientConfig, '#' + this.getButtonId());
-            },
 
-            /**
-             * @returns {String}
-             */
-            getButtonId: function () {
-                return this.inContextId;
-            },
-
-            /**
-             * @returns {String}
-             */
-            getAgreementId: function () {
-                return this.inContextId + '-agreement';
-            },
+                return this.clientConfig;
+            }
         });
     }
 );
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
index 395dd96822ea5..c2a20c8339c7c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Paypal/frontend/js/view/payment/method-renderer/in-context/checkout-express.test.js
@@ -25,17 +25,7 @@ define([
                 'Magento_Checkout/js/model/payment/additional-validators': {
                     validate: jasmine.createSpy().and.returnValue(true)
                 },
-                'Magento_Ui/js/model/messageList': {
-                    addErrorMessage: jasmine.createSpy(),
-                    addSuccessMessage: jasmine.createSpy()
-                },
-                'paypalInContextExpressCheckout': {
-                    checkout: {
-                        initXO: jasmine.createSpy(),
-                        closeFlow: jasmine.createSpy(),
-                        startFlow: jasmine.createSpy()
-                    }
-                },
+                'Magento_Paypal/js/in-context/express-checkout-smart-buttons': jasmine.createSpy(),
                 'Magento_Customer/js/customer-data': {
                     invalidate: jasmine.createSpy()
                 }
@@ -43,6 +33,15 @@ define([
             obj;
 
         beforeAll(function (done) {
+            window.checkoutConfig = {
+                quoteData: {
+                    entityId: 1
+                },
+                formKey: 'formKey'
+            };
+            window.customerData = {
+                id: 1
+            };
             injector.mock(mocks);
             injector.require(
                 ['Magento_Paypal/js/view/payment/method-renderer/in-context/checkout-express'],
@@ -51,9 +50,11 @@ define([
                         provider: 'provName',
                         name: 'test',
                         index: 'test',
-                        selectPaymentMethod: jasmine.createSpy()
+                        item: {
+                            method: 'payflow_express_bml'
+                        },
+                        clientConfig: {}
                     });
-
                     done();
                 });
         });
@@ -65,77 +66,11 @@ define([
             } catch (e) {}
         });
 
-        describe('"click" method checks', function () {
-            it('check success request', function () {
-                mocks['Magento_Paypal/js/action/set-payment-method'].and.callFake(function () {
-                    var promise = $.Deferred();
-
-                    promise.resolve();
-
-                    return promise;
-                });
-                spyOn(jQuery, 'get').and.callFake(function () {
-                    var promise = $.Deferred();
-
-                    promise.resolve({
-                        url: 'url'
-                    });
-
-                    return promise;
-                });
-
-                obj.clientConfig.click(new Event('event'));
-
-                expect(mocks.paypalInContextExpressCheckout.checkout.initXO).toHaveBeenCalled();
-                expect(mocks.paypalInContextExpressCheckout.checkout.startFlow).toHaveBeenCalledWith('url');
-                expect(mocks.paypalInContextExpressCheckout.checkout.closeFlow).not.toHaveBeenCalled();
-                expect(mocks['Magento_Customer/js/customer-data'].invalidate).toHaveBeenCalled();
-            });
-
-            it('check request with error message', function () {
-                mocks['Magento_Paypal/js/action/set-payment-method'].and.callFake(function () {
-                    var promise = $.Deferred();
-
-                    promise.resolve();
-
-                    return promise;
-                });
-                spyOn(jQuery, 'get').and.callFake(function () {
-                    var promise = $.Deferred();
-
-                    promise.resolve({
-                        message: {
-                            text: 'Text',
-                            type: 'error'
-                        }
-                    });
-
-                    return promise;
-                });
-
-                obj.clientConfig.click(new Event('event'));
-
-                expect(mocks['Magento_Ui/js/model/messageList'].addErrorMessage).toHaveBeenCalledWith({
-                    message: 'Text'
-                });
-                expect(mocks.paypalInContextExpressCheckout.checkout.initXO).toHaveBeenCalled();
-                expect(mocks.paypalInContextExpressCheckout.checkout.closeFlow).toHaveBeenCalled();
-                expect(mocks['Magento_Customer/js/customer-data'].invalidate).toHaveBeenCalled();
-            });
-
-            it('check on fail request', function () {
-                mocks['Magento_Paypal/js/action/set-payment-method'].and.callFake(function () {
-                    var promise = $.Deferred();
-
-                    promise.reject();
-
-                    return promise;
-                });
-                spyOn(jQuery, 'get');
-
-                obj.clientConfig.click(new Event('event'));
+        describe('check smart button initialization', function () {
+            it('express-checkout-smart-buttons is initialized', function () {
 
-                expect(jQuery.get).not.toHaveBeenCalled();
+                obj.renderPayPalButtons();
+                expect(mocks['Magento_Paypal/js/in-context/express-checkout-smart-buttons']).toHaveBeenCalled();
             });
         });
     });

From ca7aa0521e314fc78363e0a45619bb6a1a288f6e Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Mon, 14 Jan 2019 14:30:37 -0600
Subject: [PATCH 634/932] MAGETWO-97411:
 \Magento\Customer\Model\Customer::getDataModel method takes to much time to
 load with many addresses customer

---
 app/code/Magento/Customer/Model/Customer.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index d3453efc9ffb0..2defed1ef07b2 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -318,13 +318,15 @@ public function _construct()
     public function getDataModel()
     {
         $customerData = $this->getData();
-        if (!isset($this->storedAddress[$customerData['entity_id']])) {
+        if (isset($customerData['entity_id']) && !isset($this->storedAddress[$customerData['entity_id']])) {
             $addressesData = [];
             /** @var \Magento\Customer\Model\Address $address */
             foreach ($this->getAddresses() as $address) {
                 $addressesData[] = $address->getDataModel();
             }
             $this->storedAddress[$customerData['entity_id']] = $addressesData;
+        } elseif (isset($customerData['entity_id'], $this->storedAddress[$customerData['entity_id']])) {
+            $customerData = $this->storedAddress[$customerData['entity_id']];
         }
         $customerDataObject = $this->customerDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
@@ -332,7 +334,7 @@ public function getDataModel()
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
-        $customerDataObject->setAddresses($this->storedAddress[$customerData['entity_id']])
+        $customerDataObject->setAddresses($customerData)
             ->setId($this->getId());
         return $customerDataObject;
     }

From 84d0050458c54ff38bcbab45147759ab158b8136 Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Tue, 20 Nov 2018 13:35:48 +0400
Subject: [PATCH 635/932] MAGETWO-95802: Admin date wrong formatting for French
 locale

- Add automated test
---
 .../SetAdminAccountActionGroup.xml            | 24 +++++++++++++++++++
 .../Test/Mftf/Page/AdminSystemAccountPage.xml | 14 +++++++++++
 .../Section/AdminSystemAccountSection.xml     | 15 ++++++++++++
 .../Test/Mftf/Data/LocaleOptionsData.xml      | 24 +++++++++++++++++++
 .../Metadata/locale_options_config-meta.xml   | 21 ++++++++++++++++
 ...frontCustomerAccountInformationSection.xml | 19 +++++++++++++++
 6 files changed, 117 insertions(+)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml
new file mode 100644
index 0000000000000..9e5c0bb3f39bf
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/SetAdminAccountActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="SetAdminAccountActionGroup">
+        <arguments>
+            <argument name="InterfaceLocaleByValue" type="string"/>
+        </arguments>
+        <!-- Navigate to admin System Account Page-->
+        <amOnPage url="{{AdminSystemAccountPage.url}}" stepKey="openAdminSystemAccountPage" />
+        <waitForPageLoad stepKey="loadAdminSystemAccountPage"/>
+        <!-- Change Admin locale to Français (France) / French (France) -->
+        <selectOption userInput="{{InterfaceLocaleByValue}}" selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="setInterfaceLocate"/>
+        <fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
+        <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="clickSave"/>
+        <waitForElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="waitSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml
new file mode 100644
index 0000000000000..2f04c2c11d288
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminSystemAccountPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminSystemAccountPage" url="admin/system_account/index/" area="admin" module="Magento_Backend">
+        <section name="AdminSystemAccountSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml
new file mode 100644
index 0000000000000..b9570ce945943
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminSystemAccountSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminSystemAccountSection">
+        <element name="interfaceLocale" type="text" selector="#interface_locale"/>
+        <element name="currentPassword" type="text" selector="#current_password"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
new file mode 100644
index 0000000000000..5647283fae181
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="SetLocaleOptions" type="locale_options_config">
+        <requiredEntity type="code">setLocaleOptionsFrance</requiredEntity>
+    </entity>
+    <entity name="setLocaleOptionsFrance" type="code">
+        <data key="value">fr_FR</data>
+    </entity>
+
+    <entity name="DefaultLocaleOptions" type="locale_options_config">
+        <requiredEntity type="code">setLocaleOptionsUSA</requiredEntity>
+    </entity>
+    <entity name="setLocaleOptionsUSA" type="code">
+        <data key="value">en_US</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
new file mode 100644
index 0000000000000..055a9896cd2d2
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="GeneralLocaleOptionsConfig" dataType="locale_options_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/general/" method="POST">
+        <object key="groups" dataType="locale_options_config">
+            <object key="locale" dataType="locale_options_config">
+                <object key="fields" dataType="locale_options_config">
+                    <object key="code" dataType="code">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
new file mode 100644
index 0000000000000..59da4e9279a03
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAccountInformationSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCustomerAccountInformationSection">
+        <element name="firstName" type="input" selector="#firstname"/>
+        <element name="lastName" type="input" selector="#lastname"/>
+        <element name="changeEmail" type="checkbox" selector="#change_email"/>
+        <element name="changePassword" type="checkbox" selector="#change_password"/>
+        <element name="testAddedAttributeFiled" type="input" selector="//input[contains(@id,'{{var}}')]" parameterized="true"/>
+        <element name="saveButton" type="button" selector="#form-validate .action.save.primary"/>
+    </section>
+</sections>

From 905368ce2b036211d209ed18da5898aafbdd1667 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Mon, 14 Jan 2019 13:03:16 -0800
Subject: [PATCH 636/932] _navigation.less updated

_navigation.less updated
---
 .../frontend/Magento/blank/web/css/source/_navigation.less | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index 88d597ec0d0e7..10c7e3ed7eeea 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -131,15 +131,14 @@
                 );
             }
         }
-
         .switcher-dropdown {
             .lib-list-reset-styles();
             padding: @indent__s 0;
             display: none;
         }
-        .switcher-options{
-            &.active{
-                .switcher-dropdown{
+        .switcher-options {
+            &.active {
+                .switcher-dropdown {
                     display: block;
                 }
             }

From df3f8b06ebf3e410f5ecd38abfdc443377671ab1 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Mon, 14 Jan 2019 15:34:55 -0600
Subject: [PATCH 637/932] MC-10811:
 Magento\SalesRule\Test\TestCase\ApplySeveralSalesRuleEntityTest::testApplySeveralSalesRules
 with data set "ApplySeveralSalesRuleEntityTestVariation3" works wrong

---
 .../tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml   | 2 +-
 .../SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
index 521d7d68ac4a6..5cb5b4db72769 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -271,7 +271,7 @@
             <field name="coupon_type" xsi:type="string">No Coupon</field>
             <field name="sort_order" xsi:type="string">1</field>
             <field name="is_rss" xsi:type="string">Yes</field>
-            <field name="conditions_serialized" xsi:type="string">[Total Items Quantity|equals or greater than|3]{Product attribute combination|FOUND|ALL|:[[Category|is|2]]}</field>
+            <field name="conditions_serialized" xsi:type="string">[Total Items Quantity|equals or greater than|3]</field>
             <field name="simple_action" xsi:type="string">Percent of product price discount</field>
             <field name="discount_amount" xsi:type="string">25</field>
             <field name="apply_to_shipping" xsi:type="string">No</field>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
index e160fef609545..3dfe4cf118552 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
@@ -31,7 +31,6 @@
             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
         </variation>
         <variation name="ApplySeveralSalesRuleEntityTestVariation3" summary="Rules with different priority, both are applied">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="salesRules/rule1" xsi:type="string">active_sales_rule_product_attribute</data>
             <data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
             <data name="cartPrice/sub_total" xsi:type="string">250.00</data>
@@ -44,7 +43,6 @@
             <constraint name="Magento\SalesRule\Test\Constraint\AssertCartPriceRuleConditionIsApplied" />
         </variation>
         <variation name="ApplySeveralSalesRuleEntityTestVariation4" summary="Rules with different priority, none are applied">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
             <data name="salesRules/rule1" xsi:type="string">active_sales_rule_row_total</data>
             <data name="salesRules/rule2" xsi:type="string">active_sales_total_items</data>
             <data name="productForSalesRule1/dataset" xsi:type="string">simple_for_salesrule_1</data>

From d73f51028fdca8ba9404639979e1efa1c9da105d Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Mon, 14 Jan 2019 15:55:57 -0600
Subject: [PATCH 638/932] MAGETWO-97411:
 \Magento\Customer\Model\Customer::getDataModel method takes to much time to
 load with many addresses customer

---
 app/code/Magento/Customer/Model/Customer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 2defed1ef07b2..dd9d688c07aac 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -318,15 +318,15 @@ public function _construct()
     public function getDataModel()
     {
         $customerData = $this->getData();
+        $addressesData = [];
         if (isset($customerData['entity_id']) && !isset($this->storedAddress[$customerData['entity_id']])) {
-            $addressesData = [];
             /** @var \Magento\Customer\Model\Address $address */
             foreach ($this->getAddresses() as $address) {
                 $addressesData[] = $address->getDataModel();
             }
             $this->storedAddress[$customerData['entity_id']] = $addressesData;
         } elseif (isset($customerData['entity_id'], $this->storedAddress[$customerData['entity_id']])) {
-            $customerData = $this->storedAddress[$customerData['entity_id']];
+            $addressesData = $this->storedAddress[$customerData['entity_id']];
         }
         $customerDataObject = $this->customerDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
@@ -334,7 +334,7 @@ public function getDataModel()
             $customerData,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
-        $customerDataObject->setAddresses($customerData)
+        $customerDataObject->setAddresses($addressesData)
             ->setId($this->getId());
         return $customerDataObject;
     }

From 209c945a737ac354efb4fde17c6d26eb5a914397 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Mon, 14 Jan 2019 17:25:31 -0600
Subject: [PATCH 639/932] MC-6282: [Backend]: Create Place Order Controller

---
 .../Controller/Express/OnAuthorization.php    | 44 ++++++++-----------
 .../Magento/Paypal/Model/Express/Checkout.php |  6 +--
 .../express-checkout-smart-buttons.js         | 15 ++++---
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index 1f4b35af40f6e..30e5457028fd5 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -9,32 +9,29 @@
 
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Paypal\Model\Config as PayPalConfig;
+use Magento\Paypal\Model\Express\Checkout as PayPalCheckout;
 
 /**
  * Processes data after returning from PayPal
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class OnAuthorization extends AbstractExpress implements HttpPostActionInterface
 {
     /**
-     * Config mode type
-     *
-     * @var string
+     * @inheritdoc
      */
-    protected $_configType = \Magento\Paypal\Model\Config::class;
+    protected $_configType = PayPalConfig::class;
 
     /**
-     * Config method type
-     *
-     * @var string
+     * @inheritdoc
      */
-    protected $_configMethod = \Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS;
+    protected $_configMethod = PayPalConfig::METHOD_WPP_EXPRESS;
 
     /**
-     * Checkout mode type
-     *
-     * @var string
+     * @inheritdoc
      */
-    protected $_checkoutType = \Magento\Paypal\Model\Express\Checkout::class;
+    protected $_checkoutType = PayPalCheckout::class;
 
     /**
      * @var \Magento\Quote\Model\Quote\PaymentFactory
@@ -101,16 +98,15 @@ public function __construct(
     /**
      * Place order or redirect on Paypal review page
      *
-     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
-        $params = $this->getRequest()->getParams();
-        $quoteId = $params['quoteId'];
-        $payerId = $params['payerId'];
-        $tokenId = $params['paymentToken'];
-        $customerId = $params['customerId'];
+        $quoteId = $this->getRequest()->getParam('quoteId');
+        $payerId = $this->getRequest()->getParam('payerId');
+        $tokenId = $this->getRequest()->getParam('paymentToken');
+        $customerId = $this->getRequest()->getParam('customerId');
         try {
             $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
 
@@ -119,21 +115,19 @@ public function execute()
                 'error_message' => '',
             ];
 
-            //populate checkout object with new data
+            /** Populate checkout object with new data */
             $this->_initCheckout($quote);
             /**  Populate quote  with information about billing and shipping addresses*/
             $this->_checkout->returnFromPaypal($tokenId, $payerId);
             if ($this->_checkout->canSkipOrderReviewStep()) {
                 $this->_checkout->place($tokenId);
                 $order = $this->_checkout->getOrder();
-                // "last successful quote"
+                /** "last successful quote" */
                 $this->_getCheckoutSession()->setLastQuoteId($quote->getId())->setLastSuccessQuoteId($quote->getId());
 
-                if ($order) {
-                    $this->_getCheckoutSession()->setLastOrderId($order->getId())
-                        ->setLastRealOrderId($order->getIncrementId())
-                        ->setLastOrderStatus($order->getStatus());
-                }
+                $this->_getCheckoutSession()->setLastOrderId($order->getId())
+                    ->setLastRealOrderId($order->getIncrementId())
+                    ->setLastOrderStatus($order->getStatus());
 
                 $this->_eventManager->dispatch(
                     'paypal_express_place_order_success',
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 2fa4fcf26311a..2166319896f96 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -614,11 +614,11 @@ public function canSkipOrderReviewStep()
      * export shipping address in case address absence
      *
      * @param string $token
-     * @param string|null $payerData
+     * @param string|null $payerIdentifier
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function returnFromPaypal($token, $payerData = null)
+    public function returnFromPaypal($token, $payerIdentifier = null)
     {
         $this->_getApi()
             ->setToken($token)
@@ -694,7 +694,7 @@ public function returnFromPaypal($token, $payerData = null)
         $payment = $quote->getPayment();
         $payment->setMethod($this->_methodType);
         $this->_paypalInfo->importToPayment($this->_getApi(), $payment);
-        $payerId = $payerData ? : $this->_getApi()->getPayerId();
+        $payerId = $payerIdentifier ? : $this->_getApi()->getPayerId();
         $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_PAYER_ID, $payerId)
             ->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_TOKEN, $token);
         $quote->collectTotals();
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index ea0548192fe4c..3cc36a9ff4068 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -22,11 +22,13 @@ define([
         _.each(config, function (name) {
             funding.push(paypal.FUNDING[name]);
         }, this);
+
         return funding;
     };
 
     return function (clientConfig, element) {
 
+        var environment = clientConfig.environment;
         /**
          *
          * @param handler
@@ -42,6 +44,7 @@ define([
          * @return {Boolean}
          */
         function isValid() {
+
             return clientConfig.validator.validate();
         }
 
@@ -64,7 +67,7 @@ define([
 
             env: clientConfig.environment,
             client: {
-                [clientConfig.environment]: clientConfig.merchantId
+                [environment]: clientConfig.merchantId
             },
             locale: clientConfig.locale,
             funding: {
@@ -113,11 +116,13 @@ define([
                                 paypal.request.post(clientConfig.getTokenUrl, params)
                                     .then(function (res) {
                                         if (res.success) {
+
                                             return resolve(res.token);
                                         } else {
                                             messageList.addErrorMessage({
                                                 message: res.error_message
                                             });
+
                                             return reject(new Error(res.error_message));
                                         }
                                     })
@@ -133,6 +138,7 @@ define([
                                 messageList.addErrorMessage({
                                     message: error
                                 });
+
                                 return reject(new Error(error));
                             }
                         );
@@ -141,8 +147,7 @@ define([
                     return paypal.request.post(clientConfig.getTokenUrl, params)
                         .then(function (res) {
                             if (res.success) {
-                                //add logic to process negative cases
-                                // 3. Return res.id from the response
+
                                 return res.token;
                             } else {
                                 messageList.addErrorMessage({
@@ -170,11 +175,11 @@ define([
                         customerId: clientConfig.customerId || '',
                         form_key: clientConfig.formKey
                     };
+
                 return paypal.request.post(clientConfig.onAuthorizeUrl, params)
                     .then(function (res) {
                         if(res.success) {
-                            //add logic to process negative cases
-                            // 3. Return res.id from the response
+
                             return actions.redirect(window, res.redirectUrl);
                         } else {
                             messageList.addErrorMessage({

From 3bd68e56f7c638d4abde434655391f3cc80bc825 Mon Sep 17 00:00:00 2001
From: Dipti 2Jcommerce <dipti@2jcommerce.in>
Date: Tue, 15 Jan 2019 11:41:19 +0530
Subject: [PATCH 640/932] 
 My-Accounttele-phone-field-require-no-validation-appear

---
 .../Customer/view/frontend/templates/widget/telephone.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
index 9a865b124909d..6367bf10bbade 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
@@ -27,7 +27,7 @@
                id="telephone"
                value="<?= $block->escapeHtmlAttr($block->getTelephone()) ?>"
                title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>"
-               class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('telephone')) ?>"
+               class="input-text <?= $_validationClass ?: '' ?>"
         >
     </div>
 </div>

From f51c252425f28b61ecabab0e5d4fe1d2e4bcfddc Mon Sep 17 00:00:00 2001
From: Stas Puga <stas.puga@transoftgroup.com>
Date: Tue, 15 Jan 2019 09:27:24 +0200
Subject: [PATCH 641/932] MAGETWO-58762: Customer grid does not open in
 MoveLastOrderedProductsOnOrderPageTestVariation2 on Jenkins

---
 .../Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
index a9bd3fcacea8a..8bb4ef56361fb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveLastOrderedProductsOnOrderPageTest.xml
@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sales\Test\TestCase\MoveLastOrderedProductsOnOrderPageTest" summary="Add Products to Order from Last Ordered Products Section" ticketId="MAGETWO-27640">
         <variation name="MoveLastOrderedProductsOnOrderPageTestVariation1">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default</data>
             <constraint name="Magento\Sales\Test\Constraint\AssertProductInItemsOrderedGrid" />

From c835aa18336af26895e140c0f4f36a129315e44f Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 15 Jan 2019 10:38:40 +0200
Subject: [PATCH 642/932] Functional test fix.

---
 .../Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
index e3ac6483bc7bd..20bde5f87bd7b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/EnableDisableProductActionGroup.xml
@@ -14,7 +14,8 @@
         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
 
         <!--Trigger SEO drop down-->
-        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="moveToSEOSection"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
         <waitForPageLoad stepKey="WaitForDropDownSEO"/>
 
         <!--Fill URL input-->

From 763ba559602877af8ba6db5c0b514d458fc71506 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 10 Jan 2019 17:23:00 +0200
Subject: [PATCH 643/932] magento/magento2#15950: [Forwardport] Magento2 CSV
 product import qty and is_in_stock not working correct.

---
 .../CatalogImportExport/Model/Import/Product.php   |  4 +---
 .../Model/Import/ProductTest.php                   | 14 ++++++++++++++
 ...port_with_backorders_disabled_and_not_0_qty.csv |  2 ++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 9298939791e4b..746745c717f44 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -3067,9 +3067,7 @@ private function formatStockDataForRow(array $rowData): array
 
         if ($this->stockConfiguration->isQty($this->skuProcessor->getNewSku($sku)['type_id'])) {
             $stockItemDo->setData($row);
-            $row['is_in_stock'] = isset($row['is_in_stock']) && $stockItemDo->getBackorders()
-                ? $row['is_in_stock']
-                : $this->stockStateProvider->verifyStock($stockItemDo);
+            $row['is_in_stock'] = $row['is_in_stock'] ?? $this->stockStateProvider->verifyStock($stockItemDo);
             if ($this->stockStateProvider->verifyNotification($stockItemDo)) {
                 $date = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC'));
                 $row['low_stock_date'] = $date->format(DateTime::DATETIME_PHP_FORMAT);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index e5d97ac0e6844..c4c6d3ba2d1d2 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -2272,6 +2272,20 @@ public function testImportWithBackordersEnabled(): void
         $this->assertFalse($product->getDataByKey('quantity_and_stock_status')['is_in_stock']);
     }
 
+    /**
+     * Test that imported product stock status with stock quantity > 0 and backorders functionality disabled
+     * can be set to 'out of stock'.
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     */
+    public function testImportWithBackordersDisabled(): void
+    {
+        $this->importFile('products_to_import_with_backorders_disabled_and_not_0_qty.csv');
+        $product = $this->getProductBySku('simple_new');
+        $this->assertFalse($product->getDataByKey('quantity_and_stock_status')['is_in_stock']);
+    }
+
     /**
      * Import file by providing import filename in parameters.
      *
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv
new file mode 100644
index 0000000000000..b22427a8af120
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_with_backorders_disabled_and_not_0_qty.csv
@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
+simple_new,,Default,simple,,base,New Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,new-product,New Product,New Product,New Product ,,,,,,,10/20/2015 7:05,10/20/2015 7:05,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100,0,1,0,0,0,1,1,10000,1,0,1,1,1,0,1,1,0,0,0,1,,,,,,,,,,,,,

From cf6975be9651f49f13fdf8382c711edc80fe4204 Mon Sep 17 00:00:00 2001
From: priti <priti@2jcommerce.in>
Date: Tue, 15 Jan 2019 15:40:39 +0530
Subject: [PATCH 644/932] 
 update-button-issue-while-updating-billing-and-shipping-address

---
 app/design/frontend/Magento/blank/web/css/source/_forms.less | 2 +-
 app/design/frontend/Magento/luma/web/css/source/_forms.less  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_forms.less b/app/design/frontend/Magento/blank/web/css/source/_forms.less
index 94b993b53b508..c9f3c3d72ef4c 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_forms.less
@@ -18,7 +18,7 @@
     .fieldset {
         .lib-form-fieldset();
         &:last-child {
-            margin-bottom: 0;
+            margin-bottom: @indent__base;
         }
 
         > .field,
diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less
index 0c7150c18550b..98dd57dead74c 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_forms.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -20,7 +20,7 @@
         .lib-form-fieldset();
 
         &:last-child {
-            margin-bottom: 0;
+            margin-bottom: @indent__base;
         }
 
         > .field,

From f03953b1a4013c24fbd008505f54446862efe4c8 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 15 Jan 2019 13:09:29 +0200
Subject: [PATCH 645/932] Functional test fix.

---
 .../Mftf/Test/AdminMassDeleteBundleProducts.xml     |  4 ++--
 .../Test/MassEnableDisableBundleProductsTest.xml    | 13 +++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
index c0edbf14e894b..2f891fcc8f169 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProducts.xml
@@ -99,8 +99,8 @@
         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku2"/>
 
         <!--Trigger SEO drop down-->
-        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed2"/>
-        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="moveToSEOSection"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
 
         <!--Fill URL input-->
         <fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
index 5b2b771434b73..ff192538637ef 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -60,15 +60,7 @@
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty1"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillProductDefaultQty2"/>
 
-        <fillField selector="{{AdminProductFormBundleSection.productName}}" userInput="{{BundleProduct.name}}" stepKey="fillProductName"/>
-        <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
-
-        <!--Trigger SEO drop down-->
-        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed"/>
-        <waitForPageLoad stepKey="WaitForDropDownSEO"/>
-
-        <!--Fill URL input-->
-        <fillField userInput="{{BundleProduct.urlKey}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension"/>
+        <actionGroup ref="AncillaryPrepBundleProduct" stepKey="createBundledProductForTwoSimpleProducts"/>
 
         <!--Save the product-->
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
@@ -104,7 +96,8 @@
         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku2}}" stepKey="fillProductSku2"/>
 
         <!--Trigger SEO drop down-->
-        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.seoDependent}}" visible="false" stepKey="OpenDropDownIfClosed2"/>
+        <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="moveToSEOSection"/>
+        <conditionalClick selector="{{AdminProductFormBundleSection.seoDropdown}}" dependentSelector="{{AdminProductFormBundleSection.urlKey}}" visible="false" stepKey="openDropDownIfClosed"/>
         <waitForPageLoad stepKey="WaitForDropDownSEO2"/>
 
         <!--Fill URL input-->

From 0652e87b1941d868c8d2469ba12e07fd35d6d130 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Tue, 15 Jan 2019 16:46:44 +0530
Subject: [PATCH 646/932] issue fixed #20299 Order item details label not
 aligned in mobile view

issue fixed #20299 Order item details label not aligned in mobile view
---
 .../Magento_Checkout/web/css/source/module/_cart.less | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 58582d344e75a..e3bc5a478b025 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -497,6 +497,17 @@
             }
         }
     }
+    
+    .cart.table-wrapper,
+    .order-items.table-wrapper {
+        .col.price,
+        .col.qty,
+        .col.subtotal,
+        .col.msrp {
+            text-align: left;
+        }
+    }
+    
 }
 
 //

From db0e8b2ec350a5c834e9cf51757cccd588630e30 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <32759259+vivekkumarcedcoss@users.noreply.github.com>
Date: Sat, 12 Jan 2019 10:59:48 +0530
Subject: [PATCH 647/932] Update list.phtml for issue #20229

---
 .../view/frontend/templates/product/compare/list.phtml        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
index 949d365e7899a..7daf049980362 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
@@ -116,7 +116,9 @@
                                                 <?php $block->getImage($item, 'product_small_image')->toHtml(); ?>
                                                 <?php break;
                                             default: ?>
-                                            <?= /* @escapeNotVerified */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
+                                                <?php if (is_string($block->getProductAttributeValue($item, $attribute))): ?>
+                                                    <?= /* @escapeNotVerified */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
+                                                <?php endif; ?>
                                             <?php break;
                                         } ?>
                                     </div>

From bd9b55d06560931f574a9fd27301c8d1adc55257 Mon Sep 17 00:00:00 2001
From: "v.sikailo" <v.sikailo@ism-ukraine.com>
Date: Tue, 15 Jan 2019 13:52:29 +0200
Subject: [PATCH 648/932] - small phpDocs fixes

---
 .../Magento/Reports/Controller/Adminhtml/Report/Statistics.php | 2 +-
 .../Magento/Reports/Model/ResourceModel/Order/Collection.php   | 2 +-
 .../Reports/Observer/CatalogProductCompareClearObserver.php    | 3 ++-
 .../Magento/Reports/Observer/CatalogProductViewObserver.php    | 1 +
 .../Reports/Observer/CheckoutCartAddProductObserver.php        | 1 +
 app/code/Magento/Reports/Observer/CustomerLogoutObserver.php   | 2 +-
 .../Magento/Reports/Observer/SendfriendProductObserver.php     | 1 +
 .../Magento/Reports/Observer/WishlistAddProductObserver.php    | 1 +
 app/code/Magento/Reports/Observer/WishlistShareObserver.php    | 1 +
 9 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
index 6ba5b71b6c085..47181e61269bc 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
@@ -49,7 +49,7 @@ abstract class Statistics extends \Magento\Backend\App\Action
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
-     * @param [] $reportTypes
+     * @param array $reportTypes
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 82ebc74a0468e..440d99627a686 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -81,7 +81,7 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Order\Collection
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Sales\Model\ResourceModel\Report\OrderFactory $reportOrderFactory
-     * @param null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
diff --git a/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php b/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
index bbe431aeeef9c..26559dc27cc53 100644
--- a/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
+++ b/app/code/Magento/Reports/Observer/CatalogProductCompareClearObserver.php
@@ -24,6 +24,7 @@ class CatalogProductCompareClearObserver implements ObserverInterface
 
     /**
      * @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
@@ -39,7 +40,7 @@ public function __construct(
      * Reset count of compared products cache
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return $this
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
diff --git a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
index 7797dda8eabfb..50512d4f67da7 100644
--- a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
+++ b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
@@ -49,6 +49,7 @@ class CatalogProductViewObserver implements ObserverInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
diff --git a/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php b/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
index 718cc02349ce5..6a3b7832bd48a 100644
--- a/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
+++ b/app/code/Magento/Reports/Observer/CheckoutCartAddProductObserver.php
@@ -25,6 +25,7 @@ class CheckoutCartAddProductObserver implements ObserverInterface
 
     /**
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         EventSaver $eventSaver,
diff --git a/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php b/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php
index 833834d06bc74..95d17ddacefb3 100644
--- a/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php
+++ b/app/code/Magento/Reports/Observer/CustomerLogoutObserver.php
@@ -38,7 +38,7 @@ public function __construct(
      * Customer logout processing
      *
      * @param \Magento\Framework\Event\Observer $observer
-     * @return $this
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
diff --git a/app/code/Magento/Reports/Observer/SendfriendProductObserver.php b/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
index 0583b45d2d05f..ca70b23d55ee2 100644
--- a/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
+++ b/app/code/Magento/Reports/Observer/SendfriendProductObserver.php
@@ -25,6 +25,7 @@ class SendfriendProductObserver implements ObserverInterface
 
     /**
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         EventSaver $eventSaver,
diff --git a/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php b/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
index 3fd868abbd968..e4c57cf3ef25a 100644
--- a/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
+++ b/app/code/Magento/Reports/Observer/WishlistAddProductObserver.php
@@ -25,6 +25,7 @@ class WishlistAddProductObserver implements ObserverInterface
 
     /**
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         EventSaver $eventSaver,
diff --git a/app/code/Magento/Reports/Observer/WishlistShareObserver.php b/app/code/Magento/Reports/Observer/WishlistShareObserver.php
index 2c4926ac12a16..de6e55ceb3f6c 100644
--- a/app/code/Magento/Reports/Observer/WishlistShareObserver.php
+++ b/app/code/Magento/Reports/Observer/WishlistShareObserver.php
@@ -25,6 +25,7 @@ class WishlistShareObserver implements ObserverInterface
 
     /**
      * @param EventSaver $eventSaver
+     * @param \Magento\Reports\Model\ReportStatus $reportStatus
      */
     public function __construct(
         EventSaver $eventSaver,

From 1ad7d4598504fe89b2f0899a966f61fbdf5c64d5 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 15 Jan 2019 13:57:00 +0200
Subject: [PATCH 649/932] Fix static test.

---
 .../Catalog/Block/Product/View/Details.php      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/View/Details.php b/app/code/Magento/Catalog/Block/Product/View/Details.php
index 4241d30b8fa06..e76c5bf201334 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Details.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Details.php
@@ -6,28 +6,27 @@
 
 declare(strict_types=1);
 
-/**
- * Product details block
- * Holds a group of blocks to show as tabs
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
-
 namespace Magento\Catalog\Block\Product\View;
 
 /**
+ * Product details block.
+ *
+ * Holds a group of blocks to show as tabs.
+ *
  * @api
  */
 class Details extends \Magento\Framework\View\Element\Template
 {
     /**
+     * Get sorted child block names.
+     *
      * @param string $groupName
-     * @param $callback
+     * @param string $callback
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @return array
      */
-    public function getGroupSortedChildNames(string $groupName, $callback): array
+    public function getGroupSortedChildNames(string $groupName, string $callback): array
     {
         $groupChildNames = $this->getGroupChildNames($groupName, $callback);
         $layout = $this->getLayout();

From 196ba8ef893ba4c0cfa31c9c1c6d0143d4274e17 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Tue, 15 Jan 2019 17:32:14 +0530
Subject: [PATCH 650/932] issue fixed #20304 No space between step title and
 saved address in checkout

issue fixed #20304 No space between step title and saved address in checkout
---
 .../web/css/source/module/checkout/_checkout.less                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
index 0df0cace338c0..3ea1f5b7f6842 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_checkout.less
@@ -48,6 +48,7 @@
         .step-title {
             &:extend(.abs-checkout-title all);
             .lib-css(border-bottom, @checkout-step-title__border);
+            margin-bottom: 15px;
         }
 
         .step-content {

From e106bbe9a8346c68979047276a895a675465ace4 Mon Sep 17 00:00:00 2001
From: Mastiuhin Olexandr <mastiuhin.olexandr@transoftgroup.com>
Date: Tue, 15 Jan 2019 14:07:40 +0200
Subject: [PATCH 651/932] MAGETWO-97091: Zip code is not validated for address
 entered in My Account and for new address entered during checkout

---
 .../web/js/model/shipping-rates-validator.js  |  19 ++--
 .../PostCodesPatternsAttributeData.php        |  42 ++++++++
 .../frontend/layout/customer_address_form.xml |   1 +
 .../frontend/templates/address/edit.phtml     |   7 +-
 .../view/frontend/web/js/addressValidation.js | 100 +++++++++++++++++-
 ...ultishipping_checkout_customer_address.xml |   1 +
 6 files changed, 160 insertions(+), 10 deletions(-)
 create mode 100644 app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
index fde88ebadb393..8b07c02e4d380 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js
@@ -42,6 +42,7 @@ define([
 
     return {
         validateAddressTimeout: 0,
+        validateZipCodeTimeout: 0,
         validateDelay: 2000,
 
         /**
@@ -133,16 +134,20 @@ define([
                 });
             } else {
                 element.on('value', function () {
+                    clearTimeout(self.validateZipCodeTimeout);
+                    self.validateZipCodeTimeout = setTimeout(function () {
+                        if (element.index === postcodeElementName) {
+                            self.postcodeValidation(element);
+                        } else {
+                            $.each(postcodeElements, function (index, elem) {
+                                self.postcodeValidation(elem);
+                            });
+                        }
+                    }, delay);
+
                     if (!formPopUpState.isVisible()) {
                         clearTimeout(self.validateAddressTimeout);
                         self.validateAddressTimeout = setTimeout(function () {
-                            if (element.index === postcodeElementName) {
-                                self.postcodeValidation(element);
-                            } else {
-                                $.each(postcodeElements, function (index, elem) {
-                                    self.postcodeValidation(elem);
-                                });
-                            }
                             self.validateFields();
                         }, delay);
                     }
diff --git a/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
new file mode 100644
index 0000000000000..220dc5d9f1aaa
--- /dev/null
+++ b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Block\DataProviders;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Directory\Model\Country\Postcode\Config as PostCodeConfig;
+
+/**
+ * Provides postcodes patterns into template.
+ */
+class PostCodesPatternsAttributeData implements ArgumentInterface
+{
+    /**
+     * @var PostCodeConfig
+     */
+    private $postCodeConfig;
+
+    /**
+     * Constructor
+     *
+     * @param PostCodeConfig $postCodeConfig
+     */
+    public function __construct(PostCodeConfig $postCodeConfig)
+    {
+        $this->postCodeConfig = $postCodeConfig;
+    }
+
+    /**
+     * Get post codes in json format
+     *
+     * @return string
+     */
+    public function getPostCodesJson(): string
+    {
+        return json_encode($this->postCodeConfig->getPostCodes());
+    }
+}
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
index f053805409fe5..f5ee2b347a5b2 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
@@ -20,6 +20,7 @@
             <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false">
                 <arguments>
                     <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
+                    <argument name="post_code_config" xsi:type="object">Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData</argument>
                 </arguments>
             </block>
         </referenceContainer>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index faa15f7240235..c26e0390db817 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -126,6 +126,9 @@
                        title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('postcode') ?>"
                        id="zip"
                        class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
+                <div role="alert" class="message warning" style="display:none">
+                    <span></span>
+                </div>
             </div>
         </div>
         <div class="field country required">
@@ -184,7 +187,9 @@
 <script type="text/x-magento-init">
     {
         "#form-validate": {
-            "addressValidation": {}
+            "addressValidation": {
+                "postCodes": <?= /* @noEscape */ $block->getPostCodeConfig()->getPostCodesJson(); ?>
+            }
         },
         "#country": {
             "regionUpdater": {
diff --git a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
index be2960701deed..a7314a35127b5 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
@@ -5,18 +5,27 @@
 
 define([
     'jquery',
+    'underscore',
+    'mageUtils',
+    'mage/translate',
     'jquery/ui',
     'validation'
-], function ($) {
+], function ($, __, utils, $t) {
     'use strict';
 
     $.widget('mage.addressValidation', {
         options: {
             selectors: {
-                button: '[data-action=save-address]'
+                button: '[data-action=save-address]',
+                zip: '#zip',
+                country: 'select[name="country_id"]:visible'
             }
         },
 
+        validatedPostCodeExample: [],
+        zipInput: null,
+        countrySelect: null,
+
         /**
          * Validation creation
          * @protected
@@ -24,6 +33,9 @@ define([
         _create: function () {
             var button = $(this.options.selectors.button, this.element);
 
+            this.zipInput = $(this.options.selectors.zip, this.element);
+            this.countrySelect = $(this.options.selectors.country, this.element);
+
             this.element.validation({
 
                 /**
@@ -36,6 +48,90 @@ define([
                     form.submit();
                 }
             });
+
+            this._addPostCodeValidation();
+        },
+
+        /**
+         * Add postcode validation
+         */
+        _addPostCodeValidation: function () {
+            var self = this;
+
+            this.zipInput.on('keyup', __.debounce(function (event) {
+                    var valid = self._validatePostCode(event.target.value);
+
+                    self._renderValidationResult(valid);
+                }, 500)
+            );
+
+            this.countrySelect.on('change', function () {
+                var valid = self._validatePostCode(self.zipInput.val());
+
+                self._renderValidationResult(valid);
+            });
+        },
+
+        /**
+         * Validate post code value.
+         *
+         * @param {String} postCode - post code
+         * @return {Boolean} Whether is post code valid
+         */
+        _validatePostCode: function (postCode) {
+            var countryId = this.countrySelect.val(),
+                patterns = this.options.postCodes[countryId],
+                pattern, regex;
+
+            if (postCode === null) {
+                return true;
+            }
+
+            this.validatedPostCodeExample = [];
+
+            if (!utils.isEmpty(postCode) && !utils.isEmpty(patterns)) {
+                for (pattern in patterns) {
+                    if (patterns.hasOwnProperty(pattern)) { //eslint-disable-line max-depth
+                        this.validatedPostCodeExample.push(patterns[pattern].example);
+                        regex = new RegExp(patterns[pattern].pattern);
+
+                        if (regex.test(postCode)) { //eslint-disable-line max-depth
+                            return true;
+                        }
+                    }
+                }
+
+                return false;
+            }
+
+            return true;
+        },
+
+        /**
+         * Renders warning messages for invalid post code.
+         *
+         * @param {Boolean} valid
+         */
+        _renderValidationResult: function (valid) {
+            var warnMessage,
+                alertDiv = this.zipInput.next();
+
+            if (!valid) {
+                warnMessage = $t('Provided Zip/Postal Code seems to be invalid.');
+
+                if (this.validatedPostCodeExample.length) {
+                    warnMessage += $t(' Example: ') + this.validatedPostCodeExample.join('; ') + '. ';
+                }
+                warnMessage += $t('If you believe it is the right one you can ignore this notice.');
+            }
+
+            alertDiv.children(':first').text(warnMessage);
+
+            if (valid) {
+                alertDiv.hide();
+            } else {
+                alertDiv.show();
+            }
         }
     });
 
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
index c6bcdeb7b0413..fee3cb790a522 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml
@@ -12,6 +12,7 @@
             <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="Magento_Customer::address/edit.phtml" cacheable="false">
                 <arguments>
                     <argument name="attribute_data" xsi:type="object">Magento\Customer\Block\DataProviders\AddressAttributeData</argument>
+                    <argument name="post_code_config" xsi:type="object">Magento\Customer\Block\DataProviders\PostCodesPatternsAttributeData</argument>
                 </arguments>
             </block>
         </referenceContainer>

From 58d2268e127e3690a4056f6d7ca7beabbdd4ea23 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Tue, 15 Jan 2019 12:37:39 +0200
Subject: [PATCH 652/932] MAGETWO-97625: [Magento Cloud] Can't delete video
 images on Duplicate products

---
 .../Model/Product/Gallery/CreateHandler.php   |  2 +-
 .../Model/ResourceModel/Product/Gallery.php   | 21 ++++++++++---------
 .../Catalog/Product/Gallery/CreateHandler.php | 21 +++++++++++++++++++
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
index 65111979c5d3a..42b9639d2717b 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
@@ -318,7 +318,7 @@ protected function duplicate($product)
 
         $this->resourceModel->duplicate(
             $this->getAttribute()->getAttributeId(),
-            isset($mediaGalleryData['duplicate']) ? $mediaGalleryData['duplicate'] : [],
+            $mediaGalleryData['duplicate'] ?? [],
             $product->getOriginalLinkId(),
             $product->getData($this->metadata->getLinkField())
         );
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
index 635715a60742f..a9741cd8e1ec7 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
 use Magento\Store\Model\Store;
@@ -149,7 +150,7 @@ public function loadProductGalleryByAttributeId($product, $attributeId)
      */
     protected function createBaseLoadSelect($entityId, $storeId, $attributeId)
     {
-        $select =  $this->createBatchBaseSelect($storeId, $attributeId);
+        $select = $this->createBatchBaseSelect($storeId, $attributeId);
 
         $select = $select->where(
             'entity.' . $this->metadata->getLinkField() . ' = ?',
@@ -378,9 +379,9 @@ public function deleteGalleryValueInStore($valueId, $entityId, $storeId)
         $conditions = implode(
             ' AND ',
             [
-                $this->getConnection()->quoteInto('value_id = ?', (int) $valueId),
-                $this->getConnection()->quoteInto($this->metadata->getLinkField() . ' = ?', (int) $entityId),
-                $this->getConnection()->quoteInto('store_id = ?', (int) $storeId)
+                $this->getConnection()->quoteInto('value_id = ?', (int)$valueId),
+                $this->getConnection()->quoteInto($this->metadata->getLinkField() . ' = ?', (int)$entityId),
+                $this->getConnection()->quoteInto('store_id = ?', (int)$storeId)
             ]
         );
 
@@ -408,7 +409,7 @@ public function duplicate($attributeId, $newFiles, $originalProductId, $newProdu
 
         $select = $this->getConnection()->select()->from(
             [$this->getMainTableAlias() => $this->getMainTable()],
-            ['value_id', 'value']
+            ['value_id', 'value', 'media_type', 'disabled']
         )->joinInner(
             ['entity' => $this->getTable(self::GALLERY_VALUE_TO_ENTITY_TABLE)],
             $this->getMainTableAlias() . '.value_id = entity.value_id',
@@ -425,16 +426,16 @@ public function duplicate($attributeId, $newFiles, $originalProductId, $newProdu
 
         // Duplicate main entries of gallery
         foreach ($this->getConnection()->fetchAll($select) as $row) {
-            $data = [
-                'attribute_id' => $attributeId,
-                'value' => isset($newFiles[$row['value_id']]) ? $newFiles[$row['value_id']] : $row['value'],
-            ];
+            $data = $row;
+            $data['attribute_id'] = $attributeId;
+            $data['value'] = $newFiles[$row['value_id']] ?? $row['value'];
+            unset($data['value_id']);
 
             $valueIdMap[$row['value_id']] = $this->insertGallery($data);
             $this->bindValueToEntity($valueIdMap[$row['value_id']], $newProductId);
         }
 
-        if (count($valueIdMap) == 0) {
+        if (count($valueIdMap) === 0) {
             return [];
         }
 
diff --git a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
index ce1493b349a85..ba77ac7b79906 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
@@ -58,6 +58,9 @@ public function afterExecute(
         );
 
         if (!empty($mediaCollection)) {
+            if ($product->getIsDuplicate() === true) {
+                $mediaCollection = $this->makeAllNewVideos($product->getId(), $mediaCollection);
+            }
             $newVideoCollection = $this->collectNewVideos($mediaCollection);
             $this->saveVideoData($newVideoCollection, 0);
 
@@ -282,4 +285,22 @@ private function isNewVideo(array $item): bool
             || empty($item['video_url_default'])
             || empty($item['video_title_default']);
     }
+
+    /**
+     *
+     * @param int $entityId
+     * @param array $mediaCollection
+     * @return array
+     */
+    private function makeAllNewVideos($entityId, array $mediaCollection): array
+    {
+        foreach ($mediaCollection as $key => $video) {
+            if ($this->isVideoItem($video)) {
+                unset($video['video_url_default'], $video['video_title_default']);
+                $video['entity_id'] = $entityId;
+                $mediaCollection[$key] = $video;
+            }
+        }
+        return $mediaCollection;
+    }
 }

From 9bd3490778a1318805ff974d59f6de4276d8ae25 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 15 Jan 2019 08:01:18 -0600
Subject: [PATCH 653/932] MC-6283: [System Configuration] Introduce the new
 settings related to Smart buttons

- fix issues with code in button configuration
---
 app/code/Magento/Paypal/Model/Config.php      |  17 +--
 .../System/Config/Source/ButtonStyles.php     | 123 ++++++++++++++++++
 .../DisableFundingOptions.php                 |  13 +-
 .../Config/Source/ExpressButtons/Color.php    |  26 ----
 .../ExpressButtons/InstallmentPeriod.php      |  48 -------
 .../Config/Source/ExpressButtons/Label.php    |  28 ----
 .../Config/Source/ExpressButtons/Layout.php   |  24 ----
 .../Config/Source/ExpressButtons/Shape.php    |  24 ----
 .../Config/Source/ExpressButtons/Size.php     |  25 ----
 .../etc/adminhtml/system/express_checkout.xml |  41 +++---
 app/code/Magento/Paypal/i18n/en_US.csv        |  37 ++++++
 11 files changed, 190 insertions(+), 216 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
 rename app/code/Magento/Paypal/Model/System/Config/Source/{ExpressButtons => }/DisableFundingOptions.php (66%)
 delete mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php
 delete mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/InstallmentPeriod.php
 delete mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
 delete mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php
 delete mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
 delete mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 5c26fe5d07f98..f1a4979e0b1a0 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1645,21 +1645,6 @@ protected function _mapGenericStyleFieldset($fieldName)
             case 'paypal_hdrbackcolor':
             case 'paypal_hdrbordercolor':
             case 'paypal_payflowcolor':
-                return "paypal/style/{$fieldName}";
-            default:
-                return $this->_mapButtonStyleFieldset($fieldName);
-        }
-    }
-
-    /**
-     * Map PayPal button style config fields
-     *
-     * @param string $fieldName
-     * @return string|null
-     */
-    protected function _mapButtonStyleFieldset($fieldName)
-    {
-        switch ($fieldName) {
             case 'checkout_page_button_customize':
             case 'checkout_page_button_layout':
             case 'checkout_page_button_size':
@@ -1669,7 +1654,7 @@ protected function _mapButtonStyleFieldset($fieldName)
             case 'checkout_page_button_mx_installment_period':
             case 'checkout_page_button_br_installment_period':
             case 'disable_funding_options':
-                return "payment/{$this->_methodCode}/{$fieldName}";
+                return "paypal/style/{$fieldName}";
             default:
                 return null;
         }
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
new file mode 100644
index 0000000000000..e427421ba26cb
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Model\System\Config\Source;
+
+/**
+ * Get button style options
+ */
+class ButtonStyles
+{
+    /**
+     * Button color source getter
+     *
+     * @return array
+     */
+    public function getColor(): array
+    {
+        return [
+            'gold' => __('Gold'),
+            'blue' => __('Blue'),
+            'silver' => __('Silver'),
+            'black' => __('Black')
+        ];
+    }
+
+    /**
+     * Button layout source getter
+     *
+     * @return array
+     */
+    public function getLayout(): array
+    {
+        return [
+            'vertical' => __('Vertical'),
+            'horizontal' => __('Horizontal')
+        ];
+    }
+
+    /**
+     * Button shape source getter
+     *
+     * @return array
+     */
+    public function getShape(): array
+    {
+        return [
+            'pill' => __('Pill'),
+            'rect' => __('Rectangle')
+        ];
+    }
+
+    /**
+     * Button size source getter
+     *
+     * @return array
+     */
+    public function getSize(): array
+    {
+        return [
+            'medium' => __('Medium'),
+            'large' => __('Large'),
+            'responsive' => __('Responsive')
+        ];
+    }
+
+    /**
+     * Button label source getter
+     *
+     * @return array
+     */
+    public function getLabel(): array
+    {
+        return [
+            'checkout' => __('Checkout'),
+            'credit' => __('Credit'),
+            'pay' => __('Pay'),
+            'buynow' => __('Buy Now'),
+            'paypal' => __('PayPal'),
+            'installment' => __('Installment')
+        ];
+    }
+
+    /**
+     * Brazil button installment period source getter
+     *
+     * @return array
+     */
+    public function getBrInstallmentPeriod(): array
+    {
+        return [
+            2 => 2,
+            3 => 3,
+            4 => 4,
+            5 => 5,
+            6 => 6,
+            7 => 7,
+            8 => 8,
+            9 => 9,
+            10 => 10,
+            11 => 11,
+            12 => 12
+        ];
+    }
+
+    /**
+     * Mexico button installment period source getter
+     *
+     * @return array
+     */
+    public function getMxInstallmentPeriod(): array
+    {
+        return [
+            3 => 3,
+            6 => 6,
+            9 => 9,
+            12 => 12
+        ];
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
similarity index 66%
rename from app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php
rename to app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
index 0ec3813162742..b2f70f6be7e69 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/DisableFundingOptions.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
@@ -5,27 +5,30 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
+namespace Magento\Paypal\Model\System\Config\Source;
 
+/**
+ * Get disable funding options
+ */
 class DisableFundingOptions
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function toOptionArray(): array
     {
         return [
             [
                 'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CREDIT,
-                'label' => 'PayPal Credit'
+                'label' => __('PayPal Credit')
             ],
             [
                 'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CARD,
-                'label' => 'PayPal Guest Checkout Credit Card Icons'
+                'label' => __('PayPal Guest Checkout Credit Card Icons')
             ],
             [
                 'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_ELV,
-                'label' => 'Elektronisches Lastschriftverfahren - German ELV'
+                'label' => __('Elektronisches Lastschriftverfahren - German ELV')
             ]
         ];
     }
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php
deleted file mode 100644
index 7617bd9031c4b..0000000000000
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Color.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
-
-class Color
-{
-    /**
-     * Button color source getter for Checkout Page
-     *
-     * @return array
-     */
-    public function getCheckoutColor(): array
-    {
-        return [
-            'gold' => __('Gold'),
-            'blue' => __('Blue'),
-            'silver' => __('Silver'),
-            'black' => __('Black')
-        ];
-    }
-}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/InstallmentPeriod.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/InstallmentPeriod.php
deleted file mode 100644
index 2856fbc6c7e3a..0000000000000
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/InstallmentPeriod.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
-
-class InstallmentPeriod
-{
-    /**
-     * Brazil button installment period source getter for Checkout Page
-     *
-     * @return array
-     */
-    public function getCheckoutBrInstallmentPeriod(): array
-    {
-        return [
-            2 => 2,
-            3 => 3,
-            4 => 4,
-            5 => 5,
-            6 => 6,
-            7 => 7,
-            8 => 8,
-            9 => 9,
-            10 => 10,
-            11 => 11,
-            12 => 12
-        ];
-    }
-
-    /**
-     * Mexico button installment period source getter for Checkout Page
-     *
-     * @return array
-     */
-    public function getCheckoutMxInstallmentPeriod(): array
-    {
-        return [
-            3 => 3,
-            6 => 6,
-            9 => 9,
-            12 => 12
-        ];
-    }
-}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
deleted file mode 100644
index b0463ef1bac00..0000000000000
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Label.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
-
-class Label
-{
-    /**
-     * Button label source getter for Checkout Page
-     *
-     * @return array
-     */
-    public function getCheckoutLabel(): array
-    {
-        return [
-            'checkout' => __('Checkout'),
-            'credit' => __('Credit'),
-            'pay' => __('Pay'),
-            'buynow' => __('Buy Now'),
-            'paypal' => __('PayPal'),
-            'installment' => __('Installment')
-        ];
-    }
-}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php
deleted file mode 100644
index 9f28101024cf3..0000000000000
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Layout.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
-
-class Layout
-{
-    /**
-     * Button layout source getter for Checkout Page
-     *
-     * @return array
-     */
-    public function getCheckoutLayout(): array
-    {
-        return [
-            'vertical' => __('Vertical'),
-            'horizontal' => __('Horizontal')
-        ];
-    }
-}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
deleted file mode 100644
index bd7513861a2b5..0000000000000
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Shape.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
-
-class Shape
-{
-    /**
-     * Button shape source getter for Checkout Page
-     *
-     * @return array
-     */
-    public function getCheckoutShape(): array
-    {
-        return [
-            'pill' => __('Pill'),
-            'rect' => __('Rectangle')
-        ];
-    }
-}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php b/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php
deleted file mode 100644
index 01559868561b9..0000000000000
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ExpressButtons/Size.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Paypal\Model\System\Config\Source\ExpressButtons;
-
-class Size
-{
-    /**
-     * Button size source getter for Checkout Page
-     *
-     * @return array
-     */
-    public function getCheckoutSize(): array
-    {
-        return [
-            'medium' => __('Medium'),
-            'large' => __('Large'),
-            'responsive' => __('Responsive')
-        ];
-    }
-}
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index bc540f1083101..425033d0936ee 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -650,19 +650,20 @@
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
+                    <group id="checkout_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
                         <label>PayPal Button - Checkout Page</label>
                         <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                             <label>Customize Button</label>
                             <comment><![CDATA[Customize the display of the PayPal button in the Checkout.]]></comment>
-                            <config_path>payment/paypal_express/checkout_page_button_customize</config_path>
+                            <config_path>paypal/style/checkout_page_button_customize</config_path>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_label" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                        <field id="checkout_page_button_label" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                             <label>Label</label>
-                            <config_path>payment/paypal_express/checkout_page_button_label</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Label::getCheckoutLabel</source_model>
+                            <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
+                            <config_path>paypal/style/checkout_page_button_label</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                             </depends>
@@ -670,8 +671,8 @@
                         </field>
                         <field id="checkout_page_button_mx_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                             <label>Mexico Installment Period</label>
-                            <config_path>payment/paypal_express/checkout_page_button_mx_installment_period</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutMxInstallmentPeriod</source_model>
+                            <config_path>paypal/style/checkout_page_button_mx_installment_period</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getMxInstallmentPeriod</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label">installment</field>
@@ -680,8 +681,8 @@
                         </field>
                         <field id="checkout_page_button_br_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                             <label>Brazil Installment Period</label>
-                            <config_path>payment/paypal_express/checkout_page_button_br_installment_period</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutBrInstallmentPeriod</source_model>
+                            <config_path>paypal/style/checkout_page_button_br_installment_period</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getBrInstallmentPeriod</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label">installment</field>
@@ -690,8 +691,8 @@
                         </field>
                         <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
                             <label>Layout</label>
-                            <config_path>payment/paypal_express/checkout_page_button_layout</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Layout::getCheckoutLayout</source_model>
+                            <config_path>paypal/style/checkout_page_button_layout</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLayout</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label" negative="1">credit</field>
@@ -700,8 +701,8 @@
                         </field>
                         <field id="checkout_page_button_size" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
                             <label>Size</label>
-                            <config_path>payment/paypal_express/checkout_page_button_size</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Size::getCheckoutSize</source_model>
+                            <config_path>paypal/style/checkout_page_button_size</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getSize</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                             </depends>
@@ -709,8 +710,8 @@
                         </field>
                         <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
                             <label>Shape</label>
-                            <config_path>payment/paypal_express/checkout_page_button_shape</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Shape::getCheckoutShape</source_model>
+                            <config_path>paypal/style/checkout_page_button_shape</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getShape</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                             </depends>
@@ -718,8 +719,8 @@
                         </field>
                         <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
                             <label>Color</label>
-                            <config_path>payment/paypal_express/checkout_page_button_color</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Color::getCheckoutColor</source_model>
+                            <config_path>paypal/style/checkout_page_button_color</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getColor</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                                 <field id="checkout_page_button_label" negative="1">credit</field>
@@ -727,7 +728,7 @@
                             <attribute type="shared">1</attribute>
                         </field>
                     </group>
-                    <group id="features" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                    <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                         <label>Features</label>
                         <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Disable Funding Options</label>
@@ -736,8 +737,8 @@
                                 For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is
                                 offered and the currency offered by the merchant is USD.]]>
                             </comment>
-                            <config_path>payment/paypal_express/disable_funding_options</config_path>
-                            <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\DisableFundingOptions</source_model>
+                            <config_path>paypal/style/disable_funding_options</config_path>
+                            <source_model>Magento\Paypal\Model\System\Config\Source\DisableFundingOptions</source_model>
                             <attribute type="shared">1</attribute>
                         </field>
                     </group>
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index c3f3e38fa03b4..5d74c5ae166e0 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -697,3 +697,40 @@ User,User
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                 or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 "
+"Checkout Display","Checkout Display"
+"PayPal Button - Checkout Page","PayPal Button - Checkout Page"
+"Customize the display of the PayPal button in the Checkout.","Customize the display of the PayPal button in the Checkout."
+"Label","Label"
+"The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.","The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR."
+"Checkout","Checkout"
+"Credit","Credit"
+"Pay","Pay"
+"Buy Now","Buy Now"
+"PayPal","PayPal"
+"Installment","Installment"
+"Mexico Installment Period","Mexico Installment Period"
+"Brazil Installment Period","Brazil Installment Period"
+"Layout","Layout"
+"Vertical","Vertical"
+"Horizontal","Horizontal"
+"Size","Size"
+"Medium","Medium"
+"Large","Large"
+"Responsive","Responsive"
+"Shape","Shape"
+"Pill","Pill"
+"Rectangle","Rectangle"
+"Color","Color"
+"Gold","Gold"
+"Blue","Blue"
+"Silver","Silver"
+"Black","Black"
+"Features","Features"
+"
+                    PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is offered and the currency offered by the merchant is USD.
+                ","
+                    PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is offered and the currency offered by the merchant is USD.
+                "
+"PayPal Credit","PayPal Credit"
+"PayPal Guest Checkout Credit Card Icons","PayPal Guest Checkout Credit Card Icons"
+"Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
\ No newline at end of file

From 3b17c968a1ec6f6cfb5deb5a58533b2c13fe0739 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Wed, 5 Dec 2018 15:46:56 +0300
Subject: [PATCH 654/932] MAGETWO-95802: Admin date wrong formatting for French
 locale

- Changed the logic of date formatting
---
 .../testsuite/Magento/Catalog/_files/products_new.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
index 7d6e2e6f97800..2cd0dd2c77560 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
@@ -15,8 +15,8 @@
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
     ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
-    ->setNewsFromDate(date('Y-m-d', strtotime('-2 day')))
-    ->setNewsToDate(date('Y-m-d', strtotime('+2 day')))
+    ->setNewsFromDate(date('Y-m-d H:i:s', strtotime('-2 day')))
+    ->setNewsToDate(date('Y-m-d H:i:s', strtotime('+2 day')))
     ->setDescription('description')
     ->setShortDescription('short desc')
     ->save();

From 2051b1b5d59cf964023e28be3b97efedd2b71015 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Tue, 15 Jan 2019 16:14:54 +0200
Subject: [PATCH 655/932] MAGETWO-97377: Error when trying to create a shipping
 label

---
 dev/tests/integration/testsuite/Magento/Sales/_files/order.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index a1c5f8277762c..6b9cf3bc613ce 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -44,7 +44,8 @@
     ->setBasePrice($product->getPrice())
     ->setPrice($product->getPrice())
     ->setRowTotal($product->getPrice())
-    ->setProductType('simple');
+    ->setProductType('simple')
+    ->setName($product->getName());
 
 /** @var Order $order */
 $order = $objectManager->create(Order::class);

From 83a3ccca8b2735248bf700d621d29511a6ddd9b6 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@magento.com>
Date: Tue, 15 Jan 2019 08:41:35 -0600
Subject: [PATCH 656/932] MAGETWO-97411:
 \Magento\Customer\Model\Customer::getDataModel method takes to much time to
 load with many addresses customer

---
 app/code/Magento/Customer/Model/Customer.php       | 14 ++++++--------
 .../Customer/Test/Unit/Model/CustomerTest.php      |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index dd9d688c07aac..b00f393f53734 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -220,7 +220,7 @@ class Customer extends \Magento\Framework\Model\AbstractModel
     private $accountConfirmation;
 
     /**
-     * Caching property to store customer addresses by the customer ID.
+     * Caching property to store customer address data models by the address ID.
      *
      * @var array
      */
@@ -319,14 +319,12 @@ public function getDataModel()
     {
         $customerData = $this->getData();
         $addressesData = [];
-        if (isset($customerData['entity_id']) && !isset($this->storedAddress[$customerData['entity_id']])) {
-            /** @var \Magento\Customer\Model\Address $address */
-            foreach ($this->getAddresses() as $address) {
-                $addressesData[] = $address->getDataModel();
+        /** @var \Magento\Customer\Model\Address $address */
+        foreach ($this->getAddresses() as $address) {
+            if (!isset($this->storedAddress[$address->getId()])) {
+                $this->storedAddress[$address->getId()] = $address->getDataModel();
             }
-            $this->storedAddress[$customerData['entity_id']] = $addressesData;
-        } elseif (isset($customerData['entity_id'], $this->storedAddress[$customerData['entity_id']])) {
-            $addressesData = $this->storedAddress[$customerData['entity_id']];
+            $addressesData[] = $this->storedAddress[$address->getId()];
         }
         $customerDataObject = $this->customerDataFactory->create();
         $this->dataObjectHelper->populateWithArray(
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
index 90e55a6cf622b..65831069aa1fb 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
@@ -18,6 +18,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class CustomerTest extends \PHPUnit\Framework\TestCase
 {

From 693e8c97d2a308ad449cfbade0f9bca407c60e39 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 15 Jan 2019 17:21:17 +0200
Subject: [PATCH 657/932] ENGCOM-3851: Static test fix.

---
 .../Magento/backend/web/css/source/components/_messages.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
index 4964a691e6453..8773de61185e2 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
@@ -110,7 +110,7 @@
         content: @alert-icon__error__content;
         font-size: @alert-icon__error__font-size;
         left: 2.2rem;
-        margin-top: 0.5rem;
+        margin-top: .5rem;
     }
 }
 

From 2794d6ae7b33666e87c33e643f3996c13ac50706 Mon Sep 17 00:00:00 2001
From: Andrii Meysar <andrii.meysar@transoftgroup.com>
Date: Tue, 15 Jan 2019 17:25:29 +0200
Subject: [PATCH 658/932] MC-10939: Integration tests failure on Jenkins

---
 .../BundleImportExport/Model/BundleTest.php   |  19 +-
 .../AbstractProductExportImportTestCase.php   | 227 ++++++++++--------
 .../CatalogImportExport/Model/ProductTest.php |  21 +-
 .../Model/ConfigurableTest.php                |  32 ++-
 .../Model/DownloadableTest.php                |  72 ++----
 .../GroupedImportExport/Model/GroupedTest.php |  19 +-
 6 files changed, 186 insertions(+), 204 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/BundleTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/BundleTest.php
index e15f8d47a7bfc..864bdaa2a1331 100644
--- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/BundleTest.php
+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/BundleTest.php
@@ -9,7 +9,10 @@
 
 class BundleTest extends AbstractProductExportImportTestCase
 {
-    public function exportImportDataProvider()
+    /**
+     * @return array
+     */
+    public function exportImportDataProvider(): array
     {
         return [
             // @todo uncomment after MAGETWO-49677 resolved
@@ -45,17 +48,13 @@ public function exportImportDataProvider()
         ];
     }
 
-    public function importReplaceDataProvider()
-    {
-        return $this->exportImportDataProvider();
-    }
-
     /**
-     * @param \Magento\Catalog\Model\Product $expectedProduct
-     * @param \Magento\Catalog\Model\Product $actualProduct
+     * @inheritdoc
      */
-    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
-    {
+    protected function assertEqualsSpecificAttributes(
+        \Magento\Catalog\Model\Product $expectedProduct,
+        \Magento\Catalog\Model\Product $actualProduct
+    ): void {
         $expectedBundleProductOptions = $expectedProduct->getExtensionAttributes()->getBundleProductOptions();
         $actualBundleProductOptions = $actualProduct->getExtensionAttributes()->getBundleProductOptions();
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
index b562879b319d6..d3a2e4c53f246 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
@@ -55,6 +55,16 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
         'is_salable', // stock indexation is not performed during import
     ];
 
+    /**
+     * @var array
+     */
+    private static $attributesToRefresh = [
+        'tax_class_id',
+    ];
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -65,12 +75,17 @@ protected function setUp()
         \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::$commonAttributesCache = [];
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown()
     {
-        $this->executeRollbackFixtures($this->fixtures);
+        $this->executeFixtures($this->fixtures, true);
     }
 
     /**
+     * Run import/export tests.
+     *
      * @magentoAppArea adminhtml
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
@@ -78,36 +93,60 @@ protected function tearDown()
      * @param array $fixtures
      * @param string[] $skus
      * @param string[] $skippedAttributes
+     * @return void
      * @dataProvider exportImportDataProvider
      */
-    public function testExport($fixtures, $skus, $skippedAttributes = [])
+    public function testImportExport(array $fixtures, array $skus, array $skippedAttributes = []): void
     {
         $this->fixtures = $fixtures;
-        $this->executeFixtures($fixtures, $skus);
+        $this->executeFixtures($fixtures);
         $this->modifyData($skus);
         $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
-        $this->executeExportTest($skus, $skippedAttributes);
+        $csvFile = $this->executeExportTest($skus, $skippedAttributes);
+
+        $this->executeImportReplaceTest($skus, $skippedAttributes, false, $csvFile);
+        $this->executeImportReplaceTest($skus, $skippedAttributes, true, $csvFile);
+        $this->executeImportDeleteTest($skus, $csvFile);
     }
 
-    abstract public function exportImportDataProvider();
+    /**
+     * Provide data for import/export.
+     *
+     * @return array
+     */
+    abstract public function exportImportDataProvider(): array;
 
     /**
+     * Modify data.
+     *
      * @param array $skus
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    protected function modifyData($skus)
+    protected function modifyData(array $skus): void
     {
     }
 
     /**
+     * Prepare product.
+     *
      * @param \Magento\Catalog\Model\Product $product
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function prepareProduct($product)
+    public function prepareProduct(\Magento\Catalog\Model\Product $product): void
     {
     }
 
-    protected function executeExportTest($skus, $skippedAttributes)
+    /**
+     * Execute export test.
+     *
+     * @param array $skus
+     * @param array $skippedAttributes
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    protected function executeExportTest(array $skus, array $skippedAttributes): string
     {
         $index = 0;
         $ids = [];
@@ -140,10 +179,23 @@ protected function executeExportTest($skus, $skippedAttributes)
 
             $this->assertEqualsSpecificAttributes($origProducts[$index], $newProduct);
         }
+
+        return $csvfile;
     }
 
-    private function assertEqualsOtherThanSkippedAttributes($expected, $actual, $skippedAttributes)
-    {
+    /**
+     * Assert data equals (ignore skipped attributes).
+     *
+     * @param array $expected
+     * @param array $actual
+     * @param array $skippedAttributes
+     * @return void
+     */
+    private function assertEqualsOtherThanSkippedAttributes(
+        array $expected,
+        array $actual,
+        array $skippedAttributes
+    ): void {
         foreach ($expected as $key => $value) {
             if (is_object($value) || in_array($key, $skippedAttributes)) {
                 continue;
@@ -158,134 +210,93 @@ private function assertEqualsOtherThanSkippedAttributes($expected, $actual, $ski
     }
 
     /**
-     * @magentoAppArea adminhtml
-     * @magentoDbIsolation disabled
-     * @magentoAppIsolation enabled
+     * Execute import test with delete behavior.
      *
-     * @param array $fixtures
-     * @param string[] $skus
-     * @dataProvider exportImportDataProvider
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @param array $skus
+     * @param string|null $csvFile
+     * @return void
      */
-    public function testImportDelete($fixtures, $skus, $skippedAttributes = [])
-    {
-        $this->fixtures = $fixtures;
-        $this->executeFixtures($fixtures, $skus);
-        $this->modifyData($skus);
-        $this->executeImportDeleteTest($skus);
-    }
-
-    protected function executeImportDeleteTest($skus)
+    protected function executeImportDeleteTest(array $skus, string $csvFile = null): void
     {
-        $csvfile = $this->exportProducts();
-        $this->importProducts($csvfile, \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE);
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = $this->objectManager->create(\Magento\Catalog\Model\Product::class);
+        $csvFile = $csvFile ?? $this->exportProducts();
+        $this->importProducts($csvFile, \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE);
         foreach ($skus as $sku) {
             $productId = $this->productResource->getIdBySku($sku);
-            $product->load($productId);
-            $this->assertNull($product->getId());
+            $this->assertFalse($productId);
         }
     }
 
     /**
-     * Execute fixtures
+     * Execute fixtures.
      *
-     * @param array $skus
      * @param array $fixtures
+     * @param bool $rollback
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    protected function executeFixtures($fixtures, $skus = [])
+    protected function executeFixtures(array $fixtures, bool $rollback = false)
     {
         foreach ($fixtures as $fixture) {
-            $fixturePath = $this->fileSystem->getDirectoryRead(DirectoryList::ROOT)
-                ->getAbsolutePath('/dev/tests/integration/testsuite/' . $fixture);
+            $fixturePath = $this->resolveFixturePath($fixture, $rollback);
             include $fixturePath;
         }
     }
 
     /**
-     * Execute rollback fixtures
+     * Resolve fixture path.
      *
-     * @param array $fixtures
-     * @return void
+     * @param string $fixture
+     * @param bool $rollback
+     * @return string
      */
-    private function executeRollbackFixtures($fixtures)
+    private function resolveFixturePath(string $fixture, bool $rollback = false)
     {
-        foreach ($fixtures as $fixture) {
-            $fixturePath = $this->fileSystem->getDirectoryRead(DirectoryList::ROOT)
-                ->getAbsolutePath('/dev/tests/integration/testsuite/' . $fixture);
+        $fixturePath = $this->fileSystem->getDirectoryRead(DirectoryList::ROOT)
+            ->getAbsolutePath('/dev/tests/integration/testsuite/' . $fixture);
+        if ($rollback) {
             $fileInfo = pathinfo($fixturePath);
             $extension = '';
             if (isset($fileInfo['extension'])) {
                 $extension = '.' . $fileInfo['extension'];
             }
-            $rollbackfixturePath = $fileInfo['dirname'] . '/' . $fileInfo['filename'] . '_rollback' . $extension;
-            if (file_exists($rollbackfixturePath)) {
-                include $rollbackfixturePath;
-            }
+            $fixturePath = $fileInfo['dirname'] . '/' . $fileInfo['filename'] . '_rollback' . $extension;
         }
+
+        return $fixturePath;
     }
 
     /**
+     * Assert that specific attributes equal.
+     *
      * @param \Magento\Catalog\Model\Product $expectedProduct
      * @param \Magento\Catalog\Model\Product $actualProduct
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
-    {
+    protected function assertEqualsSpecificAttributes(
+        \Magento\Catalog\Model\Product $expectedProduct,
+        \Magento\Catalog\Model\Product $actualProduct
+    ): void {
         // check custom options
     }
 
     /**
-     * @magentoAppArea adminhtml
-     * @magentoDbIsolation disabled
-     * @magentoAppIsolation enabled
+     * Execute import test with replace behavior.
      *
-     * @param array $fixtures
-     * @param string[] $skus
-     * @param string[] $skippedAttributes
-     * @dataProvider importReplaceDataProvider
-     */
-    public function testImportReplace($fixtures, $skus, $skippedAttributes = [])
-    {
-        $this->fixtures = $fixtures;
-        $this->executeFixtures($fixtures, $skus);
-        $this->modifyData($skus);
-        $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
-        $this->executeImportReplaceTest($skus, $skippedAttributes);
-    }
-
-    /**
-     * @magentoAppArea adminhtml
-     * @magentoDbIsolation disabled
-     * @magentoAppIsolation enabled
-     *
-     * @param array $fixtures
-     * @param string[] $skus
-     * @param string[] $skippedAttributes
-     * @dataProvider importReplaceDataProvider
-     */
-    public function testImportReplaceWithPagination($fixtures, $skus, $skippedAttributes = [])
-    {
-        $this->fixtures = $fixtures;
-        $this->executeFixtures($fixtures, $skus);
-        $this->modifyData($skus);
-        $skippedAttributes = array_merge(self::$skippedAttributes, $skippedAttributes);
-        $this->executeImportReplaceTest($skus, $skippedAttributes, true);
-    }
-
-    /**
      * @param string[] $skus
      * @param string[] $skippedAttributes
      * @param bool $usePagination
-     *
+     * @param string|null $csvfile
+     * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagination = false)
-    {
+    protected function executeImportReplaceTest(
+        $skus,
+        $skippedAttributes,
+        $usePagination = false,
+        string $csvfile = null
+    ) {
         $replacedAttributes = [
             'row_id',
             'entity_id',
@@ -293,6 +304,7 @@ protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagin
             'media_gallery'
         ];
         $skippedAttributes = array_merge($replacedAttributes, $skippedAttributes);
+        $this->cleanAttributesCache();
 
         $index = 0;
         $ids = [];
@@ -316,15 +328,15 @@ protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagin
             $itemsPerPageProperty->setValue($exportProduct, 1);
         }
 
-        $csvfile = $this->exportProducts($exportProduct);
+        $csvfile = $csvfile ?? $this->exportProducts($exportProduct);
         $this->importProducts($csvfile, \Magento\ImportExport\Model\Import::BEHAVIOR_REPLACE);
 
         while ($index > 0) {
             $index--;
             $newProduct = $productRepository->get($skus[$index], false, Store::DEFAULT_STORE_ID, true);
             // check original product is deleted
-            $origProduct = $this->objectManager->create(\Magento\Catalog\Model\Product::class)->load($ids[$index]);
-            $this->assertNull($origProduct->getId());
+            $productId = $this->productResource->getIdBySku($ids[$index]);
+            $this->assertFalse($productId);
 
             // check new product data
             // @todo uncomment or remove after MAGETWO-49806 resolved
@@ -342,7 +354,7 @@ protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagin
                         array_filter($origProductData[$attribute]) :
                         $origProductData[$attribute];
                     if (!empty($expected)) {
-                        $actual = isset($newProductData[$attribute]) ? $newProductData[$attribute] : null;
+                        $actual = $newProductData[$attribute] ?? null;
                         $actual = is_array($actual) ? array_filter($actual) : $actual;
                         $this->assertNotEquals($expected, $actual, $attribute . ' is expected to be changed');
                     }
@@ -352,7 +364,7 @@ protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagin
     }
 
     /**
-     * Export products in the system
+     * Export products in the system.
      *
      * @param \Magento\CatalogImportExport\Model\Export\Product|null $exportProduct
      * @return string Return exported file name
@@ -371,17 +383,18 @@ private function exportProducts(\Magento\CatalogImportExport\Model\Export\Produc
             )
         );
         $this->assertNotEmpty($exportProduct->export());
+
         return $csvfile;
     }
 
     /**
-     * Import products from the given file
+     * Import products from the given file.
      *
      * @param string $csvfile
      * @param string $behavior
      * @return void
      */
-    private function importProducts($csvfile, $behavior)
+    private function importProducts(string $csvfile, string $behavior): void
     {
         /** @var \Magento\CatalogImportExport\Model\Import\Product $importModel */
         $importModel = $this->objectManager->create(
@@ -437,15 +450,33 @@ private function importProducts($csvfile, $behavior)
     }
 
     /**
+     * Extract error message.
+     *
      * @param \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError[] $errors
      * @return string
      */
-    private function extractErrorMessage($errors)
+    private function extractErrorMessage(array $errors): string
     {
         $errorMessage = '';
         foreach ($errors as $error) {
             $errorMessage = "\n" . $error->getErrorMessage();
         }
+
         return $errorMessage;
     }
+
+    /**
+     * Clean import attribute cache.
+     *
+     * @return void
+     */
+    private function cleanAttributesCache(): void
+    {
+        foreach (self::$attributesToRefresh as $attributeCode) {
+            $attributeId = Import\Product\Type\AbstractType::$attributeCodeToId[$attributeCode] ?? null;
+            if ($attributeId !== null) {
+                unset(Import\Product\Type\AbstractType::$commonAttributesCache[$attributeId]);
+            }
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
index 11cc73e2cf944..c39acbc338727 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/ProductTest.php
@@ -10,18 +10,10 @@
  */
 class ProductTest extends AbstractProductExportImportTestCase
 {
-    /**
-     * Set up
-     */
-    protected function setUp()
-    {
-        $this->markTestSkipped('MAGETWO-97378');
-    }
-
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function exportImportDataProvider()
+    public function exportImportDataProvider(): array
     {
         return [
             'product_export_data' => [
@@ -144,11 +136,6 @@ public function exportImportDataProvider()
         ];
     }
 
-    public function importReplaceDataProvider()
-    {
-        return $this->exportImportDataProvider();
-    }
-
     /**
      * Fixing https://github.com/magento-engcom/import-export-improvements/issues/50 means that during import images
      * can now get renamed for this we need to skip the attribute checking and instead check that the images contain
@@ -158,8 +145,10 @@ public function importReplaceDataProvider()
      * @param \Magento\Catalog\Model\Product $expectedProduct
      * @param \Magento\Catalog\Model\Product $actualProduct
      */
-    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
-    {
+    protected function assertEqualsSpecificAttributes(
+        \Magento\Catalog\Model\Product $expectedProduct,
+        \Magento\Catalog\Model\Product $actualProduct
+    ): void {
         if (!empty($actualProduct->getImage())
             && !empty($expectedProduct->getImage())
         ) {
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
index 5184a37563317..338daa56450d4 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableImportExport/Model/ConfigurableTest.php
@@ -9,7 +9,10 @@
 
 class ConfigurableTest extends AbstractProductExportImportTestCase
 {
-    public function exportImportDataProvider()
+    /**
+     * @return array
+     */
+    public function exportImportDataProvider(): array
     {
         return [
             'configurable-product' => [
@@ -34,11 +37,12 @@ public function exportImportDataProvider()
     }
 
     /**
-     * @param \Magento\Catalog\Model\Product $expectedProduct
-     * @param \Magento\Catalog\Model\Product $actualProduct
+     * @inheritdoc
      */
-    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
-    {
+    protected function assertEqualsSpecificAttributes(
+        \Magento\Catalog\Model\Product $expectedProduct,
+        \Magento\Catalog\Model\Product $actualProduct
+    ): void {
         /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable $productType */
         $productType = $expectedProduct->getTypeInstance();
         $expectedAssociatedProducts = $productType->getUsedProductCollection($expectedProduct);
@@ -95,12 +99,16 @@ protected function assertEqualsSpecificAttributes($expectedProduct, $actualProdu
         }
     }
 
-    public function importReplaceDataProvider()
-    {
-        $data = $this->exportImportDataProvider();
-        foreach ($data as $key => $value) {
-            $data[$key][2] = array_merge($value[2], ['_cache_instance_product_set_attributes']);
-        }
-        return $data;
+    /**
+     * @inheritdoc
+     */
+    protected function executeImportReplaceTest(
+        $skus,
+        $skippedAttributes,
+        $usePagination = false,
+        string $csvfile = null
+    ) {
+        $skippedAttributes = array_merge($skippedAttributes, ['_cache_instance_product_set_attributes']);
+        parent::executeImportReplaceTest($skus, $skippedAttributes, $usePagination, $csvfile);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php b/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
index c80cd13a1683b..d0e4471e2ea68 100644
--- a/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
+++ b/dev/tests/integration/testsuite/Magento/DownloadableImportExport/Model/DownloadableTest.php
@@ -9,7 +9,10 @@
 
 class DownloadableTest extends AbstractProductExportImportTestCase
 {
-    public function exportImportDataProvider()
+    /**
+     * @return array
+     */
+    public function exportImportDataProvider(): array
     {
         return [
             'downloadable-product' => [
@@ -31,79 +34,32 @@ public function exportImportDataProvider()
         ];
     }
 
-    public function importReplaceDataProvider()
-    {
-        return $this->exportImportDataProvider();
-    }
-
-    /**
-     * @param array $fixtures
-     * @param string[] $skus
-     * @param string[] $skippedAttributes
-     * @dataProvider exportImportDataProvider
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     *
-     * @todo remove after MAGETWO-38240 resolved
-     */
-    public function testExport($fixtures, $skus, $skippedAttributes = [], $rollbackFixtures = [])
-    {
-        $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
-    }
-
-    /**
-     * @param array $fixtures
-     * @param string[] $skus
-     * @dataProvider exportImportDataProvider
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     *
-     * @todo remove after MAGETWO-38240 resolved
-     */
-    public function testImportDelete($fixtures, $skus, $skippedAttributes = [], $rollbackFixtures = [])
-    {
-        $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
-    }
-
     /**
-     * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
-     * @magentoAppIsolation enabled
-     *
-     * @param array $fixtures
-     * @param string[] $skus
-     * @param string[] $skippedAttributes
-     * @dataProvider importReplaceDataProvider
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * Run import/export tests.
      *
-     * @todo remove after MAGETWO-38240 resolved
-     */
-    public function testImportReplace($fixtures, $skus, $skippedAttributes = [], $rollbackFixtures = [])
-    {
-        $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
-    }
-
-    /**
      * @magentoAppArea adminhtml
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      *
      * @param array $fixtures
      * @param string[] $skus
      * @param string[] $skippedAttributes
-     * @dataProvider importReplaceDataProvider
-     *
+     * @return void
+     * @dataProvider exportImportDataProvider
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function testImportReplaceWithPagination($fixtures, $skus, $skippedAttributes = [])
+    public function testImportExport(array $fixtures, array $skus, array $skippedAttributes = []): void
     {
         $this->markTestSkipped('Uncomment after MAGETWO-38240 resolved');
     }
 
     /**
-     * @param \Magento\Catalog\Model\Product $expectedProduct
-     * @param \Magento\Catalog\Model\Product $actualProduct
+     * @inheritdoc
      */
-    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
-    {
+    protected function assertEqualsSpecificAttributes(
+        \Magento\Catalog\Model\Product $expectedProduct,
+        \Magento\Catalog\Model\Product $actualProduct
+    ): void {
         $expectedProductLinks   = $expectedProduct->getExtensionAttributes()->getDownloadableProductLinks();
         $expectedProductSamples = $expectedProduct->getExtensionAttributes()->getDownloadableProductSamples();
 
diff --git a/dev/tests/integration/testsuite/Magento/GroupedImportExport/Model/GroupedTest.php b/dev/tests/integration/testsuite/Magento/GroupedImportExport/Model/GroupedTest.php
index 67817b068ff09..afd515757ae4b 100644
--- a/dev/tests/integration/testsuite/Magento/GroupedImportExport/Model/GroupedTest.php
+++ b/dev/tests/integration/testsuite/Magento/GroupedImportExport/Model/GroupedTest.php
@@ -9,7 +9,10 @@
 
 class GroupedTest extends AbstractProductExportImportTestCase
 {
-    public function exportImportDataProvider()
+    /**
+     * @return array
+     */
+    public function exportImportDataProvider(): array
     {
         return [
             'grouped-product' => [
@@ -23,17 +26,13 @@ public function exportImportDataProvider()
         ];
     }
 
-    public function importReplaceDataProvider()
-    {
-        return $this->exportImportDataProvider();
-    }
-
     /**
-     * @param \Magento\Catalog\Model\Product $expectedProduct
-     * @param \Magento\Catalog\Model\Product $actualProduct
+     * @inheritdoc
      */
-    protected function assertEqualsSpecificAttributes($expectedProduct, $actualProduct)
-    {
+    protected function assertEqualsSpecificAttributes(
+        \Magento\Catalog\Model\Product $expectedProduct,
+        \Magento\Catalog\Model\Product $actualProduct
+    ): void {
         $expectedAssociatedProducts = $expectedProduct->getTypeInstance()->getAssociatedProducts($expectedProduct);
         $actualAssociatedProducts = $actualProduct->getTypeInstance()->getAssociatedProducts($actualProduct);
 

From 048af5027511e68bdd4b0671f2f406cc37cac1f3 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Tue, 15 Jan 2019 10:26:36 -0600
Subject: [PATCH 659/932] MQE-1408: Deliver weekly MTF to MFTF conversion PR

---
 .../Test/TestCase/Category/DeleteCategoryEntityTest.xml     | 3 +++
 .../Test/TestCase/Category/UpdateCategoryEntityTest.xml     | 6 ++++++
 .../Test/TestCase/Product/CreateFlatCatalogProductTest.xml  | 1 +
 .../Catalog/Test/TestCase/Product/MassProductUpdateTest.xml | 1 +
 4 files changed, 11 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml
index 6951194308bc9..77ed04d40b77a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.xml
@@ -8,11 +8,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Category\DeleteCategoryEntityTest" summary="Delete Category" ticketId="MAGETWO-23303">
         <variation name="DeleteCategoryEntityTestVariation1_RootCategory" summary="Can delete a root category not assigned to any store">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="category/dataset" xsi:type="string">root_category</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategorySuccessDeleteMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryAbsenceOnBackend" />
         </variation>
         <variation name="DeleteCategoryEntityTestVariation2_Subcategory" summary="Can delete a subcategory">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="category/dataset" xsi:type="string">root_subcategory</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategorySuccessDeleteMessage" />
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryNotInGrid" />
@@ -20,6 +22,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryAbsenceOnFrontend" />
         </variation>
         <variation name="DeleteCategoryEntityTestVariation3_RootCategory_AssignedToStore" summary="Cannot delete root category assigned to some store">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="category/dataset" xsi:type="string">default_category</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryCannotBeDeleted" />
         </variation>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
index 76d5a532271ef..1cda62997e189 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Category\UpdateCategoryEntityTest" summary="Update Category" ticketId="MAGETWO-23290">
         <variation name="UpdateCategoryEntityTestVariation1_Name_Description_UrlKey_MetaTitle_ExcludeFromMenu">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
             <data name="category/data/name" xsi:type="string">Name%isolation%</data>
             <data name="category/data/include_in_menu" xsi:type="string">No</data>
@@ -22,6 +23,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
         </variation>
         <variation name="UpdateCategoryEntityTestVariation2_SortProductsBy_DefaultProductSorting_AddProduct">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
             <data name="category/data/available_product_listing_config" xsi:type="string">Yes</data>
             <data name="category/data/default_product_listing_config" xsi:type="string">No</data>
@@ -36,6 +38,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryForAssignedProducts" />
         </variation>
         <variation name="UpdateCategoryEntityTestVariation3_MakeInactive">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
             <data name="category/data/is_active" xsi:type="string">No</data>
             <data name="category/data/name" xsi:type="string">Name%isolation%</data>
@@ -44,6 +47,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryIsNotActive" />
         </variation>
         <variation name="UpdateCategoryEntityTestVariation4_ChangeCategoryNameOnStoreView" summary="Update Category with custom Store View.">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="category/data/store_id/dataset" xsi:type="string">custom</data>
 	        <data name="category/data/use_default_name" xsi:type="string">No</data>
             <data name="category/data/name" xsi:type="string">Category %isolation%</data>
@@ -51,6 +55,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryWithCustomStoreOnFrontend" />
         </variation>
         <variation name="UpdateCategoryEntityTestVariation5_ChangeCategoryUrlOnStoreView" summary="Update URL Key with custom Store View." ticketId="MAGETWO-16471">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
             <data name="category/data/store_id/dataset" xsi:type="string">custom</data>
             <data name="category/data/use_default_url_key" xsi:type="string">No</data>
@@ -59,6 +64,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryOnCustomStore" />
         </variation>
         <variation name="UpdateCategoryEntityTestVariation6_CheckCategoryDefaultUrlOnStoreView" summary="Check default URL Key on the custom Store View." ticketId="MAGETWO-64337">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCategory/dataset" xsi:type="string">default_with_custom_url</data>
             <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
             <data name="category/data/store_id/dataset" xsi:type="string">custom</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml
index e38bd8a31932d..45161e1471f66 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateFlatCatalogProductTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\CreateFlatCatalogProductTest" summary="Create flat catalog Product" ticketId="MAGETWO-67570">
         <variation name="CheckPaginationInStorefront"  ticketId="MAGETWO-67570">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="configData" xsi:type="string">category_flat,product_flat</data>
             <data name="productsCount" xsi:type="number">19</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertPaginationCorrectOnStoreFront" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml
index 6f3803d832c6d..d2fe51ecd810d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/MassProductUpdateTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\MassProductUpdateTest" summary="Edit Products Using Mass Actions" ticketId="MAGETWO-21128">
         <variation name="MassProductPriceUpdateTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="configData" xsi:type="string">product_flat</data>
             <data name="initialProducts/0" xsi:type="string">catalogProductSimple::simple_10_dollar</data>
             <data name="initialProducts/1" xsi:type="string">catalogProductSimple::simple_10_dollar</data>

From 3a669e8a9151f63a4910fa090f002e736137a08c Mon Sep 17 00:00:00 2001
From: Pratik Oza <magepratik@gmail.com>
Date: Tue, 15 Jan 2019 22:02:52 +0530
Subject: [PATCH 660/932] Fixed a couple of spelling mistakes

---
 .../Magento/Customer/Model/CustomerMetadataTest.php       | 8 ++++----
 lib/internal/LinLibertineFont/ChangeLog.txt               | 2 +-
 .../Magento/Framework/DB/Adapter/AdapterInterface.php     | 2 +-
 .../src/Magento/Setup/Console/Command/InstallCommand.php  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index 794fce17480fa..a5c69bcd3239e 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -239,10 +239,10 @@ public function testGetCustomerAttributeMetadata()
         $this->assertNotEmpty($attributes);
 
         // remove odd extension attributes
-        $allAtrributes = $expectAttrsWithVals;
-        $allAtrributes['created_at'] = $attributes['created_at'];
-        $allAtrributes['updated_at'] = $attributes['updated_at'];
-        $attributes = array_intersect_key($attributes, $allAtrributes);
+        $allAttributes = $expectAttrsWithVals;
+        $allAttributes['created_at'] = $attributes['created_at'];
+        $allAttributes['updated_at'] = $attributes['updated_at'];
+        $attributes = array_intersect_key($attributes, $allAttributes);
 
         foreach ($attributes as $attributeCode => $attributeValue) {
             $this->assertNotNull($attributeCode);
diff --git a/lib/internal/LinLibertineFont/ChangeLog.txt b/lib/internal/LinLibertineFont/ChangeLog.txt
index 8dc2c56567a4b..83b8792e71eda 100644
--- a/lib/internal/LinLibertineFont/ChangeLog.txt
+++ b/lib/internal/LinLibertineFont/ChangeLog.txt
@@ -952,7 +952,7 @@ Changes to version 0.5.8 regular(|) & italic(/) (20040315)
 Changes to version 0.5.7 regular(|) & italic(/) (20040315)
 -N is now 66pt wider
 -^ {Ascicircum} is now better
-- {exclamdown} is now availible
+- {exclamdown} is now available
 - {currency} has been added
 | "-" hyphen is the same as softhyphen. length is now 510pt
 -bars have been made
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 5c9bc9c2fb2d7..48d488a322cb0 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -633,7 +633,7 @@ public function quoteInto($text, $value, $type = null, $count = null);
     /**
      * Quotes an identifier.
      *
-     * Accepts a string representing a qualified indentifier. For Example:
+     * Accepts a string representing a qualified identifier. For Example:
      * <code>
      * $adapter->quoteIdentifier('myschema.mytable')
      * </code>
diff --git a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
index 74c2e3b24234c..cc1cca74ed6df 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
@@ -183,7 +183,7 @@ protected function configure()
                 self::INPUT_KEY_INTERACTIVE_SETUP,
                 self::INPUT_KEY_INTERACTIVE_SETUP_SHORTCUT,
                 InputOption::VALUE_NONE,
-                'Interactive Magento instalation'
+                'Interactive Magento installation'
             ),
             new InputOption(
                 OperationsExecutor::KEY_SAFE_MODE,

From 794d54633e8cdd291d0ae4181db5cdfcc809b597 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Tue, 15 Jan 2019 11:12:50 -0600
Subject: [PATCH 661/932] MC-4394: Convert CreateVirtualProductEntityTest to
 MFTF

Addressing review comments.
---
 .../ActionGroup/AdminProductActionGroup.xml   |  2 +
 .../ActionGroup/CustomOptionsActionGroup.xml  |  6 +++
 .../Catalog/Test/Mftf/Data/ProductData.xml    | 14 ++---
 .../AdminCategoryProductsGridSection.xml      |  4 --
 ...AdminProductCustomizableOptionsSection.xml |  1 +
 ...minProductFormAdvancedInventorySection.xml |  2 +-
 .../Mftf/Section/AdminProductFormSection.xml  | 34 ++++++------
 .../Section/AdminProductGridFilterSection.xml |  4 +-
 .../StorefrontProductInfoMainSection.xml      |  1 +
 ...alProductFillingRequiredFieldsOnlyTest.xml |  9 +++-
 ...tualProductOutOfStockWithTierPriceTest.xml | 12 ++---
 ...CustomOptionsSuiteAndImportOptionsTest.xml | 12 ++---
 ...roductWithTierPriceForGeneralGroupTest.xml | 52 ++++++++++--------
 ...nCreateVirtualProductWithTierPriceTest.xml | 46 +++++++++-------
 ...teVirtualProductWithoutManageStockTest.xml | 12 ++---
 .../CreateVirtualProductEntityTest.xml        | 54 +++++++++----------
 16 files changed, 142 insertions(+), 123 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 0499a5d6bb772..744660c1c4a62 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -157,11 +157,13 @@
         <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[{{category.name}}]" stepKey="searchAndSelectCategory"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
         <fillField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
+
         <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection"/>
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeOpenDropDown}}" stepKey="openTypeDropDown"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeTextField}}" stepKey="selectTypeTextField"/>
         <fillField userInput="20" selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput}}" stepKey="fillMaxChars"/>
+
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
         <seeInField userInput="{{simpleProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="assertFieldName"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
index 04114b33291e4..58cd3c5d86c6d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -26,9 +26,12 @@
 
         <!-- Add three radio options based on the parameter -->
         <click stepKey="clickAddValue" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
+
         <fillField stepKey="fillInValueTitle" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{productOption.title}}"/>
         <fillField stepKey="fillInValuePrice" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{productOption.price}}"/>
+
         <click stepKey="clickAddValue2" selector="{{AdminProductCustomizableOptionsSection.addValue}}"/>
+
         <fillField stepKey="fillInValueTitle2" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{productOption2.title}}"/>
         <fillField stepKey="fillInValuePrice2" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{productOption2.price}}"/>
     </actionGroup>
@@ -45,5 +48,8 @@
         <click selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}" stepKey="openTypeSelect"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionType('File')}}" stepKey="selectTypeFile"/>
         <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" stepKey="waitForElements"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('0')}}" userInput="{{option.price}}" stepKey="fillPrice"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions('0')}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 7a6ea5e380c4f..e0e38e6de7825 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -488,7 +488,8 @@
     <entity name="virtualProductBigQty" type="product">
         <data key="name" unique="suffix">VirtualProduct</data>
         <data key="sku" unique="suffix">virtual_sku</data>
-        <data key="price">100</data>
+        <data key="price">100.00</data>
+        <data key="productTaxClass">None</data>
         <data key="quantity">999</data>
         <data key="status">In Stock</data>
         <data key="visibility">Catalog, Search</data>
@@ -499,6 +500,7 @@
         <data key="name" unique="suffix">VirtualProduct</data>
         <data key="sku" unique="suffix">virtual_sku</data>
         <data key="price">100.00</data>
+        <data key="productTaxClass">None</data>
         <data key="quantity">999</data>
         <data key="status">In Stock</data>
         <data key="visibility">Catalog, Search</data>
@@ -511,7 +513,6 @@
         <data key="price">9,000.00</data>
         <data key="quantity">999</data>
         <data key="status">In Stock</data>
-        <data key="visibility">Catalog, Search</data>
         <data key="urlKey" unique="suffix">virtual-product</data>
         <data key="storefrontStatus">IN STOCK</data>
         <data key="type_id">virtual</data>
@@ -532,17 +533,8 @@
         <data key="price">9,000.00</data>
         <data key="quantity">999</data>
         <data key="status">Out of Stock</data>
-        <data key="visibility">Catalog, Search</data>
         <data key="urlKey" unique="suffix">virtual-product</data>
         <data key="storefrontStatus">OUT OF STOCK</data>
         <data key="type_id">virtual</data>
     </entity>
-    <entity name="virtualProductAssignToCategory" type="product">
-        <data key="name" unique="suffix">VirtualProduct</data>
-        <data key="sku" unique="suffix">virtual_sku</data>
-        <data key="price">10.00</data>
-        <data key="quantity">999</data>
-        <data key="urlKey" unique="suffix">virtual-product</data>
-        <data key="type_id">virtual</data>
-    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
index 5092e80e9307a..40ea919226d6e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryProductsGridSection.xml
@@ -15,9 +15,5 @@
         <element name="rowPrice" type="text" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-price" parameterized="true"/>
         <element name="rowPosition" type="input" selector="#catalog_category_products_table tbody tr:nth-of-type({{row}}) .col-position .position input" timeout="30" parameterized="true"/>
         <element name="productGridNameProduct" type="text" selector="//table[@id='catalog_category_products_table']//td[contains(., '{{productName}}')]" parameterized="true"/>
-        <element name="searchCategory" type="input" selector="//*[@data-index='category_ids']//input[contains(@class, 'multiselect-search')]"/>
-        <element name="selectCategory" type="input" selector="//*[@data-index='category_ids']//label[contains(., '$$categoryEntity.name$$')]"/>
-        <element name="done" type="button" selector="//*[@data-index='category_ids']//button[@data-action='close-advanced-select']" timeout="30"/>
-        <element name="selectMultipleCategories" type="input" selector="//*[@data-index='container_category_ids']//*[contains(@class, '_selected')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
index 422b4c07f7c5b..cbe4dee76b93b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -19,6 +19,7 @@
         <element name="optionTypeOpenDropDown" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-select" timeout="30"/>
         <element name="optionTypeTextField" type="button" selector=".admin__dynamic-rows[data-index='options'] .action-menu._active li li" timeout="30"/>
         <element name="maxCharactersInput" type="input" selector="input[name='product[options][0][max_characters]']"/>
+
         <element name="optionTypeDropDown" type="select" selector="//table[@data-index='options']//tr[{{index}}]//div[@data-index='type']//div[contains(@class, 'action-select-wrap')]" parameterized="true" />
         <element name="optionTypeItem" type="select" selector="//table[@data-index='options']//tr[{{index}}]//div[@data-index='type']//*[contains(@class, 'action-menu-item')]//*[contains(., '{{optionValue}}')]" parameterized="true" />
         <element name="checkSelect" type="select" selector="//span[text()='{{var1}}']/parent::div/parent::div/parent::div//span[text()='Option Type']/parent::label/parent::div/parent::div//div[@data-role='selected-option']" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
index 71dd49fd77e49..a1bb27bb45a29 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedInventorySection.xml
@@ -16,7 +16,7 @@
         <element name="qtyUsesDecimalsOptions" type="select" selector="//*[@name='product[stock_data][is_qty_decimal]']//option[contains(@value, '{{var1}}')]" parameterized="true"/>
         <element name="qtyIncrements" type="input" selector="//input[@name='product[stock_data][qty_increments]']"/>
         <element name="qtyIncrementsUseConfigSettings" type="checkbox" selector="//input[@name='product[stock_data][use_config_qty_increments]']"/>
-        <element name="doneButton" type="button" selector="//aside[contains(@class,'product_form_product_form_advanced_inventory_modal')]//button[contains(@data-role,'action')]" timeout="30"/>
+        <element name="doneButton" type="button" selector="//aside[contains(@class,'product_form_product_form_advanced_inventory_modal')]//button[contains(@data-role,'action')]" timeout="5"/>
         <element name="useConfigSettings" type="checkbox" selector="//input[@name='product[stock_data][use_config_manage_stock]']"/>
         <element name="manageStock" type="select" selector="//*[@name='product[stock_data][manage_stock]']"/>
     </section>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 1ac9de4dbacee..9ddb0a6591573 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -25,7 +25,7 @@
         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
         <element name="productTaxClass" type="select" selector="//*[@name='product[tax_class_id]']"/>
         <element name="productTaxClassUseDefault" type="checkbox" selector="input[name='use_default[tax_class_id]']"/>
-        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']" timeout="30"/>
+        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/>
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
         <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]"/>
@@ -38,7 +38,7 @@
         <element name="priceFieldError" type="text" selector="//input[@name='product[price]']/parent::div/parent::div/label[@class='admin__field-error']"/>
         <element name="addAttributeBtn" type="button" selector="#addAttribute"/>
         <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
-        <element name="save" type="button" selector="#save-button" timeout="30"/>
+        <element name="save" type="button" selector="#save-button"/>
         <element name="successMessage" type="text" selector="#messages"/>
         <element name="attributeTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Attributes']"/>
         <element name="attributeLabel" type="input" selector="//input[@name='frontend_label[0]']"/>
@@ -52,6 +52,10 @@
         <element name="setProductAsNewTo" type="input" selector="input[name='product[news_to_date]']"/>
         <element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//span[text()='{{attributeLabel}}']" parameterized="true"/>
         <element name="customSelectField" type="select" selector="//select[@name='product[{{var}}]']" parameterized="true"/>
+        <element name="searchCategory" type="input" selector="//*[@data-index='category_ids']//input[contains(@class, 'multiselect-search')]"/>
+        <element name="selectCategory" type="input" selector="//*[@data-index='category_ids']//label[contains(., '{{categoryName}}')]" parameterized="true"/>
+        <element name="done" type="button" selector="//*[@data-index='category_ids']//button[@data-action='close-advanced-select']" timeout="30"/>
+        <element name="selectMultipleCategories" type="input" selector="//*[@data-index='container_category_ids']//*[contains(@class, '_selected')]"/>
     </section>
     <section name="ProductInWebsitesSection">
         <element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>
@@ -80,19 +84,19 @@
         <element name="TextArea" type ="text" selector="//div[@data-index='{{var1}}']//textarea" parameterized="true"/>
         <element name="showHideBtn" type="button" selector="//button[contains(@id,'{{var1}}')]" parameterized="true"/>
         <element name="InsertImageBtn" type="button" selector="//div[contains(@id, '{{var1}}')]//span[text()='Insert Image...']" parameterized="true"/>
-        <element name="Style" type="button" selector="//div[contains(@id, '{{var1}}')]//span[text()='Paragraph']" parameterized="true" timeout="30"/>
-        <element name="Bold" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true" timeout="30"/>
-        <element name="Italic" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true" timeout="30"/>
-        <element name="Underline" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-underline']" parameterized="true" timeout="30"/>
-        <element name="AlignLeft" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignleft']" parameterized="true" timeout="30"/>
-        <element name="AlignCenter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-aligncenter']" parameterized="true" timeout="30"/>
-        <element name="AlignRight" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignright']" parameterized="true" timeout="30"/>
-        <element name="Numlist" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bullist']" parameterized="true" timeout="30"/>
-        <element name="Bullet" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-numlist']" parameterized="true" timeout="30"/>
-        <element name="InsertLink" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-link']" parameterized="true" timeout="30"/>
-        <element name="InsertImageIcon" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-image']" parameterized="true" timeout="30"/>
-        <element name="InsertTable" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-table']" parameterized="true" timeout="30"/>
-        <element name="SpecialCharacter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-charmap']" parameterized="true" timeout="30"/>
+        <element name="Style" type="button" selector="//div[contains(@id, '{{var1}}')]//span[text()='Paragraph']" parameterized="true"/>
+        <element name="Bold" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true"/>
+        <element name="Italic" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bold']" parameterized="true"/>
+        <element name="Underline" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-underline']" parameterized="true"/>
+        <element name="AlignLeft" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignleft']" parameterized="true"/>
+        <element name="AlignCenter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-aligncenter']" parameterized="true"/>
+        <element name="AlignRight" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-alignright']" parameterized="true"/>
+        <element name="Numlist" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-bullist']" parameterized="true"/>
+        <element name="Bullet" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-numlist']" parameterized="true"/>
+        <element name="InsertLink" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-link']" parameterized="true"/>
+        <element name="InsertImageIcon" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-image']" parameterized="true"/>
+        <element name="InsertTable" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-table']" parameterized="true"/>
+        <element name="SpecialCharacter" type="button" selector="//div[contains(@id, '{{var1}}')]//i[@class='mce-ico mce-i-charmap']" parameterized="true"/>
         <element name="TinyMCE4" type="text" selector="//div[contains(@id, '{{var1}}')]//div[@class='mce-branding-powered-by']" parameterized="true"/>
     </section>
     <section name="ProductDescriptionWYSIWYGToolbarSection">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index f606884183855..ca3e626823c47 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -21,7 +21,7 @@
         <element name="resetGridColumns" type="button" selector="//div[contains(@class, '_active')]//div[contains(@class, 'admin__data-grid-action-columns-menu')]//button[text()='Reset']"/>
         <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
-        <element name="cancelFilters" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
+        <element name="cancelFilters" type="button" selector="button[data-action='grid-filter-cancel']"/>
         <element name="nameFilter" type="input" selector="input.admin__control-text[name='name']"/>
         <element name="skuFilter" type="input" selector="input.admin__control-text[name='sku']"/>
         <element name="priceFilterFrom" type="input" selector="input.admin__control-text[name='price[from]']"/>
@@ -31,6 +31,6 @@
         <element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
         <element name="keywordSearch" type="input" selector="input#fulltext"/>
         <element name="keywordSearchButton" type="button" selector=".data-grid-search-control-wrap button.action-submit" timeout="30"/>
-        <element name="nthRow" type="block" selector=".data-row:nth-of-type(1)"/>
+        <element name="nthRow" type="block" selector=".data-row:nth-of-type({{var}})" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 07aafa1fbe7f5..af1a6a99afbf7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -36,6 +36,7 @@
         <!-- The 1st parameter is the nth custom option, the 2nd parameter is the nth value in the option -->
         <element name="nthCustomOptionInput" type="radio" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]//*[contains(@class, 'admin__field-option')][{{customOptionValueNum}}]//input" parameterized="true" />
         <element name="productOptionRadioButtonsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@price='{{var2}}']" parameterized="true"/>
+
         <element name="productOptionDataMonth" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='month']" parameterized="true"/>
         <element name="productOptionDataDay" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='day']" parameterized="true"/>
         <element name="productOptionDataYear" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='year']" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
index 80a6e5bc4d5e1..bf300c508f1e2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
@@ -15,13 +15,16 @@
             <description value="Test log in to Create virtual product and Create virtual product filling required fields only"/>
             <testCaseId value="MC-6031"/>
             <severity value="CRITICAL"/>
-            <group value="tax"/>
+            <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
 
         <before>
             <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
 
         <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
         <waitForPageLoad stepKey="waitForProductCatalogPage"/>
@@ -44,8 +47,10 @@
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickSelector"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFilter"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName1"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="fillVirtualProductSku"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickSearch2"/>
         <waitForPageLoad stepKey="waitForProductSearch"/>
-        <click selector="{{AdminProductGridFilterSection.nthRow}}" stepKey="clickFirstRowToVerifyCreatedVirtualProductAvailableInGrid"/>
+        <seeInField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="seeVirtualProductName"/>
+        <seeInField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="seeVirtualProductSku"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
index 56e0533460afe..9bc2af256d23a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
@@ -15,7 +15,7 @@
             <description value="Test log in to Create virtual product and Create virtual product out of stock with tier price"/>
             <testCaseId value="MC-6036"/>
             <severity value="CRITICAL"/>
-            <group value="tax"/>
+            <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
 
@@ -25,6 +25,7 @@
         </before>
         <after>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
         <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
@@ -52,9 +53,9 @@
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductOutOfStock.quantity}}" stepKey="fillVirtualProductQuantity"/>
         <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{virtualProductOutOfStock.status}}" stepKey="selectStockStatusOutOfStock"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
@@ -65,9 +66,9 @@
 
         <!-- Verify we see created virtual product out of stock with tier price on the storefront page -->
         <amOnPage url="{{StorefrontProductPage.url(virtualProductOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
-
         <!--  Verify customer see product tier price on product page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', tierPriceOnDefault.qty_0)}}" stepKey="firstTierPriceText"/>
         <assertEquals stepKey="assertTierPriceTextOnProductPage1">
@@ -79,7 +80,6 @@
             <expectedResult type="string">Buy {{tierPriceOnDefault.qty_1}} for ${{tierPriceOnDefault.price_1}} each and save 100%</expectedResult>
             <actualResult type="variable">secondTierPriceText</actualResult>
         </assertEquals>
-
         <!--  Verify customer see product out of stock status on product page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index f983a80da84ca..cab0a66dd3b6a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -15,7 +15,7 @@
             <description value="Test log in to Create virtual product and Create virtual product with custom options suite and import options"/>
             <testCaseId value="MC-6034"/>
             <severity value="CRITICAL"/>
-            <group value="tax"/>
+            <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
 
@@ -25,6 +25,7 @@
         </before>
         <after>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
         <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
@@ -40,10 +41,9 @@
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductCustomImportOptions.quantity}}" stepKey="fillProductQuantity"/>
         <click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-        <click selector="{{AdminProductFormSection.visibility}}" stepKey="clickVisibility"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductCustomImportOptions.urlKey}}" stepKey="fillUrlKey"/>
         <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
@@ -110,7 +110,7 @@
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
-        <!-- Verify customer see created virtual product with custom options suite and import options(from above step) on category page and is searchable by sku -->
+        <!-- Verify customer see created virtual product with custom options suite and import options(from above step) on storefront page and is searchable by sku -->
         <amOnPage url="{{StorefrontProductPage.url(virtualProductCustomImportOptions.urlKey)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
         <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{virtualProductCustomImportOptions.sku}}" stepKey="fillVirtualProductName"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
index 531c99285934f..c48f11115e6aa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
@@ -15,7 +15,7 @@
             <description value="Test log in to Create virtual product and Create virtual product with tier price for General group"/>
             <testCaseId value="MC-6033"/>
             <severity value="CRITICAL"/>
-            <group value="tax"/>
+            <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
 
@@ -26,7 +26,8 @@
         </before>
         <after>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
-            <deleteData stepKey="deleteCustomer" createDataKey="customer" />
+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
         <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
@@ -39,13 +40,6 @@
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="fillProductName"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductGeneralGroup.sku}}" stepKey="fillProductSku"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductGeneralGroup.price}}" stepKey="fillProductPrice"/>
-        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductGeneralGroup.quantity}}" stepKey="fillProductQuantity"/>
-        <click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
-        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
         <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.website}}" stepKey="selectProductTierPriceWebsite"/>
@@ -54,6 +48,13 @@
         <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnGeneralGroup.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
         <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnGeneralGroup.price}}" stepKey="fillProductTierPriceFixedPrice"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{virtualProductGeneralGroup.productTaxClass}}" stepKey="selectProductTaxClass"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductGeneralGroup.quantity}}" stepKey="fillProductQuantity"/>
+        <click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductFormSection.visibility}}" stepKey="clickVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSectionHeader"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductGeneralGroup.urlKey}}" stepKey="fillUrlKeyInput"/>
@@ -69,33 +70,39 @@
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="fillVirtualProductName"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
         <waitForPageLoad stepKey="waitForProductSearch"/>
-        <click selector="{{AdminProductGridFilterSection.nthRow}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
         <!-- Verify we see created virtual product with tier price for general group(from the above step) in the product form page -->
         <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeProductName"/>
         <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductGeneralGroup.sku}}" stepKey="seeProductSku"/>
         <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductGeneralGroup.price}}" stepKey="seeProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeOptionIsSelected selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.website}}" stepKey="seeProductTierPriceWebsite"/>
+        <seeOptionIsSelected selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.customer_group}}" stepKey="seeProductTierPriceGroup"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnGeneralGroup.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnGeneralGroup.price}}" stepKey="seeProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{virtualProductGeneralGroup.productTaxClass}}" stepKey="seeProductTaxClass"/>
         <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductGeneralGroup.quantity}}" stepKey="seeProductQuantity"/>
         <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{virtualProductGeneralGroup.status}}" stepKey="seeProductStockStatus"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-        <grabMultiple selector="{{AdminCategoryProductsGridSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
         <assertEquals stepKey="assertSelectedCategories">
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-        <seeOptionIsSelected selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.website}}" stepKey="seeProductTierPriceWebsite"/>
-        <seeOptionIsSelected selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnGeneralGroup.customer_group}}" stepKey="seeProductTierPriceGroup"/>
-        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnGeneralGroup.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
-        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnGeneralGroup.price}}" stepKey="seeProductTierPriceFixedPrice"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductGeneralGroup.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
         <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductGeneralGroup.urlKey}}" stepKey="seeUrlKey"/>
 
-        <!-- Verify customer see created virtual product with tier price for general group(from above step) in category page  -->
+        <!--Verify customer see created virtual product on category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
+
+        <!-- Verify customer see created virtual product with tier price for general group(from above step) in storefront page with customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
             <argument name="Customer" value="$$customer$$" />
         </actionGroup>
@@ -106,15 +113,14 @@
         <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
         <waitForPageLoad stepKey="waitForSearch"/>
         <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeVirtualProductName"/>
-        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnCategoryPage"/>
+        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnStorefrontPage"/>
+        <!-- Verify customer see created virtual product with tier price -->
         <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
             <expectedResult type="string">As low as ${{tierPriceOnGeneralGroup.price}}</expectedResult>
-            <actualResult type="variable">tierPriceTextOnCategoryPage</actualResult>
+            <actualResult type="variable">tierPriceTextOnStorefrontPage</actualResult>
         </assertEquals>
         <click selector="{{StorefrontQuickSearchResultsSection.productLink}}" stepKey="openSearchedProduct"/>
         <waitForPageLoad stepKey="waitForProductPageToBeLoaded"/>
-
-        <!-- Verify customer see created virtual product with tier price for general group on product page with customer -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
         <assertEquals stepKey="assertTierPriceTextOnProductPage">
             <expectedResult type="string">Buy {{tierPriceOnGeneralGroup.qty}} for ${{tierPriceOnGeneralGroup.price}} each and save 20%</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index b9c52267fb0c7..3af5919e6bc71 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -15,7 +15,7 @@
             <description value="Test log in to Create virtual product and Create virtual product with tier price"/>
             <testCaseId value="MC-6032"/>
             <severity value="CRITICAL"/>
-            <group value="tax"/>
+            <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
 
@@ -25,6 +25,7 @@
         </before>
         <after>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
         <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
@@ -37,20 +38,20 @@
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductBigQty.sku}}" stepKey="fillProductSku"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductBigQty.price}}" stepKey="fillProductPrice"/>
-        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductBigQty.quantity}}" stepKey="fillProductQuantity"/>
-        <click selector="{{AdminProductFormSection.productStockStatus}}" stepKey="clickProductStockStatus"/>
-        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
         <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
         <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
         <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
-        <click selector="{{AdminProductFormSection.visibility}}" stepKey="clickVisibility"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{virtualProductBigQty.productTaxClass}}" stepKey="selectProductTaxClass"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductBigQty.quantity}}" stepKey="fillProductQuantity"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{virtualProductBigQty.status}}" stepKey="selectStockStatusInStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductBigQty.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
@@ -65,31 +66,37 @@
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName1"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
         <waitForPageLoad stepKey="waitForProductSearch"/>
-        <click selector="{{AdminProductGridFilterSection.nthRow}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened" />
         <!-- Verify we see created virtual product with tier price(from the above step) in the product form page -->
         <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeProductName"/>
         <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductBigQty.sku}}" stepKey="seeProductSku"/>
         <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductBigQty.price}}" stepKey="seeProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{virtualProductBigQty.productTaxClass}}" stepKey="seeProductTaxClass"/>
         <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductBigQty.quantity}}" stepKey="seeProductQuantity"/>
         <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{virtualProductBigQty.status}}" stepKey="seeProductStockStatus"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
-        <grabMultiple selector="{{AdminCategoryProductsGridSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
         <assertEquals stepKey="assertSelectedCategories">
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
-        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
-        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductBigQty.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
         <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="seeUrlKey"/>
 
-        <!-- Verify customer see created virtual product with tier price(from above step) on category page and is searchable by sku -->
+        <!--Verify customer see created virtual product on category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
+
+        <!-- Verify customer see created virtual product with tier price(from above step) on storefront page and is searchable by sku -->
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
         <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{virtualProductBigQty.sku}}" stepKey="fillVirtualProductName"/>
@@ -97,14 +104,13 @@
         <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
         <waitForPageLoad stepKey="waitForSearch"/>
         <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductName"/>
-        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnCategoryPage"/>
+        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnStorefrontPage"/>
         <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
             <expectedResult type="string">As low as ${{tierPriceOnVirtualProduct.price}}</expectedResult>
-            <actualResult type="variable">tierPriceTextOnCategoryPage</actualResult>
+            <actualResult type="variable">tierPriceTextOnStorefrontPage</actualResult>
         </assertEquals>
         <click selector="{{StorefrontQuickSearchResultsSection.productLink}}" stepKey="openSearchedProduct"/>
         <waitForPageLoad stepKey="waitForProductPageToBeLoaded" />
-
         <!-- Verify customer see product tier price on product page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
         <assertEquals stepKey="assertTierPriceTextOnProductPage">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
index ef821b0af2e4f..de7f72bdecc1d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -15,7 +15,7 @@
             <description value="Test log in to Create virtual product and Create virtual product without manage stock"/>
             <testCaseId value="MC-6035"/>
             <severity value="CRITICAL"/>
-            <group value="tax"/>
+            <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
 
@@ -25,6 +25,7 @@
         </before>
         <after>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
         <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
@@ -46,9 +47,9 @@
         <checkOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="CheckUseConfigSettingsCheckBox"/>
         <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickDoneButtonOnAdvancedInventorySection"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
-        <fillField selector="{{AdminCategoryProductsGridSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-        <click selector="{{AdminCategoryProductsGridSection.selectCategory}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminCategoryProductsGridSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductWithoutManageStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
@@ -59,9 +60,9 @@
 
         <!-- Verify customer see created virtual product without manage stock on the storefront page -->
         <amOnPage url="{{StorefrontProductPage.url(virtualProductWithoutManageStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontPageToLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductWithoutManageStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductWithoutManageStock.sku}}" stepKey="seeVirtualProductSku"/>
-
         <!-- Verify customer see product special price on the storefront page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
         <assertEquals stepKey="assertSpecialPriceTextOnProductPage">
@@ -74,7 +75,6 @@
             <expectedResult type="string">${{virtualProductWithoutManageStock.price}}</expectedResult>
             <actualResult type="variable">oldPriceAmount</actualResult>
         </assertEquals>
-
         <!-- Verify customer see product in stock status on the storefront page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
index 258a490fa16fb..1449e7df0ce61 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
@@ -36,20 +36,20 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
         </variation>
-        <!--<variation name="CreateVirtualProductEntityTestVariation3">-->
-            <!--<data name="description" xsi:type="string">Create product with out of stock</data>-->
-            <!--<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>-->
-            <!--<data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>-->
-            <!--<data name="product/data/price/value" xsi:type="string">10</data>-->
-            <!--<data name="product/data/tax_class_id/dataset" xsi:type="string">taxable_goods</data>-->
-            <!--<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>-->
-            <!--<data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>-->
-            <!--<data name="product/data/price/dataset" xsi:type="string">MAGETWO-23030</data>-->
-            <!--<data name="product/data/visibility" xsi:type="string">Search</data>-->
-            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />-->
-            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductSkuAutoGenerated" />-->
-            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />-->
-        <!--</variation>-->
+        <variation name="CreateVirtualProductEntityTestVariation3">
+            <data name="description" xsi:type="string">Create product with out of stock</data>
+            <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
+            <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
+            <data name="product/data/price/value" xsi:type="string">10</data>
+            <data name="product/data/tax_class_id/dataset" xsi:type="string">taxable_goods</data>
+            <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
+            <data name="product/data/quantity_and_stock_status/is_in_stock" xsi:type="string">In Stock</data>
+            <data name="product/data/price/dataset" xsi:type="string">MAGETWO-23030</data>
+            <data name="product/data/visibility" xsi:type="string">Search</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSkuAutoGenerated" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
+        </variation>
         <variation name="CreateVirtualProductEntityTestVariation4">
             <data name="description" xsi:type="string">Create product with tier price for "General" group</data>
             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
@@ -115,18 +115,18 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
         </variation>
-        <!--<variation name="CreateVirtualProductEntityTestVariation8" summary="Create Virtual Product with Required Fields Only and Assign It to the Category" ticketId="MAGETWO-13593">-->
-            <!--<data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>-->
-            <!--<data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>-->
-            <!--<data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>-->
-            <!--<data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>-->
-            <!--<data name="product/data/price/value" xsi:type="string">10</data>-->
-            <!--<data name="product/data/category" xsi:type="string">category_%isolation%</data>-->
-            <!--<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>-->
-            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />-->
-            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />-->
-            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />-->
-            <!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />-->
-        <!--</variation>-->
+        <variation name="CreateVirtualProductEntityTestVariation8" summary="Create Virtual Product with Required Fields Only and Assign It to the Category" ticketId="MAGETWO-13593">
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
+            <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
+            <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
+            <data name="product/data/price/value" xsi:type="string">10</data>
+            <data name="product/data/category" xsi:type="string">category_%isolation%</data>
+            <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">999</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
+        </variation>
     </testCase>
 </config>

From e669fae69406f50e98757b8736717188225e3aeb Mon Sep 17 00:00:00 2001
From: Pratik Oza <magepratik@gmail.com>
Date: Tue, 15 Jan 2019 22:02:52 +0530
Subject: [PATCH 662/932] Fixed a couple of spelling mistakes

---
 .../Magento/Customer/Model/CustomerMetadataTest.php       | 8 ++++----
 .../Magento/Framework/DB/Adapter/AdapterInterface.php     | 2 +-
 .../src/Magento/Setup/Console/Command/InstallCommand.php  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index 794fce17480fa..a5c69bcd3239e 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -239,10 +239,10 @@ public function testGetCustomerAttributeMetadata()
         $this->assertNotEmpty($attributes);
 
         // remove odd extension attributes
-        $allAtrributes = $expectAttrsWithVals;
-        $allAtrributes['created_at'] = $attributes['created_at'];
-        $allAtrributes['updated_at'] = $attributes['updated_at'];
-        $attributes = array_intersect_key($attributes, $allAtrributes);
+        $allAttributes = $expectAttrsWithVals;
+        $allAttributes['created_at'] = $attributes['created_at'];
+        $allAttributes['updated_at'] = $attributes['updated_at'];
+        $attributes = array_intersect_key($attributes, $allAttributes);
 
         foreach ($attributes as $attributeCode => $attributeValue) {
             $this->assertNotNull($attributeCode);
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 5c9bc9c2fb2d7..48d488a322cb0 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -633,7 +633,7 @@ public function quoteInto($text, $value, $type = null, $count = null);
     /**
      * Quotes an identifier.
      *
-     * Accepts a string representing a qualified indentifier. For Example:
+     * Accepts a string representing a qualified identifier. For Example:
      * <code>
      * $adapter->quoteIdentifier('myschema.mytable')
      * </code>
diff --git a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
index 74c2e3b24234c..cc1cca74ed6df 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
@@ -183,7 +183,7 @@ protected function configure()
                 self::INPUT_KEY_INTERACTIVE_SETUP,
                 self::INPUT_KEY_INTERACTIVE_SETUP_SHORTCUT,
                 InputOption::VALUE_NONE,
-                'Interactive Magento instalation'
+                'Interactive Magento installation'
             ),
             new InputOption(
                 OperationsExecutor::KEY_SAFE_MODE,

From 95defccc553c652eb8493d428a1277a2e7ae2e04 Mon Sep 17 00:00:00 2001
From: Govind Sharma <govindpokhrelsharma@cedcoss.com>
Date: Wed, 16 Jan 2019 11:54:02 +0530
Subject: [PATCH 663/932] Updated changes

---
 app/design/adminhtml/Magento/backend/web/css/styles-old.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 6324625a56846..b7306007d7ebd 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -2738,7 +2738,7 @@
     //  ---------------------------------------------
 
     #widget_instace_tabs_properties_section_content .widget-option-label {
-        margin-top: 6px;
+        margin-top: 7px;
         display: inline-block;
     }
 

From 28c86bed310311247604caa6c5c3b6c165fbd4f3 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Tue, 15 Jan 2019 20:49:05 +0300
Subject: [PATCH 664/932] MAGETWO-96432: Payment method title does not update
 in the admin sales order grid

- Change title definition logic for offline payment methods
---
 app/code/Magento/Payment/Helper/Data.php      | 11 +++---
 .../Listing/Column/Method/Options.php         | 36 ++-----------------
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index f5866f68efbc9..9bea19700d452 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -261,10 +261,13 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
         $groupRelations = [];
 
         foreach ($this->getPaymentMethods() as $code => $data) {
-            if (isset($data['title'])) {
-                $methods[$code] = $data['title'];
-            } else {
-                $methods[$code] = $this->getMethodInstance($code)->getConfigData('title', $store);
+            if (!empty($data['active'])) {
+                $storedTitle = $this->getMethodInstance($code)->getConfigData('title', $store);
+                if (isset($storedTitle)) {
+                    $methods[$code] = $storedTitle;
+                } elseif (isset($data['title'])) {
+                    $methods[$code] = $data['title'];
+                }
             }
             if ($asLabelValue && $withGroups && isset($data['group'])) {
                 $groupRelations[$code] = $data['group'];
diff --git a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
index 39b8ee7dfadee..fbf80de519f9f 100644
--- a/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
+++ b/app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Payment\Ui\Component\Listing\Column\Method;
 
-use Magento\Payment\Api\PaymentMethodListInterface;
-use Magento\Store\Model\StoreManagerInterface;
-
 /**
  * Class Options
  */
@@ -23,29 +20,15 @@ class Options implements \Magento\Framework\Data\OptionSourceInterface
      */
     protected $paymentHelper;
 
-    /**
-     * @var PaymentMethodListInterface
-     */
-    private $paymentMethodList;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
     /**
      * Constructor
      *
      * @param \Magento\Payment\Helper\Data $paymentHelper
      */
     public function __construct(
-        \Magento\Payment\Helper\Data $paymentHelper,
-        \Magento\Payment\Api\PaymentMethodListInterface $paymentMethodList,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Payment\Helper\Data $paymentHelper
     ) {
         $this->paymentHelper = $paymentHelper;
-        $this->paymentMethodList = $paymentMethodList;
-        $this->storeManager = $storeManager;
     }
 
     /**
@@ -56,23 +39,8 @@ public function __construct(
     public function toOptionArray()
     {
         if ($this->options === null) {
-            $this->options = $this->getPaymentOptions();
-//            $this->options = $this->paymentHelper->getPaymentMethodList(true, true);
+            $this->options = $this->paymentHelper->getPaymentMethodList(true, true);
         }
         return $this->options;
     }
-
-    /**
-     * @return array
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function getPaymentOptions()
-    {
-        $options = [];
-        foreach ($this->paymentMethodList->getList($this->storeManager->getStore()->getId()) as $option) {
-            $options[$option->getCode()] = ['value' => $option->getCode(), 'label' => $option->getTitle()];
-        }
-        asort($options);
-        return $options;
-    }
 }

From dee890e4625a979e485e2b46e0aa6d30fda94ca6 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 16 Jan 2019 11:22:18 +0200
Subject: [PATCH 665/932] Fix static tests.

---
 .../Reports/Controller/Adminhtml/Report/Statistics.php | 10 ++++------
 .../Reports/Observer/CatalogProductViewObserver.php    |  1 +
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
index 47181e61269bc..f4d2b962b9c9c 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
@@ -4,21 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Report statistics admin controller
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Reports\Controller\Adminhtml\Report;
 
 use Magento\Backend\Model\Auth\Session as AuthSession;
 use Magento\Backend\Model\Session;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
 /**
+ * Report statistics admin controller.
+ *
  * @api
  * @since 100.0.2
  */
-abstract class Statistics extends \Magento\Backend\App\Action
+abstract class Statistics extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
index 50512d4f67da7..b3ec141ef01a7 100644
--- a/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
+++ b/app/code/Magento/Reports/Observer/CatalogProductViewObserver.php
@@ -10,6 +10,7 @@
 
 /**
  * Reports Event observer model
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class CatalogProductViewObserver implements ObserverInterface
 {

From b1e21dbabe207997ce877390bb5e58456f5a4d66 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Wed, 16 Jan 2019 11:52:32 +0200
Subject: [PATCH 666/932] Fix static tests.

---
 .../luma/Magento_Checkout/web/css/source/module/_cart.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index e3bc5a478b025..9c7b020cb4b8b 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -497,7 +497,7 @@
             }
         }
     }
-    
+
     .cart.table-wrapper,
     .order-items.table-wrapper {
         .col.price,
@@ -507,7 +507,7 @@
             text-align: left;
         }
     }
-    
+
 }
 
 //

From 66284ba513c3324fbdd66bf3d2084ce9c1a93632 Mon Sep 17 00:00:00 2001
From: Ronak Patel <ronak2ram@gmail.com>
Date: Wed, 16 Jan 2019 15:40:31 +0530
Subject: [PATCH 667/932] Correct spell in js files

---
 app/code/Magento/Ui/view/base/web/js/grid/editing/client.js | 4 ++--
 app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js | 4 ++--
 app/code/Magento/Ui/view/base/web/js/grid/editing/record.js | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
index f68a6f97d964f..ca82ff81d3b6f 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
@@ -54,7 +54,7 @@ define([
 
         /**
          * Proxy save method which might invoke
-         * data valiation prior to its' saving.
+         * data validation prior to its' saving.
          *
          * @param {Object} data - Data to be processed.
          * @returns {jQueryPromise}
@@ -128,7 +128,7 @@ define([
         /**
          * Handles ajax success callback.
          *
-         * @param {jQueryPromise} promise - Promise to be resoloved.
+         * @param {jQueryPromise} promise - Promise to be resolved.
          * @param {*} data - See 'jquery' ajax success callback.
          */
         onSuccess: function (promise, data) {
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
index a4785aea03743..ece49cc8fe27c 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
@@ -357,7 +357,7 @@ define([
 
         /**
          * Resets specific records' data
-         * to the data present in asscotiated row.
+         * to the data present in associated row.
          *
          * @param {(Number|String)} id - See 'getId' method.
          * @param {Boolean} [isIndex=false] - See 'getId' method.
@@ -403,7 +403,7 @@ define([
         /**
          * Disables editing of specified fields.
          *
-         * @param {Array} fields - An array of fields indeces to be disabled.
+         * @param {Array} fields - An array of fields indexes to be disabled.
          * @returns {Editor} Chainable.
          */
         disableFields: function (fields) {
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
index c648875e62d7c..9b8998368c5ff 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
@@ -264,7 +264,7 @@ define([
         /**
          * Validates all of the available fields.
          *
-         * @returns {Array} An array with validatation results.
+         * @returns {Array} An array with validation results.
          */
         validate: function () {
             return this.elems.map('validate');
@@ -306,7 +306,7 @@ define([
         },
 
         /**
-         * Updates 'fields' array filling it with available edtiors
+         * Updates 'fields' array filling it with available editors
          * or with column instances if associated field is not present.
          *
          * @returns {Record} Chainable.

From e6a72f050439f884cb8499a4852041d1270c102a Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 16 Jan 2019 11:15:58 +0000
Subject: [PATCH 668/932] magento/magento2#20224: Fixed indents

---
 .../Magento/luma/Magento_Review/web/css/source/_module.less | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
index f4fdf01a24ab5..4324e5f1d6a93 100644
--- a/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Review/web/css/source/_module.less
@@ -297,9 +297,9 @@
             a:not(:last-child) {
                 margin-right: 30px;
             }
-          .action.add {
-            white-space: nowrap;
-          }
+            .action.add {
+                white-space: nowrap;
+            }
         }
     }
 

From f1b194b7ca3c8e2ff8de59d471e090b0d9dc1971 Mon Sep 17 00:00:00 2001
From: "v.sikailo" <v.sikailo@ism-ukraine.com>
Date: Wed, 16 Jan 2019 13:24:02 +0200
Subject: [PATCH 669/932] deleted unused code

---
 .../Block/Adminhtml/Product/Frontend/Product/Watermark.php       | 1 -
 app/code/Magento/Catalog/Model/Product/Option/Type/Date.php      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
index 1f74969c3d169..c4cd35cdf29c5 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
@@ -130,7 +130,6 @@ public function render(AbstractElement $element)
      */
     protected function _getHeaderHtml($element)
     {
-        $id = $element->getHtmlId();
         $default = !$this->getRequest()->getParam('website') && !$this->getRequest()->getParam('store');
 
         $html = '<h4 class="icon-head head-edit-form">' . $element->getLegend() . '</h4>';
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
index b19906ecd6cc9..33c37238e5bdf 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
@@ -147,7 +147,6 @@ public function validateUserValue($values)
     public function prepareForCart()
     {
         if ($this->getIsValid() && $this->getUserValue() !== null) {
-            $option = $this->getOption();
             $value = $this->getUserValue();
 
             if (isset($value['date_internal']) && $value['date_internal'] != '') {

From b7bc23f8175572962fbb337708fa5c66edcc17bd Mon Sep 17 00:00:00 2001
From: "v.sikailo" <v.sikailo@ism-ukraine.com>
Date: Wed, 16 Jan 2019 13:44:00 +0200
Subject: [PATCH 670/932] PHPDocs fixes

---
 .../Magento/Catalog/Api/CategoryLinkRepositoryInterface.php | 2 +-
 .../Catalog/Api/Data/ProductRender/PriceInfoInterface.php   | 2 +-
 .../Magento/Catalog/Api/Data/ProductRenderInterface.php     | 4 ++--
 .../Magento/Catalog/Controller/Adminhtml/Category/Move.php  | 2 +-
 app/code/Magento/Catalog/Controller/Index/Index.php         | 2 +-
 app/code/Magento/Catalog/Helper/Product/Configuration.php   | 1 +
 app/code/Magento/Catalog/Helper/Product/ProductList.php     | 1 +
 app/code/Magento/Catalog/Helper/Product/View.php            | 2 +-
 .../Catalog/Model/Indexer/Product/Category/Action/Rows.php  | 1 +
 .../Catalog/Model/Indexer/Product/Flat/Action/Indexer.php   | 2 +-
 app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php     | 2 +-
 .../Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php | 2 +-
 .../Model/Plugin/ProductRepository/TransactionWrapper.php   | 6 +++---
 .../Magento/Catalog/Model/Product/Website/ReadHandler.php   | 2 +-
 app/code/Magento/Catalog/Model/ProductIdLocator.php         | 2 +-
 app/code/Magento/Catalog/Model/ProductRender.php            | 2 +-
 app/code/Magento/Catalog/Model/ProductRender/Image.php      | 4 ++--
 app/code/Magento/Catalog/Model/ProductRenderList.php        | 1 -
 .../Catalog/Model/ResourceModel/AbstractCollection.php      | 2 +-
 app/code/Magento/Catalog/Model/ResourceModel/Category.php   | 2 +-
 .../Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php | 1 -
 .../Product/Indexer/Price/Query/BaseFinalPrice.php          | 2 ++
 .../Product/Indexer/TemporaryTableStrategy.php              | 2 +-
 .../Model/ResourceModel/Product/Link/DeleteHandler.php      | 2 +-
 app/code/Magento/Catalog/Model/Rss/Category.php             | 2 +-
 app/code/Magento/Catalog/Model/Template/Filter.php          | 4 ++--
 .../Magento/Catalog/Plugin/Model/ResourceModel/Config.php   | 4 ++--
 .../Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php   | 2 +-
 .../Product/Form/Modifier/Eav/CompositeConfigProcessor.php  | 1 +
 .../Ui/DataProvider/Product/Listing/DataProvider.php        | 2 --
 .../Product/ProductRenderCollectorInterface.php             | 1 -
 31 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
index 30ac06107ba1d..78b0645bb29db 100644
--- a/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php
@@ -38,7 +38,7 @@ public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $p
     /**
      * Remove the product assignment from the category by category id and sku
      *
-     * @param string $sku
+     * @param int $categoryId
      * @param string $sku
      * @return bool will returned True if products successfully deleted
      *
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
index 2ef4d068317dd..d12f54c8cdc41 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
@@ -148,7 +148,7 @@ public function getFormattedPrices();
     /**
      * Set dto with formatted prices
      *
-     * @param string[] $formattedPriceInfo
+     * @param FormattedPriceInfoInterface $formattedPriceInfo
      * @return void
      * @since 101.1.0
      */
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
index 910168d8854e7..dddf046596b50 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
@@ -30,7 +30,7 @@ public function getAddToCartButton();
     /**
      * Set information needed for render "Add To Cart" button on front
      *
-     * @param \Magento\Catalog\Api\Data\ProductRender\ButtonInterface $addToCartData
+     * @param ButtonInterface $cartAddToCartButton
      * @return void
      * @since 101.1.0
      */
@@ -47,7 +47,7 @@ public function getAddToCompareButton();
     /**
      * Set information needed for render "Add To Compare" button on front
      *
-     * @param ButtonInterface $compareUrlData
+     * @param ButtonInterface $compareButton
      * @return string
      * @since 101.1.0
      */
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
index ba6bfddca9c6c..858850e45db7f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
@@ -46,7 +46,7 @@ public function __construct(
     /**
      * Move category action
      *
-     * @return \Magento\Framework\Controller\Result\Raw
+     * @return \Magento\Framework\Controller\Result\Json
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Controller/Index/Index.php b/app/code/Magento/Catalog/Controller/Index/Index.php
index eae3325df9fc2..b89f495b9edb2 100644
--- a/app/code/Magento/Catalog/Controller/Index/Index.php
+++ b/app/code/Magento/Catalog/Controller/Index/Index.php
@@ -10,7 +10,7 @@ class Index extends \Magento\Framework\App\Action\Action
     /**
      * Index action
      *
-     * @return $this
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration.php b/app/code/Magento/Catalog/Helper/Product/Configuration.php
index 9b47e29900992..5b8f6fad6e18a 100644
--- a/app/code/Magento/Catalog/Helper/Product/Configuration.php
+++ b/app/code/Magento/Catalog/Helper/Product/Configuration.php
@@ -55,6 +55,7 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
      * @param \Magento\Framework\Filter\FilterManager $filter
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param Json $serializer
+     * @param Escaper $escaper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
index fbea73a6324de..3aa6aeed3779a 100644
--- a/app/code/Magento/Catalog/Helper/Product/ProductList.php
+++ b/app/code/Magento/Catalog/Helper/Product/ProductList.php
@@ -42,6 +42,7 @@ class ProductList
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Framework\Registry $coreRegistry
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 1509e489aee3b..87e93e3f20e5b 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -105,7 +105,7 @@ public function __construct(
      *
      * @param \Magento\Framework\View\Result\Page $resultPage
      * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Framework\View\Result\Page
+     * @return $this
      */
     private function preparePageMetadata(ResultPage $resultPage, $product)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
index a218266c25034..eb58ed39b81b5 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
@@ -213,6 +213,7 @@ protected function isRangingNeeded()
     /**
      * Returns a list of category ids which are assigned to product ids in the index
      *
+     * @param array $productIds
      * @return \Magento\Framework\Indexer\CacheContext
      */
     private function getCategoryIdsFromIndex(array $productIds)
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
index a669fb73f64fc..c14bc0dd7e507 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php
@@ -54,7 +54,7 @@ public function __construct(
      * @param int $storeId
      * @param int $productId
      * @param string $valueFieldSuffix
-     * @return \Magento\Catalog\Model\Indexer\Product\Flat
+     * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.NPathComplexity)
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
index dac2632ff6db8..d76711cb21dbf 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
@@ -32,8 +32,8 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
-     * @param \Magento\Catalog\Model\ResourceModel\Layer\Filter\DecimalFactory $filterDecimalFactory
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param \Magento\Catalog\Model\Layer\Filter\DataProvider\DecimalFactory $dataProviderFactory
      * @param array $data
      */
     public function __construct(
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
index 4d2878b0b1e84..6fcce20eb3152 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Item/DataBuilder.php
@@ -29,7 +29,7 @@ class DataBuilder
      * Add Item Data
      *
      * @param string $label
-     * @param string $label
+     * @param string $value
      * @param int $count
      * @return void
      */
diff --git a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
index c88215d92357e..0f442c6bbffc9 100644
--- a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
+++ b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
@@ -25,7 +25,7 @@ public function __construct(
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param bool $saveOptions
      * @return \Magento\Catalog\Api\Data\ProductInterface
@@ -52,7 +52,7 @@ public function aroundSave(
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @return bool
      * @throws \Exception
@@ -77,7 +77,7 @@ public function aroundDelete(
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @param string $productSku
      * @return bool
      * @throws \Exception
diff --git a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
index e81cdedd6d370..5ecabd8d43529 100644
--- a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
@@ -18,7 +18,7 @@ class ReadHandler implements ExtensionInterface
 
     /**
      * ReadHandler constructor.
-     * @param ProductWebsiteLink $resourceModel
+     * @param ProductWebsiteLink $productWebsiteLink
      */
     public function __construct(
         ProductWebsiteLink $productWebsiteLink
diff --git a/app/code/Magento/Catalog/Model/ProductIdLocator.php b/app/code/Magento/Catalog/Model/ProductIdLocator.php
index 2d9af6829ad6e..66a0ece89db6d 100644
--- a/app/code/Magento/Catalog/Model/ProductIdLocator.php
+++ b/app/code/Magento/Catalog/Model/ProductIdLocator.php
@@ -40,7 +40,7 @@ class ProductIdLocator implements \Magento\Catalog\Model\ProductIdLocatorInterfa
     /**
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
-     * @param string $limitIdsBySkuValues
+     * @param int $idsLimit
      */
     public function __construct(
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
diff --git a/app/code/Magento/Catalog/Model/ProductRender.php b/app/code/Magento/Catalog/Model/ProductRender.php
index 702c04b910d44..5efb0343cd99b 100644
--- a/app/code/Magento/Catalog/Model/ProductRender.php
+++ b/app/code/Magento/Catalog/Model/ProductRender.php
@@ -206,7 +206,7 @@ public function getExtensionAttributes()
      * Set an extension attributes object.
      *
      * @param \Magento\Catalog\Api\Data\ProductRenderExtensionInterface $extensionAttributes
-     * @return $this
+     * @return void
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductRenderExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/ProductRender/Image.php b/app/code/Magento/Catalog/Model/ProductRender/Image.php
index 774199a0dbf0a..09416d38773fc 100644
--- a/app/code/Magento/Catalog/Model/ProductRender/Image.php
+++ b/app/code/Magento/Catalog/Model/ProductRender/Image.php
@@ -16,7 +16,7 @@ class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
 {
     /**
      * @param string $url
-     * @return @return void
+     * @return void
      */
     public function setUrl($url)
     {
@@ -149,7 +149,7 @@ public function getExtensionAttributes()
      * Set an extension attributes object.
      *
      * @param \Magento\Catalog\Api\Data\ProductRender\ImageExtensionInterface $extensionAttributes
-     * @return $this
+     * @return void
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductRender\ImageExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Model/ProductRenderList.php b/app/code/Magento/Catalog/Model/ProductRenderList.php
index a3d906cf10c15..230fe66681e82 100644
--- a/app/code/Magento/Catalog/Model/ProductRenderList.php
+++ b/app/code/Magento/Catalog/Model/ProductRenderList.php
@@ -64,7 +64,6 @@ class ProductRenderList implements ProductRenderListInterface
      * @param ProductRenderSearchResultsFactory $searchResultFactory
      * @param ProductRenderFactory $productRenderDtoFactory
      * @param Config $config
-     * @param Product\Visibility $productVisibility
      * @param CollectionModifier $collectionModifier
      * @param array $productAttributes
      */
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
index d4f5fdd5137c1..07acd5ceb5f29 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
@@ -128,7 +128,7 @@ public function setPage($pageNum, $pageSize)
      *
      * @param int $limit
      * @param int $offset
-     * @return \Magento\Eav\Model\Entity\Collection\AbstractCollection
+     * @return \Magento\Framework\DB\Select
      */
     protected function _getAllIdsSelect($limit = null, $offset = null)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index 5b420c33b3184..dd9c97fae43c9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -200,7 +200,7 @@ protected function _getTree()
      * delete child categories
      *
      * @param \Magento\Framework\DataObject $object
-     * @return $this
+     * @return void
      */
     protected function _beforeDelete(\Magento\Framework\DataObject $object)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
index c33ea7c781aa3..a28e7c04421b5 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
@@ -30,7 +30,6 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param null $connectionName
-     * @param \Magento\Indexer\Model\Indexer\StateFactory|null $stateFactory
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
index 0005ac8dea58a..a82ca93d1805e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
@@ -70,6 +70,8 @@ class BaseFinalPrice
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param JoinAttributeProcessor $joinAttributeProcessor
      * @param \Magento\Framework\Module\Manager $moduleManager
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param string $connectionName
      */
     public function __construct(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
index 54673cb01bb1d..dab8dc5f866be 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
@@ -30,7 +30,7 @@ class TemporaryTableStrategy implements \Magento\Framework\Indexer\Table\Strateg
 
     /**
      * TemporaryTableStrategy constructor.
-     * @param \Magento\Framework\Indexer\Table\Strategy $strategy
+     * @param \Magento\Framework\Indexer\Table\StrategyInterface $strategy
      * @param \Magento\Framework\App\ResourceConnection $resource
      */
     public function __construct(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
index 024c87c9fc886..5d6ce590b89c4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
@@ -62,7 +62,7 @@ public function __construct(
     /**
      * @param string $entityType
      * @param object $entity
-     * @return object
+     * @return void
      * @throws CouldNotDeleteException
      * @throws NoSuchEntityException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Catalog/Model/Rss/Category.php b/app/code/Magento/Catalog/Model/Rss/Category.php
index a58569d1b59d7..25a638fabcefa 100644
--- a/app/code/Magento/Catalog/Model/Rss/Category.php
+++ b/app/code/Magento/Catalog/Model/Rss/Category.php
@@ -44,7 +44,7 @@ public function __construct(
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
-     * @return $this
+     * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     public function getProductCollection(\Magento\Catalog\Model\Category $category, $storeId)
     {
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index 1eb30ff95a40b..53d8b68fe7070 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -66,7 +66,7 @@ public function __construct(
      * Set use absolute links flag
      *
      * @param bool $flag
-     * @return \Magento\Email\Model\Template\Filter
+     * @return $this
      */
     public function setUseAbsoluteLinks($flag)
     {
@@ -79,7 +79,7 @@ public function setUseAbsoluteLinks($flag)
      * Doesn't set anything intentionally, since SID is not allowed in any kind of emails
      *
      * @param bool $flag
-     * @return \Magento\Email\Model\Template\Filter
+     * @return $this
      */
     public function setUseSessionInUrl($flag)
     {
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
index dfa06b6ebe6c8..d4af2f02005c2 100644
--- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
@@ -47,7 +47,7 @@ public function __construct(
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @return array
      */
     public function aroundGetAttributesUsedInListing(
@@ -74,7 +74,7 @@ public function aroundGetAttributesUsedInListing(
 
     /**
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
-     * @param callable $proceed
+     * @param \Closure $proceed
      * @return array
      */
     public function aroundGetAttributesUsedForSortBy(
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index 7379600011bcf..99f7122efa0a8 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -560,7 +560,7 @@ private function getAttributes()
      * Loads attributes for specified groups at once
      *
      * @param AttributeGroupInterface[] $groups
-     * @return @return ProductAttributeInterface[]
+     * @return ProductAttributeInterface[]
      */
     private function loadAttributesForGroups(array $groups)
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
index 5513af9d98e7d..22ac3bf0fa2b5 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
@@ -24,6 +24,7 @@ class CompositeConfigProcessor implements WysiwygConfigDataProcessorInterface
 
     /**
      * CompositeConfigProcessor constructor.
+     * @param Logger $logger
      * @param array $eavWysiwygDataProcessors
      */
     public function __construct(Logger $logger, array $eavWysiwygDataProcessors)
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
index 3090734df0144..be98fff96f088 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
@@ -24,8 +24,6 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
 
     /**
      * @param string $name
-     * @param string $primaryFieldName
-     * @param string $requestFieldName
      * @param Reporting $reporting
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param RequestInterface $request
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
index 5d14cd21f7b95..3f16e0a6617da 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
@@ -21,7 +21,6 @@ interface ProductRenderCollectorInterface
      *
      * @param ProductInterface $product
      * @param ProductRenderInterface $productRender
-     * @param array $data
      * @return void
      * @since 101.1.0
      */

From d6f672a7ffe7bbe10d93533f6411552ce0f04fda Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Wed, 16 Jan 2019 14:33:52 +0200
Subject: [PATCH 671/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Magento/CatalogImportExport/Model/Import/Product.php   | 7 ++-----
 app/code/Magento/ImportExport/Model/Import.php             | 4 ----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 1847ffc70758d..613c3adc408a2 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1649,11 +1649,8 @@ protected function _saveProducts()
                     continue;
                 }
                 if ($this->getErrorAggregator()->hasToBeTerminated()) {
-                    $validationStrategy = $this->_parameters[Import::FIELD_NAME_VALIDATION_STRATEGY];
-                    if (ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS !== $validationStrategy) {
-                        $this->getErrorAggregator()->addRowToSkip($rowNum);
-                        continue;
-                    }
+                    $this->getErrorAggregator()->addRowToSkip($rowNum);
+                    continue;
                 }
                 $rowScope = $this->getRowScope($rowData);
 
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index 1372322ee5855..ee73d07d364ac 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -621,10 +621,6 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
         $this->addLogComment($messages);
 
         $result = !$errorAggregator->getErrorsCount();
-        $validationStrategy = $this->getData(self::FIELD_NAME_VALIDATION_STRATEGY);
-        if ($validationStrategy === ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS) {
-            $result = true;
-        }
 
         if ($result) {
             $this->addLogComment(__('Import data validation is complete.'));

From 204e9d83c4ce5a3bf161048c9ec86c34038ad832 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 16 Jan 2019 14:42:36 +0200
Subject: [PATCH 672/932] ENGCOM-3850: Static test fix.

---
 app/code/Magento/Ups/Model/Carrier.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index f5990ed098c8f..43efb6a91c01f 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -333,9 +333,9 @@ public function setRequest(RateRequest $request)
         }
 
         // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
-        if (
-            $destCountry == self::SPAIN_COUNTRY_ID &&
-            ($request->getDestRegionCode() == self::LAS_PALMAS_REGION_ID || $request->getDestRegionCode() == self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
+        if ($destCountry === self::SPAIN_COUNTRY_ID &&
+            ($request->getDestRegionCode() === self::LAS_PALMAS_REGION_ID
+                || $request->getDestRegionCode() === self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
         ) {
             $destCountry = self::CANARY_ISLANDS_COUNTRY_ID;
         }
@@ -1708,6 +1708,7 @@ public function getCustomizableContainerTypes()
 
     /**
      * Get delivery confirmation level based on origin/destination
+     *
      * Return null if delivery confirmation is not acceptable
      *
      * @param string|null $countyDestination

From 29060f4dec73cedfec6183e33bcec5f580a8252c Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Wed, 16 Jan 2019 14:57:57 +0200
Subject: [PATCH 673/932] MAGETWO-97625: [Magento Cloud] Can't delete video
 images on Duplicate products

---
 .../Catalog/Product/Gallery/CreateHandler.php | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
index ba77ac7b79906..42407ca6be0b8 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/CreateHandler.php
@@ -19,6 +19,8 @@ class CreateHandler extends AbstractHandler
     const ADDITIONAL_STORE_DATA_KEY = 'additional_store_data';
 
     /**
+     * Execute before Plugin
+     *
      * @param \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler
      * @param \Magento\Catalog\Model\Product $product
      * @param array $arguments
@@ -44,6 +46,8 @@ public function beforeExecute(
     }
 
     /**
+     * Execute plugin
+     *
      * @param \Magento\Catalog\Model\Product\Gallery\CreateHandler $mediaGalleryCreateHandler
      * @param \Magento\Catalog\Model\Product $product
      * @return \Magento\Catalog\Model\Product
@@ -73,6 +77,8 @@ public function afterExecute(
     }
 
     /**
+     * Saves video data
+     *
      * @param array $videoDataCollection
      * @param int $storeId
      * @return void
@@ -86,6 +92,8 @@ protected function saveVideoData(array $videoDataCollection, $storeId)
     }
 
     /**
+     * Saves additioanal video data
+     *
      * @param array $videoDataCollection
      * @return void
      */
@@ -102,6 +110,8 @@ protected function saveAdditionalStoreData(array $videoDataCollection)
     }
 
     /**
+     * Saves video data
+     *
      * @param array $item
      * @return void
      */
@@ -114,6 +124,8 @@ protected function saveVideoValuesItem(array $item)
     }
 
     /**
+     * Excludes current store data
+     *
      * @param array $mediaCollection
      * @param int $currentStoreId
      * @return array
@@ -129,6 +141,8 @@ function ($item) use ($currentStoreId) {
     }
 
     /**
+     * Prepare video data for saving
+     *
      * @param array $rowData
      * @return array
      */
@@ -146,6 +160,8 @@ protected function prepareVideoRowDataForSave(array $rowData)
     }
 
     /**
+     * Loads video data
+     *
      * @param array $mediaCollection
      * @param int $excludedStore
      * @return array
@@ -168,6 +184,8 @@ protected function loadStoreViewVideoData(array $mediaCollection, $excludedStore
     }
 
     /**
+     * Collect video data
+     *
      * @param array $mediaCollection
      * @return array
      */
@@ -185,6 +203,8 @@ protected function collectVideoData(array $mediaCollection)
     }
 
     /**
+     * Extract video data
+     *
      * @param array $rowData
      * @return array
      */
@@ -197,6 +217,8 @@ protected function extractVideoDataFromRowData(array $rowData)
     }
 
     /**
+     * Collect items for additional data adding
+     *
      * @param array $mediaCollection
      * @return array
      */
@@ -212,6 +234,8 @@ protected function collectVideoEntriesIdsToAdditionalLoad(array $mediaCollection
     }
 
     /**
+     * Add additional data
+     *
      * @param array $mediaCollection
      * @param array $data
      * @return array
@@ -232,6 +256,8 @@ protected function addAdditionalStoreData(array $mediaCollection, array $data):
     }
 
     /**
+     * Creates additional video data
+     *
      * @param array $storeData
      * @param int $valueId
      * @return array
@@ -250,6 +276,8 @@ protected function createAdditionalStoreDataCollection(array $storeData, $valueI
     }
 
     /**
+     * Collect new videos
+     *
      * @param array $mediaCollection
      * @return array
      */
@@ -265,6 +293,8 @@ private function collectNewVideos(array $mediaCollection): array
     }
 
     /**
+     * Checks if gallery item is video
+     *
      * @param array $item
      * @return bool
      */
@@ -276,6 +306,8 @@ private function isVideoItem(array $item): bool
     }
 
     /**
+     * Checks if video is new
+     *
      * @param array $item
      * @return bool
      */
@@ -287,6 +319,7 @@ private function isNewVideo(array $item): bool
     }
 
     /**
+     * Mark all videos as new
      *
      * @param int $entityId
      * @param array $mediaCollection

From 076d5151a524cd9e4d345a6ad9b7641180118748 Mon Sep 17 00:00:00 2001
From: "v.sikailo" <v.sikailo@ism-ukraine.com>
Date: Wed, 16 Jan 2019 14:59:35 +0200
Subject: [PATCH 674/932] PHPDocs fixes in Sales module

---
 app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php  | 2 +-
 .../Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php    | 2 +-
 .../Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php   | 2 +-
 .../Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php     | 2 +-
 app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php    | 2 +-
 app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php   | 2 +-
 app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php       | 2 +-
 app/code/Magento/Sales/Block/Order/PrintShipment.php          | 2 +-
 .../Magento/Sales/Controller/Adminhtml/Order/Create/Index.php | 2 +-
 app/code/Magento/Sales/Model/Order/AddressRepository.php      | 2 +-
 app/code/Magento/Sales/Model/Order/Creditmemo/Item.php        | 2 +-
 app/code/Magento/Sales/Model/Order/Payment.php                | 1 +
 app/code/Magento/Sales/Model/Order/Payment/Transaction.php    | 4 +++-
 .../Magento/Sales/Model/ResourceModel/Order/Collection.php    | 2 +-
 .../Sales/Model/ResourceModel/Order/Payment/Collection.php    | 2 +-
 .../ResourceModel/Report/Collection/AbstractCollection.php    | 2 +-
 app/code/Magento/Sales/Model/Service/CreditmemoService.php    | 2 +-
 app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php | 2 +-
 18 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
index f21cc96be92bc..7cb46fcde2c48 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
@@ -29,7 +29,7 @@ class Load extends \Magento\Framework\View\Element\Template
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
-     * @param \Magento\Framework\View\Helper\Js $adminhtmlJs
+     * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param array $data
      */
     public function __construct(
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
index d2e42fe388da7..ec959fc286333 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
@@ -26,7 +26,7 @@ public function getOrder()
     /**
      * Retrieve source
      *
-     * @return \Magento\Sales\Model\Order\Invoice
+     * @return \Magento\Sales\Model\Order\Creditmemo
      */
     public function getSource()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
index 04a9f9437ae57..e8feb202c13a4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
@@ -196,7 +196,7 @@ public function getMessage()
     /**
      * Retrieve save url
      *
-     * @return array
+     * @return string
      */
     public function getSaveUrl()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
index 512539824da20..89b63c9f00503 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
@@ -62,7 +62,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
index a5785a19cc66a..4aab58921cb56 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
@@ -21,7 +21,7 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * Prepare item before output
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
-     * @return \Magento\Sales\Block\Items\AbstractItems
+     * @return void
      */
     protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $renderer)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
index 21c83e55a489d..92ea6a80c8a1a 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
@@ -21,7 +21,7 @@ class Items extends \Magento\Sales\Block\Items\AbstractItems
      * Prepare item before output
      *
      * @param \Magento\Framework\View\Element\AbstractBlock $renderer
-     * @return \Magento\Sales\Block\Items\AbstractItems
+     * @return void
      */
     protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $renderer)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
index 2b84b8f1444b6..fc424db01e87e 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
@@ -91,7 +91,7 @@ protected function getUrlKey($order)
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Sales/Block/Order/PrintShipment.php b/app/code/Magento/Sales/Block/Order/PrintShipment.php
index 335b6095d0ca4..94ebf6f409250 100644
--- a/app/code/Magento/Sales/Block/Order/PrintShipment.php
+++ b/app/code/Magento/Sales/Block/Order/PrintShipment.php
@@ -116,7 +116,7 @@ protected function _prepareItem(AbstractBlock $renderer)
     /**
      * Returns string with formatted address
      *
-     * @param Address $address
+     * @param \Magento\Sales\Model\Order\Address $address
      * @return null|string
      */
     public function getFormattedAddress(\Magento\Sales\Model\Order\Address $address)
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
index 035dc7877897d..e3e06fdbfc9b4 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
@@ -12,7 +12,7 @@ class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create implements
     /**
      * Index page
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Page
      */
     public function execute()
     {
diff --git a/app/code/Magento/Sales/Model/Order/AddressRepository.php b/app/code/Magento/Sales/Model/Order/AddressRepository.php
index 2aed6ef16817e..af83dde99c6f2 100644
--- a/app/code/Magento/Sales/Model/Order/AddressRepository.php
+++ b/app/code/Magento/Sales/Model/Order/AddressRepository.php
@@ -90,7 +90,7 @@ public function get($id)
      * Find order addresses by criteria.
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
-     * @return \Magento\Sales\Api\Data\OrderAddressInterface[]
+     * @return \Magento\Sales\Model\ResourceModel\Order\Address\Collection
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
index 5c3f563a4f07e..b8f8179d39674 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
@@ -236,7 +236,7 @@ public function cancel()
     /**
      * Invoice item row total calculation
      *
-     * @return \Magento\Sales\Model\Order\Invoice\Item
+     * @return $this
      */
     public function calcRowTotal()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 97040c0a578c8..760124a496309 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -264,6 +264,7 @@ public function getParentTransactionId()
     /**
      * Returns transaction parent
      *
+     * @param string $txnId
      * @return string
      * @since 100.1.0
      */
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index 8d8de47ba99cf..3759aa735e0b1 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -132,6 +132,8 @@ class Transaction extends AbstractModel implements TransactionInterface
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
+     * @param \Magento\Sales\Api\OrderPaymentRepositoryInterface $orderPaymentRepository
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      * @param \Magento\Framework\Stdlib\DateTime\DateTimeFactory $dateFactory
      * @param TransactionFactory $transactionFactory
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
@@ -559,7 +561,7 @@ public function getOrderId()
     /**
      * Retrieve order instance
      *
-     * @return \Magento\Sales\Model\Order
+     * @return \Magento\Sales\Model\Order\Payment
      */
     public function getOrder()
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
index 5dca23836427a..2c4d33ac0db3f 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
@@ -48,7 +48,7 @@ class Collection extends AbstractCollection implements OrderSearchResultInterfac
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
      * @param \Magento\Framework\DB\Helper $coreResourceHelper
-     * @param string|null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      */
     public function __construct(
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php
index 521db7f1f3a45..fead4f39f4c2f 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment/Collection.php
@@ -33,7 +33,7 @@ class Collection extends AbstractCollection implements OrderPaymentSearchResultI
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot $entitySnapshot
-     * @param null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
      */
     public function __construct(
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php
index 86d86255a0c29..9c4c87c2e2e25 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php
@@ -25,7 +25,7 @@ class AbstractCollection extends \Magento\Reports\Model\ResourceModel\Report\Col
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Sales\Model\ResourceModel\Report $resource
-     * @param null $connection
+     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/Service/CreditmemoService.php b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
index 76db717161317..e4435d3481a3c 100644
--- a/app/code/Magento/Sales/Model/Service/CreditmemoService.php
+++ b/app/code/Magento/Sales/Model/Service/CreditmemoService.php
@@ -98,7 +98,7 @@ public function __construct(
      * Cancel an existing creditmemo
      *
      * @param int $id Credit Memo Id
-     * @return bool
+     * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
index 2fd792fb4ae25..48b8740d86fc0 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
@@ -44,7 +44,7 @@ public function __construct(
      * Prepare Data Source
      *
      * @param array $dataSource
-     * @return void
+     * @return array
      */
     public function prepareDataSource(array $dataSource)
     {

From 325e27bf74d1e5e668ace4a38a975a03c4b82319 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 16 Jan 2019 15:04:02 +0200
Subject: [PATCH 675/932] MAGETWO-60875: MTF tests fix

---
 .../app/Magento/Catalog/Test/Block/Search.php | 22 ++++++++++++++++++-
 .../Promo/Quote/Edit/PromoQuoteForm.php       |  9 ++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
index 7ca5bfd2be140..a34b97b4ce228 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Search.php
@@ -10,7 +10,6 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class Search
  * Block for "Search" section
  */
 class Search extends Block
@@ -77,6 +76,7 @@ public function search($keyword, $length = null)
             $keyword = substr($keyword, 0, $length);
         }
         $this->fillSearch($keyword);
+        $this->waitForElementEnabled($this->searchButton);
         $this->_rootElement->find($this->searchButton)->click();
     }
 
@@ -157,4 +157,24 @@ public function clickSuggestedText($text)
         $searchAutocomplete = sprintf($this->searchAutocomplete, $text);
         $this->_rootElement->find($searchAutocomplete, Locator::SELECTOR_XPATH)->click();
     }
+
+    /**
+     * Wait for element is enabled.
+     *
+     * @param string $selector
+     * @param string $strategy
+     * @return bool|null
+     */
+    public function waitForElementEnabled($selector, $strategy = Locator::SELECTOR_CSS)
+    {
+        $browser = $this->browser;
+
+        return $browser->waitUntil(
+            function () use ($browser, $selector, $strategy) {
+                $element = $browser->find($selector, $strategy);
+
+                return !$element->isDisabled() ? true : null;
+            }
+        );
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
index 2627f99d4c8c2..54cec6cf279f6 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.php
@@ -28,6 +28,13 @@ class PromoQuoteForm extends FormSections
      */
     protected $waitForSelectorVisible = false;
 
+    /**
+     * Selector of name element on the form.
+     *
+     * @var string
+     */
+    private $nameElementSelector = 'input[name=name]';
+
     /**
      * Fill form with sections.
      *
@@ -38,6 +45,8 @@ class PromoQuoteForm extends FormSections
      */
     public function fill(FixtureInterface $fixture, SimpleElement $element = null, array $replace = null)
     {
+        $this->waitForElementNotVisible($this->waitForSelector);
+        $this->waitForElementVisible($this->nameElementSelector);
         $sections = $this->getFixtureFieldsByContainers($fixture);
         if ($replace) {
             $sections = $this->prepareData($sections, $replace);

From e331b3f849b9f1ed98dd9dce1f53041298dffe63 Mon Sep 17 00:00:00 2001
From: Ankur <ankurverma@cedcoss.com>
Date: Wed, 16 Jan 2019 19:09:49 +0530
Subject: [PATCH 676/932] Updated AfterImportDataObserver.php

Fixed #20282 Module Catalog Url Rewrite: Permanent Redirect for old URL is missed when product was imported
---
 .../CatalogUrlRewrite/Observer/AfterImportDataObserver.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index 022a78be00197..cdee3aaaa331e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -135,6 +135,7 @@ class AfterImportDataObserver implements ObserverInterface
         'url_path',
         'name',
         'visibility',
+        'save_rewrites_history'
     ];
 
     /**

From f7275c53ceaecb8a3e16a2dc286b8614ebd1aef8 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 16 Jan 2019 15:44:26 +0200
Subject: [PATCH 677/932] ENGCOM-3846: Static test fix.

---
 lib/internal/Magento/Framework/Option/ArrayPool.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Option/ArrayPool.php b/lib/internal/Magento/Framework/Option/ArrayPool.php
index c417909cc9ddf..11e1b46ff0363 100644
--- a/lib/internal/Magento/Framework/Option/ArrayPool.php
+++ b/lib/internal/Magento/Framework/Option/ArrayPool.php
@@ -34,7 +34,8 @@ public function get($model)
     {
         $modelInstance = $this->_objectManager->get($model);
         if (false == $modelInstance instanceof \Magento\Framework\Data\OptionSourceInterface) {
-            throw new \InvalidArgumentException($model . 'doesn\'t implement \Magento\Framework\Data\OptionSourceInterface');
+            throw new \InvalidArgumentException($model
+                . 'doesn\'t implement \Magento\Framework\Data\OptionSourceInterface');
         }
         return $modelInstance;
     }

From 8d3fc5c138b4328baab27f44e6fd6d58b0149dca Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 16 Jan 2019 15:57:50 +0200
Subject: [PATCH 678/932] ENGCOM-3845: Static test fix.

---
 .../CatalogInventory/Observer/CancelOrderItemObserver.php    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
index c919c7057bcc6..098e254d785a5 100644
--- a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
@@ -6,10 +6,10 @@
 
 namespace Magento\CatalogInventory\Observer;
 
-use Magento\CatalogInventory\Model\Configuration;
-use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
+use Magento\CatalogInventory\Model\Configuration;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Catalog inventory module observer
@@ -32,6 +32,7 @@ class CancelOrderItemObserver implements ObserverInterface
     protected $priceIndexer;
 
     /**
+     * @param Configuration $configuration
      * @param StockManagementInterface $stockManagement
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
      */

From bb6e51c277a9777203cd660ec51f8165cad48009 Mon Sep 17 00:00:00 2001
From: Mastiuhin Olexandr <mastiuhin.olexandr@transoftgroup.com>
Date: Wed, 16 Jan 2019 16:41:04 +0200
Subject: [PATCH 679/932] MAGETWO-97091: Zip code is not validated for address
 entered in My Account and for new address entered during checkout

---
 .../web/js/model/postcode-validator.js        |  9 +++---
 .../PostCodesPatternsAttributeData.php        | 12 +++++--
 .../view/frontend/web/js/addressValidation.js | 31 ++++---------------
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
index a95471d90dab8..70f2329b60052 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
@@ -14,12 +14,13 @@ define([
         /**
          * @param {*} postCode
          * @param {*} countryId
+         * @param {Array} postCodesPatterns
          * @return {Boolean}
          */
-        validate: function (postCode, countryId) {
-            var patterns = window.checkoutConfig.postCodes[countryId],
-                pattern, regex;
-
+        validate: function (postCode, countryId, postCodesPatterns) {
+            var pattern, regex,
+                patterns = postCodesPatterns ? postCodesPatterns[countryId] :
+                window.checkoutConfig.postCodes[countryId];
             this.validatedPostCodeExample = [];
 
             if (!utils.isEmpty(postCode) && !utils.isEmpty(patterns)) {
diff --git a/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
index 220dc5d9f1aaa..ac83602548abb 100644
--- a/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
+++ b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Customer\Block\DataProviders;
 
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Directory\Model\Country\Postcode\Config as PostCodeConfig;
 
@@ -20,14 +21,21 @@ class PostCodesPatternsAttributeData implements ArgumentInterface
      */
     private $postCodeConfig;
 
+    /**
+     * @var Json
+     */
+    private $serializer;
+
     /**
      * Constructor
      *
      * @param PostCodeConfig $postCodeConfig
+     * @param Json $serializer
      */
-    public function __construct(PostCodeConfig $postCodeConfig)
+    public function __construct(PostCodeConfig $postCodeConfig, Json $serializer)
     {
         $this->postCodeConfig = $postCodeConfig;
+        $this->serializer = $serializer;
     }
 
     /**
@@ -37,6 +45,6 @@ public function __construct(PostCodeConfig $postCodeConfig)
      */
     public function getPostCodesJson(): string
     {
-        return json_encode($this->postCodeConfig->getPostCodes());
+        return $this->serializer->serialize($this->postCodeConfig->getPostCodes());
     }
 }
diff --git a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
index a7314a35127b5..6d4d4b5bb7141 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
@@ -8,9 +8,10 @@ define([
     'underscore',
     'mageUtils',
     'mage/translate',
+    'Magento_Checkout/js/model/postcode-validator',
     'jquery/ui',
     'validation'
-], function ($, __, utils, $t) {
+], function ($, __, utils, $t, postCodeValidator) {
     'use strict';
 
     $.widget('mage.addressValidation', {
@@ -22,7 +23,6 @@ define([
             }
         },
 
-        validatedPostCodeExample: [],
         zipInput: null,
         countrySelect: null,
 
@@ -79,32 +79,13 @@ define([
          * @return {Boolean} Whether is post code valid
          */
         _validatePostCode: function (postCode) {
-            var countryId = this.countrySelect.val(),
-                patterns = this.options.postCodes[countryId],
-                pattern, regex;
+            var countryId = this.countrySelect.val();
 
             if (postCode === null) {
                 return true;
             }
 
-            this.validatedPostCodeExample = [];
-
-            if (!utils.isEmpty(postCode) && !utils.isEmpty(patterns)) {
-                for (pattern in patterns) {
-                    if (patterns.hasOwnProperty(pattern)) { //eslint-disable-line max-depth
-                        this.validatedPostCodeExample.push(patterns[pattern].example);
-                        regex = new RegExp(patterns[pattern].pattern);
-
-                        if (regex.test(postCode)) { //eslint-disable-line max-depth
-                            return true;
-                        }
-                    }
-                }
-
-                return false;
-            }
-
-            return true;
+            return postCodeValidator.validate(postCode, countryId, this.options.postCodes);
         },
 
         /**
@@ -119,8 +100,8 @@ define([
             if (!valid) {
                 warnMessage = $t('Provided Zip/Postal Code seems to be invalid.');
 
-                if (this.validatedPostCodeExample.length) {
-                    warnMessage += $t(' Example: ') + this.validatedPostCodeExample.join('; ') + '. ';
+                if (postCodeValidator.validatedPostCodeExample.length) {
+                    warnMessage += $t(' Example: ') + postCodeValidator.validatedPostCodeExample.join('; ') + '. ';
                 }
                 warnMessage += $t('If you believe it is the right one you can ignore this notice.');
             }

From ec33182beef6e13f9caf2c5fc4f4d731bebccf50 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 16 Jan 2019 16:50:24 +0200
Subject: [PATCH 680/932] ENGCOM-3869: Static test fix.

---
 .../frontend/Magento/blank/web/css/source/_navigation.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index 10c7e3ed7eeea..21b7315779764 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -133,8 +133,8 @@
         }
         .switcher-dropdown {
             .lib-list-reset-styles();
-            padding: @indent__s 0;
             display: none;
+            padding: @indent__s 0;
         }
         .switcher-options {
             &.active {
@@ -213,7 +213,7 @@
         }
 
         .nav-toggle {
-            &:after{
+            &:after {
                 background: rgba(0, 0, 0, @overlay__opacity);
                 content: '';
                 display: block;

From 858cfb0dd9ef59ddb712e5abd56d3e8e3120eeb8 Mon Sep 17 00:00:00 2001
From: Mastiuhin Olexandr <mastiuhin.olexandr@transoftgroup.com>
Date: Wed, 16 Jan 2019 17:49:52 +0200
Subject: [PATCH 681/932] MAGETWO-97091: Zip code is not validated for address
 entered in My Account and for new address entered during checkout

---
 .../Checkout/view/frontend/web/js/model/postcode-validator.js    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
index 70f2329b60052..4a506915dc8f7 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
@@ -21,6 +21,7 @@ define([
             var pattern, regex,
                 patterns = postCodesPatterns ? postCodesPatterns[countryId] :
                 window.checkoutConfig.postCodes[countryId];
+
             this.validatedPostCodeExample = [];
 
             if (!utils.isEmpty(postCode) && !utils.isEmpty(patterns)) {

From 5bc30b9849c66ccc99b1f51b8e4717c566a1f48d Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Wed, 16 Jan 2019 10:22:53 -0600
Subject: [PATCH 682/932] MC-6058: Update category, name description urlkey
 metatitle exclude from menu

- Added to WYSIWYGDisabled suite
---
 .../Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
index 96945e96f8476..44a764245ee72 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
@@ -16,6 +16,7 @@
             <severity value="CRITICAL"/>
             <group value="Catalog"/>
             <group value="mtf_migrated"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>

From 56c1b3395cad0b34362c6df4bf5ca74a40d9a363 Mon Sep 17 00:00:00 2001
From: Shikha Mishra <shikhamishra@cedcoss.com>
Date: Wed, 16 Jan 2019 22:56:34 +0530
Subject: [PATCH 683/932] Updated Filter.php

Fixed #19258 Incorrect orders updated
---
 app/code/Magento/Ui/Component/MassAction/Filter.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
index a8ed5d901d860..75acb50adeac8 100644
--- a/app/code/Magento/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
@@ -99,10 +99,14 @@ public function getCollection(AbstractDb $collection)
                 throw new LocalizedException(__('An item needs to be selected. Select and try again.'));
             }
         }
-
+        
+        $filterIds = $this->getFilterIds();
+        if(is_array($selected)){
+            $filterIds = array_unique(array_merge($this->getFilterIds(), $selected));
+        }
         $collection->addFieldToFilter(
             $collection->getIdFieldName(),
-            ['in' => $this->getFilterIds()]
+            ['in' => $filterIds]
         );
 
         return $collection;

From 5bf07fc0324e4d8147e1825441b16d906460910c Mon Sep 17 00:00:00 2001
From: Oksana_Kremen <Oksana_Kremen@epam.com>
Date: Wed, 16 Jan 2019 19:48:31 +0200
Subject: [PATCH 684/932] MAGETWO-91513: Password reset email cannot be sent if
 the customer does not have customer attribute set that is changed to required
 after original account creation

- Avoiding customer validation and customer address validation for the use cases where it is not needed
---
 app/code/Magento/Customer/Model/AccountManagement.php        | 1 +
 .../Customer/Test/Unit/Model/AccountManagementTest.php       | 5 ++++-
 app/code/Magento/Newsletter/Controller/Manage/Save.php       | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index eccfc1f0b5656..6be41c278a17f 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -1032,6 +1032,7 @@ private function changePasswordForCustomer($customer, $currentPassword, $newPass
         $this->checkPasswordStrength($newPassword);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
         $this->destroyCustomerSessions($customer->getId());
+        $this->disableAddressValidation($customer);
         $this->customerRepository->save($customer);
 
         return true;
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
index 0273c445bdd2a..22c9d90c086dc 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -1472,12 +1472,15 @@ public function testChangePassword()
         $passwordHash = '1a2b3f4c';
 
         $this->reInitModel();
-        $customer = $this->getMockBuilder(Customer::class)
+        $customer = $this->getMockBuilder(CustomerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $customer->expects($this->any())
             ->method('getId')
             ->willReturn($customerId);
+        $customer->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([]);
 
         $this->customerRepository
             ->expects($this->once())
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 2e56952c27e12..698c2d19aae68 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -8,13 +8,14 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
 use Magento\Customer\Model\Customer;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Newsletter\Model\Subscriber;
 
 /**
  * Customers newsletter subscription save controller
  */
-class Save extends \Magento\Newsletter\Controller\Manage implements HttpPostActionInterface
+class Save extends \Magento\Newsletter\Controller\Manage implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator

From 3a01bc08c57a8ff3f12f1745223dccf9996c793c Mon Sep 17 00:00:00 2001
From: Mahesh Singh <mahesh721@webkul.com>
Date: Thu, 17 Jan 2019 01:06:25 +0530
Subject: [PATCH 685/932] issue#20277 fixed for 2.3.x

---
 .../Magento/Sales/Controller/Download/DownloadCustomOption.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
index 0deddd9fb6ec5..c966a6ea7a4d1 100644
--- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -98,7 +98,7 @@ public function execute()
             )->load($optionId);
         }
 
-        if (!$productOption || !$productOption->getId() || $productOption->getType() != 'file') {
+        if ($productOption->getId() && $productOption->getType() != 'file') {
             return $resultForward->forward('noroute');
         }
 

From 69adf5d815f62ff2016be11cc5edf40e712c0cce Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Wed, 16 Jan 2019 15:44:01 -0600
Subject: [PATCH 686/932] MC-4385: Convert MoveCategoryEntityTest to MFTF

---
 ...dminMoveCategoryAndCheckUrlRewritesTest.xml | 18 +++++++++---------
 .../Section/AdminUrlRewriteIndexSection.xml    |  7 +++----
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
index 012e671016106..7e00d21ad4b84 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
@@ -53,11 +53,11 @@
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
         <waitForPageLoad stepKey="waitForPageToLoad0"/>
         <!--Verify Category RedirectType-->
-        <see stepKey="verifyTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="No" />
+        <see stepKey="verifyTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
         <!--Verify Redirect Path -->
-        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="verifyTheRedirectPath"/>
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="verifyTheRedirectPath"/>
         <!--Verify Category Target Path-->
-        <see stepKey="verifyTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn(1)}}" userInput="catalog/category/view/id/{$categoryId}"/>
+        <see stepKey="verifyTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}"/>
         <!--Open Category Page -->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
@@ -76,18 +76,18 @@
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
         <waitForPageLoad stepKey="waitForPageToLoad4"/>
         <!--Verify new Redirect Path after move -->
-        <see stepKey="verifyTheRequestPathAfterMove" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
+        <see stepKey="verifyTheRequestPathAfterMove" selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
         <!--Verify new Target Path after move -->
-        <see stepKey="verifyTheTargetPathAfterMove" selector="{{AdminUrlRewriteIndexSection.targetPathColumn(1)}}" userInput="catalog/category/view/id/{$categoryId}" />
+        <see stepKey="verifyTheTargetPathAfterMove" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}" />
         <!--Verify new RedirectType after move -->
-        <see stepKey="verifyTheRedirectTypeAfterMove" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="No" />
+        <see stepKey="verifyTheRedirectTypeAfterMove" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
         <!--Verify before move Redirect Path displayed with associated Target Path and Redirect Type-->
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="fillCategoryUrlKey2"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton2"/>
         <waitForPageLoad stepKey="waitForPageToLoad5"/>
-        <see stepKey="verifyTheRedirectTypeAfterMove1" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn(1)}}" userInput="Permanent (301)" />
-        <see stepKey="verifyTheRequestPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(2)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" />
-        <see stepKey="verifyTheTargetPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.targetPathColumn(1)}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
+        <see stepKey="verifyTheRedirectTypeAfterMove1" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" />
+        <see stepKey="verifyTheRequestPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" />
+        <see stepKey="verifyTheTargetPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
         <!--Verify before move Redirect Path directs to the category page-->
         <amOnPage url="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
index 9af99cf43bbe0..c78af2a91644d 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -11,10 +11,9 @@
     <section name="AdminUrlRewriteIndexSection">
         <element name="requestPathFilter" type="input" selector="#urlrewriteGrid_filter_request_path"/>
         <element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
-        <element name="targetPathColumn" type="text" selector="//tr[@data-role='row']['{{var1}}']/td[@data-column='target_path']" parameterized="true"/>
+        <element name="targetPathColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='target_path']" parameterized="true"/>
         <element name="searchButton" type="button" selector="button[data-ui-id='widget-button-1']" timeout="30"/>
-        <element name="redirectTypeColumn" type="text" selector="//tr[@data-role='row']['{{var1}}']/td[@data-column='redirect_type']" parameterized="true"/>
-        <element name="requestPathColumn" type="text" selector="//tr[@data-role='row']['{{var1}}']/td[@data-column='request_path']" parameterized="true"/>
-
+        <element name="redirectTypeColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='redirect_type']" parameterized="true"/>
+        <element name="requestPathColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='request_path']" parameterized="true"/>
     </section>
 </sections>

From 1dd6dddad865f5cbed67543ff5fb606ac9592173 Mon Sep 17 00:00:00 2001
From: Mastiuhin Olexandr <mastiuhin.olexandr@transoftgroup.com>
Date: Thu, 17 Jan 2019 11:38:52 +0200
Subject: [PATCH 687/932] MAGETWO-97091: Zip code is not validated for address
 entered in My Account and for new address entered during checkout

---
 .../Customer/view/frontend/web/js/addressValidation.js       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
index 6d4d4b5bb7141..c014b814ea98b 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/addressValidation.js
@@ -28,6 +28,7 @@ define([
 
         /**
          * Validation creation
+         *
          * @protected
          */
         _create: function () {
@@ -54,6 +55,8 @@ define([
 
         /**
          * Add postcode validation
+         *
+         * @protected
          */
         _addPostCodeValidation: function () {
             var self = this;
@@ -75,6 +78,7 @@ define([
         /**
          * Validate post code value.
          *
+         * @protected
          * @param {String} postCode - post code
          * @return {Boolean} Whether is post code valid
          */
@@ -91,6 +95,7 @@ define([
         /**
          * Renders warning messages for invalid post code.
          *
+         * @protected
          * @param {Boolean} valid
          */
         _renderValidationResult: function (valid) {

From 3ddf6c456931ff7c1a4ea0fb2c5ef199534d8ddc Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 17 Jan 2019 12:06:21 +0200
Subject: [PATCH 688/932] Fix static tests.

---
 .../Framework/DB/Adapter/AdapterInterface.php | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 48d488a322cb0..f654fd263f605 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\DB\Adapter;
 
 use Magento\Framework\DB\Ddl\Table;
@@ -365,6 +366,7 @@ public function getIndexList($tableName, $schemaName = null);
 
     /**
      * Add new Foreign Key to table
+     *
      * If Foreign Key with same name is exist - it will be deleted
      *
      * @param string $fkName
@@ -373,7 +375,6 @@ public function getIndexList($tableName, $schemaName = null);
      * @param string $refTableName
      * @param string $refColumnName
      * @param string $onDelete
-     * @param string $onUpdate
      * @param boolean $purge trying remove invalid data
      * @param string $schemaName
      * @param string $refSchemaName
@@ -484,6 +485,7 @@ public function insert($table, array $bind);
 
     /**
      * Inserts a table row with specified data
+     *
      * Special for Zero values to identity column
      *
      * @param string $table
@@ -502,9 +504,9 @@ public function insertForce($table, array $bind);
      * If the $where parameter is an array of multiple clauses, they will be joined by AND, with each clause wrapped in
      * parenthesis.  If you wish to use an OR, you must give a single clause that is an instance of {@see Zend_Db_Expr}
      *
-     * @param  mixed        $table The table to update.
-     * @param  array        $bind  Column-value pairs.
-     * @param  mixed        $where UPDATE WHERE clause(s).
+     * @param  mixed $table The table to update.
+     * @param  array $bind Column-value pairs.
+     * @param  mixed $where UPDATE WHERE clause(s).
      * @return int          The number of affected rows.
      */
     public function update($table, array $bind, $where = '');
@@ -512,8 +514,8 @@ public function update($table, array $bind, $where = '');
     /**
      * Deletes table rows based on a WHERE clause.
      *
-     * @param  mixed        $table The table to update.
-     * @param  mixed        $where DELETE WHERE clause(s).
+     * @param  mixed $table The table to update.
+     * @param  mixed $where DELETE WHERE clause(s).
      * @return int          The number of affected rows.
      */
     public function delete($table, $where = '');
@@ -521,31 +523,33 @@ public function delete($table, $where = '');
     /**
      * Prepares and executes an SQL statement with bound data.
      *
-     * @param  mixed  $sql  The SQL statement with placeholders.
+     * @param  mixed $sql The SQL statement with placeholders.
      *                      May be a string or \Magento\Framework\DB\Select.
-     * @param  mixed  $bind An array of data or data itself to bind to the placeholders.
+     * @param  mixed $bind An array of data or data itself to bind to the placeholders.
      * @return \Zend_Db_Statement_Interface
      */
     public function query($sql, $bind = []);
 
     /**
      * Fetches all SQL result rows as a sequential array.
+     *
      * Uses the current fetchMode for the adapter.
      *
-     * @param string|\Magento\Framework\DB\Select $sql  An SQL SELECT statement.
-     * @param mixed                 $bind Data to bind into SELECT placeholders.
-     * @param mixed                 $fetchMode Override current fetch mode.
+     * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
+     * @param mixed $bind Data to bind into SELECT placeholders.
+     * @param mixed $fetchMode Override current fetch mode.
      * @return array
      */
     public function fetchAll($sql, $bind = [], $fetchMode = null);
 
     /**
      * Fetches the first row of the SQL result.
+     *
      * Uses the current fetchMode for the adapter.
      *
      * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
      * @param mixed $bind Data to bind into SELECT placeholders.
-     * @param mixed                 $fetchMode Override current fetch mode.
+     * @param mixed $fetchMode Override current fetch mode.
      * @return array
      */
     public function fetchRow($sql, $bind = [], $fetchMode = null);
@@ -622,9 +626,9 @@ public function quote($value, $type = null);
      * // $safe = "WHERE date < '2005-01-02'"
      * </code>
      *
-     * @param string  $text  The text with a placeholder.
-     * @param mixed   $value The value to quote.
-     * @param string  $type  OPTIONAL SQL datatype
+     * @param string $text The text with a placeholder.
+     * @param mixed $value The value to quote.
+     * @param string $type OPTIONAL SQL datatype
      * @param integer $count OPTIONAL count of placeholders to replace
      * @return string An SQL-safe quoted value placed into the original text.
      */
@@ -721,7 +725,8 @@ public function disallowDdlCache();
 
     /**
      * Reset cached DDL data from cache
-     * if table name is null - reset all cached DDL data
+     *
+     * If table name is null - reset all cached DDL data
      *
      * @param string $tableName
      * @param string $schemaName OPTIONAL
@@ -741,6 +746,7 @@ public function saveDdlCache($tableCacheKey, $ddlType, $data);
 
     /**
      * Load DDL data from cache
+     *
      * Return false if cache does not exists
      *
      * @param string $tableCacheKey the table cache key
@@ -784,6 +790,7 @@ public function prepareSqlCondition($fieldName, $condition);
 
     /**
      * Prepare value for save in column
+     *
      * Return converted to column data type value
      *
      * @param array $column     the column describe array
@@ -813,6 +820,7 @@ public function getIfNullSql($expression, $value = 0);
 
     /**
      * Generate fragment of SQL, that combine together (concatenate) the results from data array
+     *
      * All arguments in data must be quoted
      *
      * @param array $data
@@ -823,6 +831,7 @@ public function getConcatSql(array $data, $separator = null);
 
     /**
      * Generate fragment of SQL that returns length of character string
+     *
      * The string argument must be quoted
      *
      * @param string $string
@@ -931,6 +940,7 @@ public function getDateExtractSql($date, $unit);
 
     /**
      * Retrieve valid table name
+     *
      * Check table name length and allowed symbols
      *
      * @param string $tableName
@@ -950,6 +960,7 @@ public function getTriggerName($tableName, $time, $event);
 
     /**
      * Retrieve valid index name
+     *
      * Check index name length and allowed symbols
      *
      * @param string $tableName
@@ -961,6 +972,7 @@ public function getIndexName($tableName, $fields, $indexType = '');
 
     /**
      * Retrieve valid foreign key name
+     *
      * Check foreign key name length and allowed symbols
      *
      * @param string $priTableName
@@ -1047,6 +1059,7 @@ public function supportStraightJoin();
 
     /**
      * Adds order by random to select object
+     *
      * Possible using integer field for optimization
      *
      * @param \Magento\Framework\DB\Select $select
@@ -1074,6 +1087,7 @@ public function getPrimaryKeyName($tableName, $schemaName = null);
 
     /**
      * Converts fetched blob into raw binary PHP data.
+     *
      * Some DB drivers return blobs as hex-coded strings, so we need to process them.
      *
      * @param mixed $value
@@ -1114,6 +1128,8 @@ public function dropTrigger($triggerName, $schemaName = null);
     public function getTables($likeCondition = null);
 
     /**
+     * Generates case SQL fragment
+     *
      * Generate fragment of SQL, that check value against multiple condition cases
      * and return different result depends on them
      *

From fd3287dfa343dcd3fb5165ab0ed510cf96c1c163 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 17 Jan 2019 10:37:40 +0000
Subject: [PATCH 689/932] Resolved cyclomatic complexity of
 AssertProductRegularPriceOnStorefront.php

---
 .../AssertProductRegularPriceOnStorefront.php | 87 +++++++++++++------
 1 file changed, 59 insertions(+), 28 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
index 306876a096fb9..dc71939d4790d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductRegularPriceOnStorefront.php
@@ -44,44 +44,29 @@ public function processAssert(
         $cmsIndex->getLinksBlock()->openLink('My Account');
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Wish List');
 
-        $isProductVisible = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)
+        $isProductVisible = $wishlistIndex->getWishlistBlock()
+            ->getProductItemsBlock()
+            ->getItemProduct($product)
             ->isVisible();
         while (!$isProductVisible && $wishlistIndex->getTopToolbar()->nextPage()) {
-            $isProductVisible = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product)
+            $isProductVisible = $wishlistIndex->getWishlistBlock()
+                ->getProductItemsBlock()
+                ->getItemProduct($product)
                 ->isVisible();
         }
 
-        $productRegularPrice = 0;
         if ($product instanceof GroupedProduct) {
-            $associatedProducts = $product->getAssociated();
-
-            /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $associatedProduct */
-            foreach ($associatedProducts['products'] as $key => $associatedProduct) {
-                $qty = $associatedProducts['assigned_products'][$key]['qty'];
-                $price = $associatedProduct->getPrice();
-                $productRegularPrice += $qty * $price;
-            }
+            $productRegularPrice = $this->getGroupedProductRegularPrice($product);
         } elseif ($product instanceof BundleProduct) {
-            $bundleSelection = (array)$product->getBundleSelections();
-            foreach ($bundleSelection['products'] as $bundleOption) {
-                $regularBundleProductPrice = 0;
-                /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $bundleProduct */
-                foreach ($bundleOption as $bundleProduct) {
-                    $checkoutData = $bundleProduct->getCheckoutData();
-                    $bundleProductPrice = $checkoutData['qty'] * $checkoutData['cartItem']['price'];
-                    if (0 === $regularBundleProductPrice) {
-                        $regularBundleProductPrice = $bundleProductPrice;
-                    } else {
-                        $regularBundleProductPrice = max([$bundleProductPrice, $regularBundleProductPrice]);
-                    }
-                }
-                $productRegularPrice += $regularBundleProductPrice;
-            }
+            $productRegularPrice = $this->getBundleProductRegularPrice($product);
         } else {
-            $productRegularPrice = (float)$product->getPrice();
+            $productRegularPrice = (float) $product->getPrice();
         }
 
-        $productItem = $wishlistIndex->getWishlistBlock()->getProductItemsBlock()->getItemProduct($product);
+        $productItem = $wishlistIndex->getWishlistBlock()
+            ->getProductItemsBlock()
+            ->getItemProduct($product);
+
         $wishListProductRegularPrice = $product instanceof BundleProduct
             ? (float)$productItem->getPrice()
             : (float)$productItem->getRegularPrice();
@@ -106,6 +91,52 @@ public function processAssert(
         );
     }
 
+    /**
+     * Retrieve grouped product regular price
+     *
+     * @param GroupedProduct $product
+     * @return float
+     */
+    private function getGroupedProductRegularPrice(GroupedProduct $product)
+    {
+        $productRegularPrice = 0;
+        $associatedProducts = $product->getAssociated();
+        /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $associatedProduct */
+        foreach ($associatedProducts['products'] as $key => $associatedProduct) {
+            $qty = $associatedProducts['assigned_products'][$key]['qty'];
+            $price = $associatedProduct->getPrice();
+            $productRegularPrice += $qty * $price;
+        }
+        return $productRegularPrice;
+    }
+
+    /**
+     * Retrieve bundle product regular price
+     *
+     * @param BundleProduct $product
+     * @return float
+     */
+    private function getBundleProductRegularPrice(BundleProduct $product)
+    {
+        $productRegularPrice = 0;
+        $bundleSelection = (array) $product->getBundleSelections();
+        foreach ($bundleSelection['products'] as $bundleOption) {
+            $regularBundleProductPrice = 0;
+            /** @var \Magento\Catalog\Test\Fixture\CatalogProductSimple $bundleProduct */
+            foreach ($bundleOption as $bundleProduct) {
+                $checkoutData = $bundleProduct->getCheckoutData();
+                $bundleProductPrice = $checkoutData['qty'] * $checkoutData['cartItem']['price'];
+                if (0 === $regularBundleProductPrice) {
+                    $regularBundleProductPrice = $bundleProductPrice;
+                } else {
+                    $regularBundleProductPrice = max([$bundleProductPrice, $regularBundleProductPrice]);
+                }
+            }
+            $productRegularPrice += $regularBundleProductPrice;
+        }
+        return $productRegularPrice;
+    }
+
     /**
      * Returns a string representation of the object.
      *

From 3b97fd5b1cc1e8ffedc500311172d35b8d10f155 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcoss.com>
Date: Thu, 17 Jan 2019 16:27:37 +0530
Subject: [PATCH 690/932] issue fixed #20367 In Compare Products page showing
 horizontal scrollbar In body But It should appear in **table-wrapper
 comparison** div For mobile device

issue fixed #20367 In Compare Products page showing horizontal scrollbar In body But It should appear in **table-wrapper comparison** div For mobile device
---
 .../luma/Magento_Catalog/web/css/source/_module.less      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index 501a1d2918d6a..e097aa26c98d3 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -975,6 +975,14 @@
     [class*='block-compare'] {
         display: none;
     }
+    .catalog-product_compare-index {
+        .columns {
+            .column {
+                &.main {
+                    flex-basis: inherit;
+                }
+        }   }
+    }
 }
 
 //

From 53274009c094a07f357d5739b3afd86dd9dc311a Mon Sep 17 00:00:00 2001
From: Ranee 2Jcommerce <ranee@2jcommerce.in>
Date: Thu, 17 Jan 2019 18:59:08 +0530
Subject: [PATCH 691/932] Order-view-invoices :: Order view invoices template
 not display proper on ipad

---
 .../Magento_Sales/web/css/source/module/_order.less       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
index 984556816b035..b816c2b74989c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
@@ -94,6 +94,14 @@
         margin: 0;
         padding: 0;
     }
+     .admin__data-grid-pager-wrap{
+         .selectmenu {
+             margin-bottom: 10px;
+         }
+     }
+   .data-grid-search-control-wrap {
+        margin-bottom: 10px;
+    }
 }
 
 //

From 0fa43b7ba6c695d41b1500fec21f58132dd2ed3c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 17 Jan 2019 16:14:46 +0200
Subject: [PATCH 692/932] ENGCOM-3515: Static test fix.

---
 app/code/Magento/Quote/Model/Quote/Address/Item.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address/Item.php b/app/code/Magento/Quote/Model/Quote/Address/Item.php
index 6b46297f72e8f..ade4f9270b68f 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Item.php
@@ -8,6 +8,8 @@
 use Magento\Quote\Model\Quote;
 
 /**
+ * Quote item model.
+ *
  * @api
  * @method int getParentItemId()
  * @method \Magento\Quote\Model\Quote\Address\Item setParentItemId(int $value)
@@ -103,7 +105,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem
     protected $_quote;
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -111,7 +113,7 @@ protected function _construct()
     }
 
     /**
-     * @return $this|\Magento\Quote\Model\Quote\Item\AbstractItem
+     * @inheritdoc
      */
     public function beforeSave()
     {
@@ -156,6 +158,8 @@ public function getQuote()
     }
 
     /**
+     * Import quote item.
+     *
      * @param \Magento\Quote\Model\Quote\Item $quoteItem
      * @return $this
      */
@@ -194,10 +198,9 @@ public function importQuoteItem(\Magento\Quote\Model\Quote\Item $quoteItem)
     }
 
     /**
-     * @param string $code
-     * @return \Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface|null
+     * @inheritdoc
      */
-    public function getOptionBycode($code)
+    public function getOptionByCode($code)
     {
         if ($this->getQuoteItem()) {
             return $this->getQuoteItem()->getOptionBycode($code);

From 30331c8b784ad26751f7538af530344697b2d503 Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Thu, 17 Jan 2019 10:14:42 -0600
Subject: [PATCH 693/932] MC-10986: Refactor express-checkout-smart-buttons
 component - Added extension points, modified event handler for agreement
 validation, refactored smart button component.

---
 .../express-checkout-smart-buttons.js         | 56 +++----------------
 .../in-context/checkout-express.js            | 36 ++++++++++++
 2 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 3cc36a9ff4068..242d46a11766f 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -18,50 +18,14 @@ define([
      * @return {Array}
      */
     function getFunding(config) {
-        var funding = [];
-        _.each(config, function (name) {
-            funding.push(paypal.FUNDING[name]);
-        }, this);
-
-        return funding;
+        return config.map(function (name) {
+            return paypal.FUNDING[name]
+        })
     };
 
     return function (clientConfig, element) {
 
         var environment = clientConfig.environment;
-        /**
-         *
-         * @param handler
-         */
-        function onChangeValidateStatus(handler) {
-            _.each(jQuery('#' + clientConfig.rendererComponent.getAgreementId()).find('input'), function (element) {
-                element.addEventListener('change', handler);
-            }, this);
-        }
-
-        /**
-         *
-         * @return {Boolean}
-         */
-        function isValid() {
-
-            return clientConfig.validator.validate();
-        }
-
-        /**
-         *
-         * @param actions
-         */
-        function toggleButtons(actions) {
-            var id = '#agreement[1]-error';
-            if (isValid()) {
-                actions.enable()
-            } else {
-                actions.disable();
-                //hide error message
-                jQuery(id).hide();
-            }
-        }
 
         paypal.Button.render({
 
@@ -80,19 +44,14 @@ define([
             commit: true,
 
             validate: function (actions) {
-                //@todo move outside. Load this logic as composite
-                //disable on the first page load
-                toggleButtons(actions);
-                onChangeValidateStatus(function () {
-                    toggleButtons(actions);
-                });
+                clientConfig.rendererComponent.initButtonActions(actions)
             },
 
             /**
              * Execute logic on Paypal button click
              */
             onClick: function () {
-                if (typeof clientConfig.onClick === "function") {
+                if (typeof clientConfig.onClick === 'function') {
                     clientConfig.onClick();
                 }
             },
@@ -105,7 +64,7 @@ define([
             payment: function () {
                 var params = {
                     quote_id: clientConfig.quoteId,
-                    customer_id: clientConfig.customerId || "",
+                    customer_id: clientConfig.customerId || '',
                     button: clientConfig.button,
                     form_key: clientConfig.formKey
                 };
@@ -130,6 +89,7 @@ define([
                         ).fail(
                             function (response) {
                                 var error;
+
                                 try {
                                     error = JSON.parse(response.responseText);
                                 } catch (exception) {
@@ -178,7 +138,7 @@ define([
 
                 return paypal.request.post(clientConfig.onAuthorizeUrl, params)
                     .then(function (res) {
-                        if(res.success) {
+                        if (res.success) {
 
                             return actions.redirect(window, res.redirectUrl);
                         } else {
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index 993dcd433b325..5f84f3057f883 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -25,12 +25,48 @@ define(
     ) {
         'use strict';
 
+        /**
+         * Handler function
+         * @param {String} id
+         * @param {Function} handler
+         */
+        function onChangeValidateStatus(id, handler) {
+            _.each(jQuery('.payment-group')
+                .find('input'), function (element) {
+                element.addEventListener('change', handler);
+            }, this);
+        }
+
         return Component.extend({
 
             defaults: {
                 template: 'Magento_Paypal/payment/paypal-express-in-context'
             },
 
+            /**
+             * Initialize Button Actions
+             * @param {Object} actions
+             * @param {Function} actions.enable() - Enables Smart Buttons
+             * @param {Function} actions.disable() - Disables Smart Buttons
+             */
+            initButtonActions: function (actions) {
+                var renderContext = this;
+
+                this.clientConfig.buttonActions = actions;
+                renderContext.validate();
+                onChangeValidateStatus(this.getAgreementId(), function () {
+                    renderContext.validate();
+                });
+            },
+
+            /**
+             *  Validates Smart Buttons
+             */
+            validate: function () {
+                additionalValidators.validate() && this.clientConfig.buttonActions ?
+                    this.clientConfig.buttonActions.enable() : this.clientConfig.buttonActions.disable();
+            },
+
             /**
              * Render PayPal buttons using checkout.js
              */

From 03a274663a7f912260e0f1df9b57a604ec3219ca Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Thu, 17 Jan 2019 10:15:09 -0600
Subject: [PATCH 694/932] MC-6283: [System Configuration] Introduce the new
 settings related to Smart buttons

- move smart button configuration to a different class
---
 .../Paypal/Model/ExpressConfigProvider.php    |  93 ++------------
 .../Paypal/Model/SmartButtonConfig.php        | 116 ++++++++++++++++++
 2 files changed, 129 insertions(+), 80 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Model/SmartButtonConfig.php

diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 1c556e541c3c7..b1f5b6df9f9cc 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -11,6 +11,7 @@
 use Magento\Framework\UrlInterface;
 use Magento\Payment\Helper\Data as PaymentHelper;
 use Magento\Paypal\Helper\Data as PaypalHelper;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class ExpressConfigProvider
@@ -65,6 +66,11 @@ class ExpressConfigProvider implements ConfigProviderInterface
      */
     protected $urlBuilder;
 
+    /**
+     *
+     */
+    private $smartButtonConfig;
+
     /**
      * Constructor
      *
@@ -74,6 +80,7 @@ class ExpressConfigProvider implements ConfigProviderInterface
      * @param PaypalHelper $paypalHelper
      * @param PaymentHelper $paymentHelper
      * @param UrlInterface $urlBuilder
+     * @param SmartButtonConfig $smartButtonConfig
      */
     public function __construct(
         ConfigFactory $configFactory,
@@ -81,7 +88,8 @@ public function __construct(
         CurrentCustomer $currentCustomer,
         PaypalHelper $paypalHelper,
         PaymentHelper $paymentHelper,
-        UrlInterface $urlBuilder
+        UrlInterface $urlBuilder,
+        SmartButtonConfig $smartButtonConfig = null
     ) {
         $this->localeResolver = $localeResolver;
         $this->config = $configFactory->create();
@@ -93,6 +101,8 @@ public function __construct(
         foreach ($this->methodCodes as $code) {
             $this->methods[$code] = $this->paymentHelper->getMethodInstance($code);
         }
+
+        $this->smartButtonConfig = $smartButtonConfig ?: ObjectManager::getInstance()->get(SmartButtonConfig::class);
     }
 
     /**
@@ -131,8 +141,8 @@ public function getConfig()
                         self::IN_CONTEXT_BUTTON_ID
                     ],
                     'allowedFunding' => [],
-                    'disallowedFunding' => $this->getDisallowedFunding(),
-                    'styles' => $this->getButtonStyles($locale),
+                    'disallowedFunding' => $this->smartButtonConfig->getDisallowedFunding(),
+                    'styles' => $this->smartButtonConfig->getButtonStyles('checkout'),
                     'getTokenUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData'),
                     'onAuthorizeUrl' => $this->urlBuilder->getUrl('paypal/express/onAuthorization'),
                     'onCancelUrl' => $this->urlBuilder->getUrl('paypal/express/cancel')
@@ -187,81 +197,4 @@ protected function getBillingAgreementCode($code)
         return $this->paypalHelper->shouldAskToCreateBillingAgreement($this->config, $customerId)
             ? Express\Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT : null;
     }
-
-    /**
-     * Returns button styles based on configuration
-     *
-     * @param string $locale
-     * @return array
-     */
-    private function getButtonStyles($locale) : array
-    {
-        $this->config->setMethod(Config::METHOD_EXPRESS);
-
-        $styles = [
-            'layout' => 'vertical',
-            'size' => 'responsive',
-            'color' => 'gold',
-            'shape' => 'rect',
-            'label' => 'paypal'
-        ];
-        if (!!$this->config->getValue('checkout_page_button_customize')) {
-            $styles['layout'] = $this->config->getValue('checkout_page_button_layout');
-            $styles['size'] = $this->config->getValue('checkout_page_button_size');
-            $styles['color'] = $this->config->getValue('checkout_page_button_color');
-            $styles['shape'] = $this->config->getValue('checkout_page_button_shape');
-            $styles['label'] = $this->config->getValue('checkout_page_button_label');
-
-            $styles = $this->updateStyles($styles, $locale);
-        }
-        return $styles;
-    }
-
-    /**
-     * Update styles based on locale and labels
-     *
-     * @param array $styles
-     * @param string $locale
-     * @return array
-     */
-    private function updateStyles($styles, $locale) : array
-    {
-        $installmentPeriodLocale = [
-            'en_MX' => 'mx',
-            'es_MX' => 'mx',
-            'en_BR' => 'br',
-            'pt_BR' => 'br'
-        ];
-
-        // Credit label cannot be used with any custom color option or vertical layout.
-        if ($styles['label'] === 'credit') {
-            $styles['color'] = 'darkblue';
-            $styles['layout'] = 'horizontal';
-        }
-
-        // Installment label is only available for specific locales
-        if ($styles['label'] === 'installment') {
-            if (array_key_exists($locale, $installmentPeriodLocale)) {
-                $styles['installmentperiod'] = (int)$this->config->getValue(
-                    "checkout_page_button_{$installmentPeriodLocale[$locale]}_installment_period"
-                );
-            } else {
-                $styles['label'] = 'paypal';
-            }
-        }
-
-        return $styles;
-    }
-
-    /**
-     * Returns disallowed funding from configuration
-     *
-     * @return array
-     */
-    private function getDisallowedFunding() : array
-    {
-        $this->config->setMethod(Config::METHOD_EXPRESS);
-        $disallowedFunding = $this->config->getValue('disable_funding_options');
-        return $disallowedFunding ? explode(',', $disallowedFunding) : [];
-    }
 }
diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
new file mode 100644
index 0000000000000..cb16fe97f2a2f
--- /dev/null
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Model;
+
+use Magento\Framework\Locale\ResolverInterface;
+
+/**
+ * Smart button config
+ */
+class SmartButtonConfig
+{
+    /**
+     * @var \Magento\Framework\Locale\ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * @var ConfigFactory
+     */
+    private $config;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param ConfigFactory $configFactory
+     */
+    public function __construct(
+        ResolverInterface $localeResolver,
+        ConfigFactory $configFactory
+    ) {
+        $this->localeResolver = $localeResolver;
+        $this->config = $configFactory->create();
+    }
+
+    /**
+     * Returns disallowed funding from configuration
+     *
+     * @return array
+     */
+    public function getDisallowedFunding() : array
+    {
+        $disallowedFunding = $this->config->getValue('disable_funding_options');
+        return $disallowedFunding ? explode(',', $disallowedFunding) : [];
+    }
+
+    /**
+     * Returns button styles based on configuration
+     *
+     * @param string $page
+     * @return array
+     */
+    public function getButtonStyles(string $page) : array
+    {
+        $styles = [
+            'layout' => 'vertical',
+            'size' => 'responsive',
+            'color' => 'gold',
+            'shape' => 'rect',
+            'label' => 'paypal'
+        ];
+        if (!!$this->config->getValue("{$page}_page_button_customize")) {
+            $styles['layout'] = $this->config->getValue("{$page}_page_button_layout");
+            $styles['size'] = $this->config->getValue("{$page}_page_button_size");
+            $styles['color'] = $this->config->getValue("{$page}_page_button_color");
+            $styles['shape'] = $this->config->getValue("{$page}_page_button_shape");
+            $styles['label'] = $this->config->getValue("{$page}_page_button_label");
+
+            $styles = $this->updateStyles($styles, $page);
+        }
+        return $styles;
+    }
+
+    /**
+     * Update styles based on locale and labels
+     *
+     * @param array $styles
+     * @param string $page
+     * @return array
+     */
+    private function updateStyles(array $styles, string $page) : array
+    {
+        $locale = $this->localeResolver->getLocale();
+
+        $installmentPeriodLocale = [
+            'en_MX' => 'mx',
+            'es_MX' => 'mx',
+            'en_BR' => 'br',
+            'pt_BR' => 'br'
+        ];
+
+        // Credit label cannot be used with any custom color option or vertical layout.
+        if ($styles['label'] === 'credit') {
+            $styles['color'] = 'darkblue';
+            $styles['layout'] = 'horizontal';
+        }
+
+        // Installment label is only available for specific locales
+        if ($styles['label'] === 'installment') {
+            if (array_key_exists($locale, $installmentPeriodLocale)) {
+                $styles['installmentperiod'] = (int)$this->config->getValue(
+                    "{$page}_page_button_{$installmentPeriodLocale[$locale]}_installment_period"
+                );
+            } else {
+                $styles['label'] = 'paypal';
+            }
+        }
+
+        return $styles;
+    }
+}

From d8380bb43037fa939750dc78ab56466059610aea Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 17 Jan 2019 11:35:59 -0600
Subject: [PATCH 695/932] MC-6282: [Backend]: Create Place Order Controller

---
 app/code/Magento/Paypal/Controller/Express/OnAuthorization.php | 3 +--
 app/code/Magento/Paypal/Model/Express/Checkout.php             | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index 30e5457028fd5..b82f0ba31437d 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -34,7 +34,7 @@ class OnAuthorization extends AbstractExpress implements HttpPostActionInterface
     protected $_checkoutType = PayPalCheckout::class;
 
     /**
-     * @var \Magento\Quote\Model\Quote\PaymentFactory
+     * @var \Magento\Quote\Api\CartRepositoryInterface
      */
     protected $cartRepository;
 
@@ -51,7 +51,6 @@ class OnAuthorization extends AbstractExpress implements HttpPostActionInterface
     private $guestCartRepository;
 
     /**
-     * OnAuthorization constructor.
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 2166319896f96..28200d6eb212a 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -618,7 +618,7 @@ public function canSkipOrderReviewStep()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function returnFromPaypal($token, $payerIdentifier = null)
+    public function returnFromPaypal($token, string $payerIdentifier = null)
     {
         $this->_getApi()
             ->setToken($token)

From 5d4dd6529da68c2911f598d7d2fb5951da51a7be Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Thu, 17 Jan 2019 11:53:44 -0600
Subject: [PATCH 696/932] MC-6283: [System Configuration] Introduce the new
 settings related to Smart buttons

- fix misspelling and extra spaces
---
 .../Paypal/etc/adminhtml/system/express_checkout.xml        | 2 +-
 app/code/Magento/Paypal/i18n/en_US.csv                      | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 425033d0936ee..d74e4adb2220c 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -734,7 +734,7 @@
                             <label>Disable Funding Options</label>
                             <comment>
                                 <![CDATA[PayPal will automatically display each enabled funding option to eligible buyers.
-                                For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is
+                                For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is
                                 offered and the currency offered by the merchant is USD.]]>
                             </comment>
                             <config_path>paypal/style/disable_funding_options</config_path>
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index 5d74c5ae166e0..274ba97df143f 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -726,11 +726,7 @@ User,User
 "Silver","Silver"
 "Black","Black"
 "Features","Features"
-"
-                    PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is offered and the currency offered by the merchant is USD.
-                ","
-                    PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is offered and the currency offered by the merchant is USD.
-                "
+"PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
 "PayPal Credit","PayPal Credit"
 "PayPal Guest Checkout Credit Card Icons","PayPal Guest Checkout Credit Card Icons"
 "Elektronisches Lastschriftverfahren - German ELV","Elektronisches Lastschriftverfahren - German ELV"
\ No newline at end of file

From 065e62863c547217b048537fb8b4e5fcb0d39b4a Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Thu, 17 Jan 2019 12:19:41 -0600
Subject: [PATCH 697/932] MC-6296: Update DCTRequest

Added private functions to build SoftwareName and SoftwareVersion for request
---
 app/code/Magento/Dhl/Model/Carrier.php        | 24 +++++++++-
 .../Dhl/Test/Unit/Model/CarrierTest.php       | 46 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index bd129eb6111a5..769b440396fbe 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1022,8 +1022,8 @@ protected function _buildQuotesRequestXml()
         $nodeServiceHeader->addChild('Password', (string) $this->getConfigData('password'));
 
         $nodeMetaData = $nodeRequest->addChild('MetaData');
-        $nodeMetaData->addChild('SoftwareName', $this->productMetadata->getName());
-        $nodeMetaData->addChild('SoftwareVersion', $this->productMetadata->getVersion());
+        $nodeMetaData->addChild('SoftwareName', $this->buildSoftwareName());
+        $nodeMetaData->addChild('SoftwareVersion', $this->buildSoftwareVersion());
 
         $nodeFrom = $nodeGetQuote->addChild('From');
         $nodeFrom->addChild('CountryCode', $rawRequest->getOrigCountryId());
@@ -2036,4 +2036,24 @@ private function buildMessageReference(string $servicePrefix): string
 
         return str_replace('.', '', uniqid("MAGE_{$servicePrefix}_", true));
     }
+
+    /**
+     * Builds a string to be used as the request SoftwareName.
+     *
+     * @return string
+     */
+    private function buildSoftwareName(): string
+    {
+        return substr($this->productMetadata->getName(), 0, 30);
+    }
+
+    /**
+     * Builds a string to be used as the request SoftwareVersion.
+     *
+     * @return string
+     */
+    private function buildSoftwareVersion(): string
+    {
+        return substr($this->productMetadata->getVersion(), 0, 10);
+    }
 }
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 785ddb854fe7a..2fc0f1c43f949 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -566,6 +566,40 @@ public function testBuildMessageReference()
         $method->invoke($this->model, 'TEST');
     }
 
+    /**
+     * Tests that the built software name string is of the appropriate format.
+     *
+     * @throws \ReflectionException
+     */
+    public function testBuildSoftwareName()
+    {
+        $method = new \ReflectionMethod($this->model, 'buildSoftwareName');
+        $method->setAccessible(true);
+
+        $name = $method->invoke($this->model);
+        self::assertLessThanOrEqual(30, $name);
+
+        $nameExceedsLength = $method->invoke($this->model);
+        self::assertLessThanOrEqual(30, $nameExceedsLength);
+    }
+
+    /**
+     * Tests that the built software version string is of the appropriate format.
+     *
+     * @throws \ReflectionException
+     */
+    public function testBuildSoftwareVersion()
+    {
+        $method = new \ReflectionMethod($this->model, 'buildSoftwareVersion');
+        $method->setAccessible(true);
+
+        $version = $method->invoke($this->model);
+        self::assertLessThanOrEqual(10, strlen($version));
+
+        $versionExceedsLength = $method->invoke($this->model);
+        self::assertLessThanOrEqual(10, strlen($versionExceedsLength));
+    }
+
     /**
      * Creates mock for XML factory.
      *
@@ -755,8 +789,16 @@ private function getHttpClientFactory(): MockObject
     private function getProductMetadata(): MockObject
     {
         $productMetadata = $this->createMock(\Magento\Framework\App\ProductMetadata::class);
-        $productMetadata->method('getName')->willReturn('Magento');
-        $productMetadata->method('getVersion')->willReturn('2.3.1');
+
+        $productMetadata->method('getName')->willReturnOnConsecutiveCalls(
+            'Magento',
+            str_pad('Magento', 24, '_')
+        );
+
+        $productMetadata->method('getVersion')->willReturnOnConsecutiveCalls(
+            '2.3.1',
+            'dev-MC-1000'
+        );
 
         return $productMetadata;
     }

From 61d4972b7bcad02268b33bd212996457006dd764 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Thu, 17 Jan 2019 13:15:14 -0600
Subject: [PATCH 698/932] MC-6281: [Backend]: Create Controller to getToken
 from PayPal

- suppress warning for coupling between objects
---
 app/code/Magento/Paypal/Controller/Express/GetTokenData.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
index cc64773cd1702..1e2b8a55ae5fe 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -16,6 +16,7 @@
 
 /**
  * Retrieve paypal token
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GetTokenData extends AbstractExpress implements HttpGetActionInterface
 {

From e1fb02adf898a77f3d826ddc21426ad6ee48834d Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 17 Jan 2019 13:51:17 -0600
Subject: [PATCH 699/932] MC-6289: Support Billing Agreements for Smart buttons
 on checkout flow

---
 app/code/Magento/Paypal/Controller/Express/GetTokenData.php   | 4 +++-
 .../web/template/payment/paypal-express-in-context.html       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
index 1e2b8a55ae5fe..716eab8d7c2ad 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -153,7 +153,6 @@ private function getToken(): ?string
         $quoteId = $this->getRequest()->getParam('quote_id');
         $customerId = $this->getRequest()->getParam('customer_id');
         $hasButton = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_BUTTON);
-        $isBaRequested = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT);
 
         $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
         $this->_initCheckout($quote);
@@ -172,6 +171,9 @@ private function getToken(): ?string
                 $quote->getShippingAddress()
             );
 
+            // billing agreement
+            $isBaRequested = (bool)$this->getRequest()
+                ->getParam(Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT);
             $this->_checkout->setIsBillingAgreementRequested($isBaRequested);
         }
 
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index b6f0886de1aab..7fa1baa329585 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -25,12 +25,12 @@
         <!-- ko foreach: getRegion('messages') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
         <!--/ko-->
+        <!-- ko template: 'Magento_Paypal/payment/express/billing-agreement' --><!-- /ko -->
         <div class="checkout-agreements-block" data-bind="attr: {id: getAgreementId()}">
             <!-- ko foreach: $parent.getRegion('before-place-order') -->
                 <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
-
         <div class="actions-toolbar" data-bind="attr: {id: getButtonId()}" afterRender="renderPayPalButtons"></div>
     </div>
 </div>

From 8fbe1b4e9c8e4e9eaccc54feeda3af3e97adb3d1 Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Thu, 17 Jan 2019 14:28:10 -0600
Subject: [PATCH 700/932] MC-4389: Convert UpdateVirtualProductEntityTest to
 MFTF

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  37 ++-
 ...AdminProductCustomizableOptionsSection.xml |   8 +-
 .../Section/AdminProductGridFilterSection.xml |   2 +-
 ...rPriceInStockVisibleInCategoryOnlyTest.xml | 155 +++++++++++
 ...thCustomOptionsVisibleInSearchOnlyTest.xml | 249 ++++++++++++++++++
 ...tOfStockVisibleInCategoryAndSearchTest.xml | 100 +++++++
 ...iceOutOfStockVisibleInCategoryOnlyTest.xml | 127 +++++++++
 ...PriceOutOfStockVisibleInSearchOnlyTest.xml | 112 ++++++++
 ...eInStockVisibleInCategoryAndSearchTest.xml | 143 ++++++++++
 ...tOfStockVisibleInCategoryAndSearchTest.xml | 135 ++++++++++
 ...eInStockVisibleInCategoryAndSearchTest.xml | 155 +++++++++++
 ...rPriceInStockVisibleInCategoryOnlyTest.xml | 151 +++++++++++
 ...tOfStockVisibleInCategoryAndSearchTest.xml | 151 +++++++++++
 13 files changed, 1519 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index d92ed97b1fb75..a31f2fd3cd10e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -260,7 +260,7 @@
         <data key="status">1</data>
         <data key="quantity">100</data>
         <data key="weight">0</data>
-        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="productWithDescription" type="product">
@@ -565,4 +565,39 @@
         <data key="urlKey" unique="suffix">virtual-product</data>
         <data key="type_id">virtual</data>
     </entity>
+    <entity name="updateVirtualProductRegularPriceInStock" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">120.00</data>
+        <data key="productTaxClass">None</data>
+        <data key="quantity">999</data>
+        <data key="status">In Stock</data>
+        <data key="storefrontStatus">IN STOCK</data>
+        <data key="visibility">Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="updateVirtualProductWithTierPriceInStock" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">99.99</data>
+        <data key="productTaxClass">None</data>
+        <data key="quantity">999</data>
+        <data key="status">In Stock</data>
+        <data key="storefrontStatus">IN STOCK</data>
+        <data key="visibility">Catalog</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="updateRegularPriceVirtualProductOutOfStock" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">99.99</data>
+        <data key="productTaxClass">Taxable Goods</data>
+        <data key="status">Out of Stock</data>
+        <data key="storefrontStatus">OUT OF STOCK</data>
+        <data key="visibility">Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
index 422b4c07f7c5b..8032dae88e51f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductCustomizableOptionsSection.xml
@@ -40,9 +40,9 @@
         <element name="addValue" type="button" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@data-action='add_new_row']" timeout="30"/>
         <element name="valueTitle" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='title']//input" />
         <element name="valuePrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[contains(@class, 'admin__control-table')]//tbody/tr[last()]//*[@data-index='price']//input" />
-        <element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{index}}][price]']" parameterized="true"/>
-        <element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{var}}][price_type]']" parameterized="true"/>
-        <element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{index}}][sku]']" parameterized="true"/>
-        <element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr[last()]//*[@name='product[options][{{index}}][file_extension]']" parameterized="true"/>
+        <element name="optionPrice" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][price]']" parameterized="true"/>
+        <element name="optionPriceType" type="select" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{var}}][price_type]']" parameterized="true"/>
+        <element name="optionSku" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][sku]']" parameterized="true"/>
+        <element name="optionFileExtensions" type="input" selector="//*[@data-index='custom_options']//*[@data-index='options']/tbody/tr//*[@name='product[options][{{index}}][file_extension]']" parameterized="true"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index f606884183855..0677de3d42d31 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -31,6 +31,6 @@
         <element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
         <element name="keywordSearch" type="input" selector="input#fulltext"/>
         <element name="keywordSearchButton" type="button" selector=".data-grid-search-control-wrap button.action-submit" timeout="30"/>
-        <element name="nthRow" type="block" selector=".data-row:nth-of-type(1)"/>
+        <element name="nthRow" type="block" selector=".data-row:nth-of-type({{var}})" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
new file mode 100644
index 0000000000000..9bdc93e61e499
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -0,0 +1,155 @@
+<?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="AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Regular Price (In Stock) Visible in Category Only"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (In Stock) Visible in Category Only"/>
+            <testCaseId value="MC-6495"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with regular price -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice.price}}" stepKey="fillProductPrice"/>
+        <!-- Press enter to validate advanced pricing link -->
+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="selectProductTierPriceWebsiteInput"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductRegularPrice.quantity}}" stepKey="fillProductQuantity"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPrice.status}}" stepKey="selectStockStatusInStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product(from above step) in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+
+        <!-- Verify we see created virtual product with tier price(from the above step) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice.price}}" stepKey="seeProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="seeProductTierPriceWebsiteInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="seeProductTierPriceCustomerGroupInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductRegularPrice.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPrice.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!-- Verify customer don't see updated virtual product link on storefront page and is searchable by sku -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="fillVirtualProductSkuOnStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="dontSeeVirtualProductName"/>
+
+        <!-- Verify customer see updated virtual product in category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="seeVirtualProductLinkOnCategoryPage"/>
+        <grabTextFrom selector="{{StorefrontCategoryMainSection.asLowAs}}" stepKey="tierPriceTextOnCategoryPage"/>
+        <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
+            <expectedResult type="string">As low as ${{tierPriceOnVirtualProduct.price}}</expectedResult>
+            <actualResult type="variable">tierPriceTextOnCategoryPage</actualResult>
+        </assertEquals>
+
+        <!-- Verify customer see updated virtual product and tier price on product page -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice.urlKey)}}" stepKey="goToStorefrontProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 10%</expectedResult>
+            <actualResult type="variable">tierPriceText</actualResult>
+        </assertEquals>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateVirtualProductRegularPrice.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductRegularPrice.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
new file mode 100644
index 0000000000000..d67d5b36109e6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -0,0 +1,249 @@
+<?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="AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Regular Price (In Stock) with Custom Options Visible in Search Only"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (In Stock) with Custom Options Visible in Search Only"/>
+            <testCaseId value="MC-6641"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with regular price(in stock) -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPriceInStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceInStock.price}}" stepKey="fillProductPrice"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPriceInStock.productTaxClass}}" stepKey="selectProductTaxClass"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductRegularPriceInStock.quantity}}" stepKey="fillProductQuantity"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPriceInStock.status}}" stepKey="selectStockStatusInStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceInStock.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
+        <!-- Create virtual product with customizable options dataSet1 -->
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButton"/>
+        <waitForPageLoad stepKey="waitForFirstOption"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="{{virtualProductCustomizableOption1.title}}" stepKey="fillOptionTitleForFirstDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('1')}}" stepKey="selectOptionTypeDropDownFirstDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('1', virtualProductCustomizableOption1.type)}}" stepKey="selectOptionFieldFromDropDownForFirstDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('0')}}" stepKey="checkRequiredCheckBoxForFirstDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price}}" stepKey="fillOptionPriceForFirstDataSet"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price_type}}" stepKey="selectOptionPriceTypeForFirstDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_sku}}" stepKey="fillOptionSkuForFirstDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForFirstDataSet"/>
+         <!--Create virtual product with customizable options dataSet2 -->
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForSecondDataSet"/>
+        <waitForPageLoad stepKey="waitForSecondDataSetToLoad"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('1')}}" userInput="{{virtualProductCustomizableOption2.title}}" stepKey="fillOptionTitleForSecondDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('2')}}" stepKey="selectOptionTypeDropDownSecondDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('2', virtualProductCustomizableOption2.type)}}" stepKey="selectOptionFieldFromDropDownForSecondDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('1')}}" stepKey="checkRequiredCheckBoxForSecondDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price}}" stepKey="fillOptionPriceForSecondDataSet"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price_type}}" stepKey="selectOptionPriceTypeForSecondDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_sku}}" stepKey="fillOptionSkuForSecondDataSet"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForSecondDataSet"/>
+        <!-- Create virtual product with customizable options dataSet3 -->
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForThirdSetOfData"/>
+        <waitForPageLoad stepKey="waitForThirdSetOfDataToLoad"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('2')}}" userInput="{{virtualProductCustomizableOption3.title}}" stepKey="fillOptionTitleForThirdDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('3')}}" stepKey="selectOptionTypeDropDownForThirdDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('3', virtualProductCustomizableOption3.type)}}" stepKey="selectOptionFieldFromDropDownForThirdDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('2')}}" stepKey="checkRequiredCheckBoxForThirdDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForThirdDataSetToAddFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_title}}" stepKey="fillOptionTitleForThirdDataSetFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price}}" stepKey="fillOptionPriceForThirdDataSetFirstRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price_type}}" stepKey="selectOptionPriceTypeForThirdDataSetFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_sku}}" stepKey="fillOptionSkuForThirdDataSetFirstRow"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForThirdDataSetToAddSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_title}}" stepKey="fillOptionTitleForThirdDataSetSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price}}" stepKey="fillOptionPriceForThirdDataSetSecondRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price_type}}" stepKey="selectOptionPriceTypeForThirdDataSetSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_sku}}" stepKey="fillOptionSkuForThirdDataSetSecondRow"/>
+        <!-- Create virtual product with customizable options dataSet4 -->
+        <scrollToTopOfPage stepKey="scrollToAddOptionButton"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForFourthDataSet"/>
+        <waitForPageLoad stepKey="waitForFourthDataSetToLoad"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('3')}}" userInput="{{virtualProductCustomizableOption4.title}}" stepKey="fillOptionTitleForFourthDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('4')}}" stepKey="selectOptionTypeDropDownForFourthSetOfData"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('4', virtualProductCustomizableOption4.type)}}" stepKey="selectOptionFieldFromDropDownForFourthDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('3')}}" stepKey="checkRequiredCheckBoxForFourthDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForFourthDataSetToAddFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_title}}" stepKey="fillOptionTitleForFourthDataSetFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price}}" stepKey="fillOptionPriceForFourthDataSetFirstRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetFirstRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_sku}}" stepKey="fillOptionSkuForFourthDataSetFirstRow"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addValue}}" stepKey="clickAddOptionButtonForFourthDataSetToAddSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_title}}" stepKey="fillOptionTitleForFourthDataSetSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price}}" stepKey="fillOptionPriceForFourthDataSetSecondRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetSecondRow"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="fillOptionSkuForFourthDataSetSecondRow"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product(from above step) in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPriceInStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+
+        <!-- Verify we customer see updated virtual product in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPriceInStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceInStock.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPriceInStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductRegularPriceInStock.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPriceInStock.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceInStock.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceInStock.urlKey}}" stepKey="seeUrlKey"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOptionToSeeValues"/>
+        <!-- Create virtual product with customizable options dataSet1 -->
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButton1"/>
+        <waitForPageLoad stepKey="waitForFirstOptionToLoad"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="{{virtualProductCustomizableOption1.title}}" stepKey="seeOptionTitleForFirstDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('1')}}" stepKey="selectOptionTypeDropDownFirstDataSet1"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('1', virtualProductCustomizableOption1.type)}}" stepKey="selectOptionFieldFromDropDownForFirstDataSet1"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('0')}}" stepKey="checkRequiredCheckBoxForFirstDataSet1"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionPrice('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price}}" stepKey="seeOptionPriceForFirstDataSet"/>
+        <seeOptionIsSelected selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price_type}}" stepKey="selectOptionPriceTypeForFirstDataSet1"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionSku('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_sku}}" stepKey="seeOptionSkuForFirstDataSet"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_max_characters}}" stepKey="seeOptionMaxCharactersForFirstDataSet"/>
+        <!--Create virtual product with customizable options dataSet2 -->
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForSecondDataSetToSeeFields"/>
+        <waitForPageLoad stepKey="waitForTheSecondDataSetToLoad"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('1')}}" userInput="{{virtualProductCustomizableOption2.title}}" stepKey="seeOptionTitleForSecondDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('2')}}" stepKey="selectOptionTypeDropDownSecondDataSet2"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('2', virtualProductCustomizableOption2.type)}}" stepKey="selectOptionFieldFromDropDownForSecondDataSet2"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('1')}}" stepKey="checkRequiredCheckBoxForTheSecondDataSet"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionPrice('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price}}" stepKey="seeOptionPriceForSecondDataSet"/>
+        <seeOptionIsSelected selector="{{AdminProductCustomizableOptionsSection.optionPriceType('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price_type}}" stepKey="selectOptionPriceTypeForTheSecondDataSet"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionSku('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_sku}}" stepKey="seeOptionSkuForSecondDataSet"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_max_characters}}" stepKey="seeOptionMaxCharactersForSecondDataSet"/>
+        <!-- Create virtual product with customizable options dataSet3 -->
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForTheThirdSetOfData"/>
+        <waitForPageLoad stepKey="waitForTheThirdSetOfDataToLoad"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('2')}}" userInput="{{virtualProductCustomizableOption3.title}}" stepKey="seeOptionTitleForThirdDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('3')}}" stepKey="selectOptionTypeDropDownForTheThirdDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('3', virtualProductCustomizableOption3.type)}}" stepKey="selectOptionFieldFromDropDownForTheThirdDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('2')}}" stepKey="checkRequiredCheckBoxForTheThirdDataSet"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_title}}" stepKey="seeOptionTitleForThirdDataSetFirstRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price}}" stepKey="seeOptionPriceForThirdDataSetFirstRow"/>
+        <seeOptionIsSelected selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_price_type}}" stepKey="selectOptionPriceTypeForTheThirdDataSetFirstRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'0')}}" userInput="{{virtualProductCustomizableOption3.option_0_sku}}" stepKey="seeOptionSkuForThirdDataSetFirstRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_title}}" stepKey="seeOptionTitleForThirdDataSetSecondRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price}}" stepKey="seeOptionPriceForThirdDataSetSecondRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price_type}}" stepKey="selectOptionPriceTypeForTheThirdDataSetSecondRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_sku}}" stepKey="seeOptionSkuForThirdDataSetSecondRow"/>
+        <!-- Create virtual product with customizable options dataSet4 -->
+        <scrollToTopOfPage stepKey="scrollToTheAddOptionButton"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForTheFourthDataSet"/>
+        <waitForPageLoad stepKey="waitForTheFourthDataSetToLoad"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('3')}}" userInput="{{virtualProductCustomizableOption4.title}}" stepKey="fillOptionTitleForTheFourthDataSet"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeDropDown('4')}}" stepKey="selectOptionTypeDropDownForTheFourthSetOfData"/>
+        <click selector="{{AdminProductCustomizableOptionsSection.optionTypeItem('4', virtualProductCustomizableOption4.type)}}" stepKey="selectOptionFieldFromDropDownForTheFourthDataSet"/>
+        <checkOption selector="{{AdminProductCustomizableOptionsSection.requiredCheckBox('3')}}" stepKey="checkRequiredCheckBoxForTheFourthDataSet"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_title}}" stepKey="seeOptionTitleForFourthDataSetFirstRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price}}" stepKey="seeOptionPriceForFourthDataSetFirstRow"/>
+        <seeOptionIsSelected selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_price_type}}" stepKey="selectOptionPriceTypeForTheFourthDataSetFirstRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'0')}}" userInput="{{virtualProductCustomizableOption4.option_0_sku}}" stepKey="seeOptionSkuForFourthDataSetFirstRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_title}}" stepKey="seeOptionTitleForFourthDataSetSecondRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price}}" stepKey="seeOptionPriceForFourthDataSetSecondRow"/>
+        <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForTheFourthDataSetSecondRow"/>
+        <seeInField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="seeOptionSkuForFourthDataSetSecondRow"/>
+
+        <!--Verify customer don't see updated virtual product link on category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="dontSeeVirtualProductNameOnCategoryPage"/>
+
+        <!-- Verify customer see updated virtual product (from the above step) on the storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPriceInStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceInStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPriceInStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateVirtualProductRegularPriceInStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductRegularPriceInStock.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+        <!--Verify we customer see customizable options are Required -->
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption1.title)}}" stepKey="verifyFistCustomOptionIsRequired" />
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomInput(virtualProductCustomizableOption2.title)}}" stepKey="verifySecondCustomOptionIsRequired" />
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption3.title)}}" stepKey="verifyThirdCustomOptionIsRequired" />
+        <seeElement selector="{{StorefrontProductInfoMainSection.requiredCustomSelect(virtualProductCustomizableOption4.title)}}" stepKey="verifyFourthCustomOptionIsRequired" />
+        <!--Verify customer see customizable option titles and prices -->
+        <grabMultiple selector="{{StorefrontProductInfoMainSection.allCustomOptionLabels}}" stepKey="allCustomOptionLabels" />
+        <assertEquals stepKey="verifyLabels">
+            <actualResult type="variable">allCustomOptionLabels</actualResult>
+            <expectedResult type="array">[{{virtualProductCustomizableOption1.title}} + ${{virtualProductCustomizableOption1.option_0_price}}, {{virtualProductCustomizableOption2.title}} + ${{virtualProductCustomizableOption2.option_0_price}}, {{virtualProductCustomizableOption3.title}}, {{virtualProductCustomizableOption4.title}}]</expectedResult>
+        </assertEquals>
+        <grabAttributeFrom userInput="for" selector="{{StorefrontProductInfoMainSection.customOptionLabel(virtualProductCustomizableOption4.title)}}" stepKey="fourthOptionId" />
+        <grabMultiple selector="{{StorefrontProductInfoMainSection.customSelectOptions({$fourthOptionId})}}" stepKey="grabFourthOptions" />
+        <assertEquals stepKey="assertFourthSelectOptions">
+            <actualResult type="variable">grabFourthOptions</actualResult>
+            <expectedResult type="array">['-- Please Select --', {{virtualProductCustomizableOption4.option_0_title}} +$12.01, {{virtualProductCustomizableOption4.option_1_title}} +$20.02]</expectedResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..9af8365388531
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,100 @@
+<?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="AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Regular Price (Out of Stock) Visible in Category and Search"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (Out of Stock) Visible in Category and Search"/>
+            <testCaseId value="MC-7433"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with regular price(out of stock) -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.price}}" stepKey="fillProductPrice"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product(from above step) in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+
+        <!-- Verify customer see updated virtual product with regular price(out of stock) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.status}}" stepKey="seeProductStockStatus"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!--Verify customer see updated virtual product with regular price(out of stock) on product storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPriceOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateVirtualProductRegularPriceOutOfStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductRegularPriceOutOfStock.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
new file mode 100644
index 0000000000000..a1c1bbdf2708a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -0,0 +1,127 @@
+<?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="AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Regular Price (Out of Stock) Visible in Category Only"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (Out of Stock) Visible in Category Only"/>
+            <testCaseId value="MC-6503"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickclearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with regular price(out of stock) -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.price}}" stepKey="fillProductPrice"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product(from above step) in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+
+        <!-- Verify we see updated virtual product with regular price(from the above step) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!--Verify customer don't see updated virtual product link(from above step) on category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="dontseeVirtualProductNameOnCategoryPage"/>
+
+        <!--Verify customer see updated virtual product (from above step) on product storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductWithRegularPriceOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateVirtualProductWithRegularPriceOutOfStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductWithRegularPriceOutOfStock.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+
+        <!--Verify customer don't see updated virtual product link(from above step) on magento storefront page and is searchable by sku -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductWithRegularPriceOutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="fillVirtualProductName"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="dontSeeVirtualProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
new file mode 100644
index 0000000000000..cc9ce1beaed37
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
@@ -0,0 +1,112 @@
+<?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="AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Regular Price (Out of Stock) Visible in Search Only"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Regular Price (Out of Stock) Visible in Search Only"/>
+            <testCaseId value="MC-6498"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with regular price(out of stock) -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.price}}" stepKey="fillProductPrice"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product(from above step) in the grid -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+
+        <!-- Verify customer see updated virtual product with regular price in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.status}}" stepKey="seeProductStockStatus"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!--Verify customer see updated virtual product on storefront page by url key -->
+        <amOnPage url="{{StorefrontProductPage.url(updateRegularPriceVirtualProductOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateRegularPriceVirtualProductOutOfStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateRegularPriceVirtualProductOutOfStock.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+
+        <!--Verify customer don't see updated virtual product link on magento storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(updateRegularPriceVirtualProductOutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="fillVirtualProductName"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="dontSeeVirtualProductLinkOnStorefrontPage"/>
+
+        <!--Verify customer don't see updated virtual product link on category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$initialCategoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="dontSeeVirtualProductLinkOnCategoryPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..9b6a56d6f81d8
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,143 @@
+<?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="AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Special Price (In Stock) Visible in Category and Search"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Special Price (In Stock) Visible in Category and Search"/>
+            <testCaseId value="MC-6496"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with special price  -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductSpecialPrice.price}}" stepKey="fillProductPrice"/>
+        <!-- Press enter to validate advanced pricing link -->
+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{updateVirtualProductSpecialPrice.special_price}}" stepKey="fillSpecialPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductSpecialPrice.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductSpecialPrice.quantity}}" stepKey="fillProductQuantity"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductSpecialPrice.status}}" stepKey="selectStockStatusInStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPrice.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPrice.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product(from above step) in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+        <!-- Verify customer see updated virtual product with special price(from the above step) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductSpecialPrice.price}}" stepKey="seeProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{updateVirtualProductSpecialPrice.special_price}}" stepKey="seeSpecialPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductSpecialPrice.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductSpecialPrice.quantity}}" stepKey="seeProductQuantity"/>
+        <see selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductSpecialPrice.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <see selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPrice.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPrice.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!--Verify customer see updated virtual product link on category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
+
+        <!-- Verify customer see updated virtual product on the magento storefront page and is searchable by sku -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductSpecialPrice.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="fillVirtualProductName"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="seeVirtualProductName"/>
+
+        <!--Verify customer see updated virtual product with special price(from above step) on product storefront page by url key -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductSpecialPrice.urlKey)}}" stepKey="goToProductStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="seeVirtualProductSku"/>
+        <!-- Verify customer see virtual product special price on the storefront page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
+        <assertEquals stepKey="assertSpecialPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductSpecialPrice.special_price}}</expectedResult>
+            <actualResult type="variable">specialPriceAmount</actualResult>
+        </assertEquals>
+        <!-- Verify customer see virtual product old price on the storefront page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" stepKey="oldPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductSpecialPrice.price}}</expectedResult>
+            <actualResult type="variable">oldPriceAmount</actualResult>
+        </assertEquals>
+        <!-- Verify customer see virtual product in stock status on the storefront page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateVirtualProductSpecialPrice.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..920a0a494bae5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,135 @@
+<?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="UpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Special Price (Out of Stock) Visible in Category and Search"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Special Price (Out of Stock) Visible in Category and Search"/>
+            <testCaseId value="MC-6505"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with special price(out of stock) -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.price}}" stepKey="fillProductPrice"/>
+        <!-- Press enter to validate advanced pricing link -->
+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.special_price}}" stepKey="fillSpecialPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product with special price(out of stock) in the grid -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+        <!-- Verify customer see updated virtual product with special price(out of stock) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.price}}" stepKey="seeProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.special_price}}" stepKey="seeSpecialPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <see selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <see selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!--Verify customer see updated virtual product with special price(out of stock) on product storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductSpecialPriceOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateVirtualProductSpecialPriceOutOfStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductSpecialPriceOutOfStock.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+         <!--Verify customer see virtual product with special price on the storefront page-->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
+        <assertEquals stepKey="assertSpecialPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductSpecialPriceOutOfStock.special_price}}</expectedResult>
+            <actualResult type="variable">specialPriceAmount</actualResult>
+        </assertEquals>
+
+        <!--Verify customer don't see updated virtual product link on magento storefront page and is searchable by sku -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductSpecialPriceOutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="fillVirtualProductName"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="dontSeeVirtualProductNameOnStorefrontPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..d4ec5e410d9ff
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,155 @@
+<?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="UpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Tier Price (In Stock) Visible in Category and Search"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Tier Price (In Stock) Visible in Category and Search"/>
+            <testCaseId value="MC-6504"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with tier price -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductTierPriceInStock.price}}" stepKey="fillProductPrice"/>
+        <!-- Press enter to validate advanced pricing link -->
+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="selectProductTierPriceWebsiteInput"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductTierPriceInStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductTierPriceInStock.quantity}}" stepKey="fillProductQuantity"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductTierPriceInStock.status}}" stepKey="selectStockStatusInStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product(from above step) in the grid -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+
+        <!-- Verify customer see updated virtual product with tier price(from the above step) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductTierPriceInStock.price}}" stepKey="seeProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="seeProductTierPriceWebsiteInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="seeProductTierPriceCustomerGroupInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductTierPriceInStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductTierPriceInStock.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductTierPriceInStock.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductTierPriceInStock.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductTierPriceInStock.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!--Verify customer see updated virtual product link on category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="seeVirtualProductLinkOnCategoryPage"/>
+
+        <!--Verify customer see updated virtual product with tier price on product storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductTierPriceInStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductTierPriceInStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateVirtualProductTierPriceInStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductTierPriceInStock.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 38%</expectedResult>
+            <actualResult type="variable">tierPriceText</actualResult>
+        </assertEquals>
+
+        <!--Verify customer see updated virtual product link on magento storefront page and is searchable by sku -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductTierPriceInStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="fillVirtualProductName"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductTierPriceInStock.name}}" stepKey="seeVirtualProductName"/>
+        <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnStorefrontPage"/>
+        <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
+            <expectedResult type="string">As low as ${{tierPriceOnVirtualProduct.price}}</expectedResult>
+            <actualResult type="variable">tierPriceTextOnStorefrontPage</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
new file mode 100644
index 0000000000000..717d710b4a288
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -0,0 +1,151 @@
+<?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="AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Tier Price (In Stock) Visible in Category Only"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Tier Price (In Stock) Visible in Category Only"/>
+            <testCaseId value="MC-7508"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with tier price(in stock) -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductWithTierPriceInStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductWithTierPriceInStock.price}}" stepKey="fillProductPrice"/>
+        <!-- Press enter to validate advanced pricing link -->
+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="selectProductTierPriceWebsiteInput"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductWithTierPriceInStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductWithTierPriceInStock.quantity}}" stepKey="fillProductQuantity"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductWithTierPriceInStock.status}}" stepKey="selectStockStatusInStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product(from above step) in the grid -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductWithTierPriceInStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+
+        <!-- Verify customer see updated virtual product with tier price(from the above step) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductWithTierPriceInStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductWithTierPriceInStock.price}}" stepKey="seeProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="seeProductTierPriceWebsiteInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="seeProductTierPriceCustomerGroupInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductWithTierPriceInStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualProductWithTierPriceInStock.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductWithTierPriceInStock.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithTierPriceInStock.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!--Verify customer see updated virtual product link on category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
+
+        <!--Verify customer see updated virtual product with tier price(from above step) on product storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductWithTierPriceInStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductWithTierPriceInStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductWithTierPriceInStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateVirtualProductWithTierPriceInStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualProductWithTierPriceInStock.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+        <!-- Verify customer see product tier price on product page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 10%</expectedResult>
+            <actualResult type="variable">tierPriceText</actualResult>
+        </assertEquals>
+
+        <!--Verify customer don't see updated virtual product link on magento storefront page and is searchable by sku -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductWithTierPriceInStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductTierPriceInStock.sku}}" stepKey="fillVirtualProductName"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="dontSeeVirtualProductName"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
new file mode 100644
index 0000000000000..703a4e24cdca9
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -0,0 +1,151 @@
+<?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="AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest">
+        <annotations>
+            <stories value="Update Virtual Product"/>
+            <title value="Update Virtual Product with Tier Price (Out of Stock) Visible in Category and Search"/>
+            <description value="Test log in to Update Virtual Product and Update Virtual Product with Tier Price (Out of Stock) Visible in Category and Search"/>
+            <testCaseId value="MC-6499"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="SimpleSubCategory" stepKey="initialCategoryEntity"/>
+            <createData entity="defaultVirtualProduct" stepKey="initialVirtualProduct">
+                <requiredEntity createDataKey="initialCategoryEntity"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
+            <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Search default virtual product in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
+        <!-- Update virtual product with tier price(out of stock) -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualTierPriceOutOfStock.price}}" stepKey="fillProductPrice"/>
+        <!-- Press enter to validate advanced pricing link -->
+        <pressKey selector="{{AdminProductFormSection.productPrice}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickCustomerGroupPriceAddButton"/>
+        <scrollTo selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" x="50" y="0" stepKey="scrollToProductTierPriceQuantityInputTextBox"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="selectProductTierPriceWebsiteInput"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="selectProductTierPriceCustomerGroupInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="fillProductTierPriceQuantityInput"/>
+        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="selectProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualTierPriceOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualTierPriceOutOfStock.quantity}}" stepKey="fillProductQuantity"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualTierPriceOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualTierPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <!-- Verify we see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
+
+        <!-- Search updated virtual product(from above step) in the grid page -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
+        <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
+
+        <!-- Verify we customer see updated virtual product with tier price(from the above step) in the product form page -->
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualTierPriceOutOfStock.price}}" stepKey="seeProductPrice"/>
+        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickAdvancedPricingLink1"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceWebsiteSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.website}}" stepKey="seeProductTierPriceWebsiteInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="{{tierPriceOnVirtualProduct.customer_group}}" stepKey="seeProductTierPriceCustomerGroupInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="{{tierPriceOnVirtualProduct.qty}}" stepKey="seeProductTierPriceQuantityInput"/>
+        <seeInField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceFixedPriceInput('0')}}" userInput="{{tierPriceOnVirtualProduct.price}}" stepKey="seeProductTierPriceFixedPrice"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickAdvancedPricingCloseButton"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualTierPriceOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{updateVirtualTierPriceOutOfStock.quantity}}" stepKey="seeProductQuantity"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualTierPriceOutOfStock.status}}" stepKey="seeProductStockStatus"/>
+        <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
+        <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">selectedCategories</actualResult>
+            <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
+        </assertEquals>
+        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualTierPriceOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
+
+        <!--Verify customer don't see updated virtual product link on category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="dontSeeVirtualProductNameOnCategoryPage"/>
+
+        <!--Verify customer see updated virtual product with tier price(from above step) on product storefront page -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualTierPriceOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualTierPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
+        <assertEquals stepKey="assertStockAvailableOnProductPage">
+            <expectedResult type="string">{{updateVirtualTierPriceOutOfStock.storefrontStatus}}</expectedResult>
+            <actualResult type="variable">productStockAvailableStatus</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
+        <assertEquals stepKey="assertOldPriceTextOnProductPage">
+            <expectedResult type="string">${{updateVirtualTierPriceOutOfStock.price}}</expectedResult>
+            <actualResult type="variable">productPriceAmount</actualResult>
+        </assertEquals>
+        <!-- Verify customer see product tier price on product page -->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
+        <assertEquals stepKey="assertTierPriceTextOnProductPage">
+            <expectedResult type="string">Buy {{tierPriceOnVirtualProduct.qty}} for ${{tierPriceOnVirtualProduct.price}} each and save 51%</expectedResult>
+            <actualResult type="variable">tierPriceText</actualResult>
+        </assertEquals>
+
+        <!--Verify customer don't see updated virtual product link on magento storefront page and is searchable by sku -->
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualTierPriceOutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="fillVirtualProductName"/>
+        <waitForPageLoad stepKey="waitForSearchTextBox"/>
+        <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="dontSeeVirtualProductName"/>
+    </test>
+</tests>

From 543e91a2a9b9112cc45030664eaca1aa758a2857 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Thu, 17 Jan 2019 15:25:33 -0600
Subject: [PATCH 701/932] MC-6287: Button cutomization

- add product configuration
---
 app/code/Magento/Paypal/Model/Config.php      |  8 +++
 .../etc/adminhtml/system/express_checkout.xml | 55 ++++++++++++++++++-
 app/code/Magento/Paypal/i18n/en_US.csv        |  1 +
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index f1a4979e0b1a0..61bab11868c8f 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1653,6 +1653,14 @@ protected function _mapGenericStyleFieldset($fieldName)
             case 'checkout_page_button_label':
             case 'checkout_page_button_mx_installment_period':
             case 'checkout_page_button_br_installment_period':
+            case 'product_page_button_customize':
+            case 'product_page_button_layout':
+            case 'product_page_button_size':
+            case 'product_page_button_color':
+            case 'product_page_button_shape':
+            case 'product_page_button_label':
+            case 'product_page_button_mx_installment_period':
+            case 'product_page_button_br_installment_period':
             case 'disable_funding_options':
                 return "paypal/style/{$fieldName}";
             default:
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index d74e4adb2220c..a94370b02f0c6 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -650,7 +650,7 @@
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <group id="checkout_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
+                    <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
                         <label>PayPal Button - Checkout Page</label>
                         <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                             <label>Customize Button</label>
@@ -728,6 +728,59 @@
                             <attribute type="shared">1</attribute>
                         </field>
                     </group>
+                    <group id="product_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                        <label>PayPal Button - Product Page</label>
+                        <field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                            <comment/>
+                            <config_path>paypal/style/product_page_button_customize</config_path>
+                        </field>
+                        <field id="product_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                            <config_path>paypal/style/product_page_button_label</config_path>
+                            <depends>
+                                <field id="product_page_button_customize">1</field>
+                            </depends>
+                        </field>
+                        <field id="product_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                            <config_path>paypal/style/product_page_button_mx_installment_period</config_path>
+                            <depends>
+                                <field id="product_page_button_customize">1</field>
+                                <field id="product_page_button_label">installment</field>
+                            </depends>
+                        </field>
+                        <field id="product_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                            <config_path>paypal/style/product_page_button_br_installment_period</config_path>
+                            <depends>
+                                <field id="product_page_button_customize">1</field>
+                                <field id="product_page_button_label">installment</field>
+                            </depends>
+                        </field>
+                        <field id="product_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                            <config_path>paypal/style/product_page_button_layout</config_path>
+                            <depends>
+                                <field id="product_page_button_customize">1</field>
+                                <field id="product_page_button_label" negative="1">credit</field>
+                            </depends>
+                        </field>
+                        <field id="product_page_button_size"  extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_size">
+                            <config_path>paypal/style/product_page_button_size</config_path>
+                            <depends>
+                                <field id="product_page_button_customize">1</field>
+                            </depends>
+                        </field>
+                        <field id="product_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                            <config_path>paypal/style/product_page_button_shape</config_path>
+                            <depends>
+                                <field id="product_page_button_customize">1</field>
+                            </depends>
+                        </field>
+                        <field id="product_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                            <config_path>paypal/style/product_page_button_color</config_path>
+                            <depends>
+                                <field id="product_page_button_customize">1</field>
+                                <field id="product_page_button_label" negative="1">credit</field>
+                            </depends>
+                        </field>
+                    </group>
                     <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                         <label>Features</label>
                         <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index 274ba97df143f..2e9d4eed8de62 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -725,6 +725,7 @@ User,User
 "Blue","Blue"
 "Silver","Silver"
 "Black","Black"
+"PayPal Button - Product Page","PayPal Button - Product Page"
 "Features","Features"
 "PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
 "PayPal Credit","PayPal Credit"

From ba9b12e0502baafa8dc8f67ef33935e896284472 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Thu, 17 Jan 2019 15:41:39 -0600
Subject: [PATCH 702/932] MC-6295: Update ShipmentValidationRequest

---
 app/code/Magento/Dhl/Model/Carrier.php        | 172 ++++++++----------
 .../Dhl/Test/Unit/Model/CarrierTest.php       | 138 ++++++--------
 .../Dhl/Test/Unit/Model/_files/countries.xml  |  58 +++---
 .../Unit/Model/_files/shipment_request.xml    |  91 +++++++++
 app/code/Magento/Dhl/etc/countries.xml        |  56 +++---
 5 files changed, 282 insertions(+), 233 deletions(-)
 create mode 100644 app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index e765b33bfdba1..7e43c2dbd5d18 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -7,6 +7,7 @@
 namespace Magento\Dhl\Model;
 
 use Magento\Catalog\Model\Product\Type;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Module\Dir;
 use Magento\Sales\Exception\DocumentValidationException;
 use Magento\Sales\Model\Order\Shipment;
@@ -213,6 +214,11 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      */
     private $xmlValidator;
 
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
@@ -239,7 +245,8 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory
      * @param array $data
-     * @param \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator
+     * @param \Magento\Dhl\Model\Validator\XmlValidator|null $xmlValidator
+     * @param ProductMetadataInterface|null $productMetadata
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -268,7 +275,8 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Framework\HTTP\ZendClientFactory $httpClientFactory,
         array $data = [],
-        \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator = null
+        \Magento\Dhl\Model\Validator\XmlValidator $xmlValidator = null,
+        ProductMetadataInterface $productMetadata = null
     ) {
         $this->readFactory = $readFactory;
         $this->_carrierHelper = $carrierHelper;
@@ -302,6 +310,8 @@ public function __construct(
         }
         $this->xmlValidator = $xmlValidator
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(XmlValidator::class);
+        $this->productMetadata = $productMetadata
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ProductMetadataInterface::class);
     }
 
     /**
@@ -1393,44 +1403,41 @@ protected function _doRequest()
     {
         $rawRequest = $this->_request;
 
-        $originRegion = $this->getCountryParams(
-            $this->_scopeConfig->getValue(
-                Shipment::XML_PATH_STORE_COUNTRY_ID,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                $this->getStore()
-            )
-        )->getRegion();
-
-        if (!$originRegion) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Wrong Region'));
-        }
-
-        if ($originRegion == 'AM') {
-            $originRegion = '';
-        }
-
         $xmlStr = '<?xml version="1.0" encoding="UTF-8"?>' .
-            '<req:ShipmentValidateRequest' .
-            $originRegion .
+            '<req:ShipmentRequest' .
             ' xmlns:req="http://www.dhl.com"' .
             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-            ' xsi:schemaLocation="http://www.dhl.com ship-val-req' .
-            ($originRegion ? '_' .
-                $originRegion : '') .
-            '.xsd" />';
+            ' xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.2.xsd"' .
+            ' schemaVersion="6.2" />';
         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
 
         $nodeRequest = $xml->addChild('Request', '', '');
         $nodeServiceHeader = $nodeRequest->addChild('ServiceHeader');
+        $nodeServiceHeader->addChild('MessageTime', $this->buildMessageTimestamp());
+        // MessageReference must be 28 to 32 chars.
+        $nodeServiceHeader->addChild(
+            'MessageReference',
+            $this->buildMessageReference(self::SERVICE_PREFIX_SHIPVAL)
+        );
         $nodeServiceHeader->addChild('SiteID', (string)$this->getConfigData('id'));
         $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
 
-        if (!$originRegion) {
-            $xml->addChild('RequestedPickupTime', 'N', '');
-        }
-        if ($originRegion !== 'AP') {
-            $xml->addChild('NewShipper', 'N', '');
+        $nodeMetaData = $nodeRequest->addChild('MetaData');
+        $nodeMetaData->addChild('SoftwareName', $this->productMetadata->getName());
+        $nodeMetaData->addChild('SoftwareVersion', $this->productMetadata->getVersion());
+
+        $originRegion = $this->getCountryParams(
+            $this->_scopeConfig->getValue(
+                Shipment::XML_PATH_STORE_COUNTRY_ID,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $this->getStore()
+            )
+        )->getRegion();
+        if ($originRegion) {
+            $xml->addChild('RegionCode', $originRegion, '');
         }
+        $xml->addChild('RequestedPickupTime', 'N', '');
+        $xml->addChild('NewShipper', 'N', '');
         $xml->addChild('LanguageCode', 'EN', '');
         $xml->addChild('PiecesEnabled', 'Y', '');
 
@@ -1472,8 +1479,9 @@ protected function _doRequest()
         }
 
         $nodeConsignee->addChild('City', $rawRequest->getRecipientAddressCity());
-        if ($originRegion !== 'AP') {
-            $nodeConsignee->addChild('Division', $rawRequest->getRecipientAddressStateOrProvinceCode());
+        $recipientAddressStateOrProvinceCode = $rawRequest->getRecipientAddressStateOrProvinceCode();
+        if ($recipientAddressStateOrProvinceCode) {
+            $nodeConsignee->addChild('Division', $recipientAddressStateOrProvinceCode);
         }
         $nodeConsignee->addChild('PostalCode', $rawRequest->getRecipientAddressPostalCode());
         $nodeConsignee->addChild('CountryCode', $rawRequest->getRecipientAddressCountryCode());
@@ -1517,15 +1525,13 @@ protected function _doRequest()
         $nodeReference->addChild('ReferenceType', 'St');
 
         /** Shipment Details */
-        $this->_shipmentDetails($xml, $rawRequest, $originRegion);
+        $this->_shipmentDetails($xml, $rawRequest);
 
         /** Shipper */
         $nodeShipper = $xml->addChild('Shipper', '', '');
         $nodeShipper->addChild('ShipperID', (string)$this->getConfigData('account'));
         $nodeShipper->addChild('CompanyName', $rawRequest->getShipperContactCompanyName());
-        if ($originRegion !== 'AP') {
-            $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
-        }
+        $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
 
         $address = $rawRequest->getShipperAddressStreet1() . ' ' . $rawRequest->getShipperAddressStreet2();
         $address = $this->string->split($address, 35, false, true);
@@ -1538,8 +1544,9 @@ protected function _doRequest()
         }
 
         $nodeShipper->addChild('City', $rawRequest->getShipperAddressCity());
-        if ($originRegion !== 'AP') {
-            $nodeShipper->addChild('Division', $rawRequest->getShipperAddressStateOrProvinceCode());
+        $shipperAddressStateOrProvinceCode = $rawRequest->getShipperAddressStateOrProvinceCode();
+        if ($shipperAddressStateOrProvinceCode) {
+            $nodeShipper->addChild('Division', $shipperAddressStateOrProvinceCode);
         }
         $nodeShipper->addChild('PostalCode', $rawRequest->getShipperAddressPostalCode());
         $nodeShipper->addChild('CountryCode', $rawRequest->getShipperAddressCountryCode());
@@ -1597,13 +1604,6 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
         $nodeShipmentDetails = $xml->addChild('ShipmentDetails', '', '');
         $nodeShipmentDetails->addChild('NumberOfPieces', count($rawRequest->getPackages()));
 
-        if ($originRegion) {
-            $nodeShipmentDetails->addChild(
-                'CurrencyCode',
-                $this->_storeManager->getWebsite($this->_request->getWebsiteId())->getBaseCurrencyCode()
-            );
-        }
-
         $nodePieces = $nodeShipmentDetails->addChild('Pieces', '', '');
 
         /*
@@ -1622,18 +1622,12 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
             }
             $nodePiece->addChild('PieceID', ++$i);
             $nodePiece->addChild('PackageType', $packageType);
-            $nodePiece->addChild('Weight', sprintf('%.1f', $package['params']['weight']));
+            $nodePiece->addChild('Weight', sprintf('%.3f', $package['params']['weight']));
             $params = $package['params'];
             if ($params['width'] && $params['length'] && $params['height']) {
-                if (!$originRegion) {
-                    $nodePiece->addChild('Width', round($params['width']));
-                    $nodePiece->addChild('Height', round($params['height']));
-                    $nodePiece->addChild('Depth', round($params['length']));
-                } else {
-                    $nodePiece->addChild('Depth', round($params['length']));
-                    $nodePiece->addChild('Width', round($params['width']));
-                    $nodePiece->addChild('Height', round($params['height']));
-                }
+                $nodePiece->addChild('Width', round($params['width']));
+                $nodePiece->addChild('Height', round($params['height']));
+                $nodePiece->addChild('Depth', round($params['length']));
             }
             $content = [];
             foreach ($package['items'] as $item) {
@@ -1642,51 +1636,33 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
             $nodePiece->addChild('PieceContents', substr(implode(',', $content), 0, 34));
         }
 
-        if (!$originRegion) {
-            $nodeShipmentDetails->addChild('Weight', sprintf('%.1f', $rawRequest->getPackageWeight()));
-            $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
-            $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
-            $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
-            $nodeShipmentDetails->addChild('Date', $this->_coreDate->date('Y-m-d'));
-            $nodeShipmentDetails->addChild('Contents', 'DHL Parcel');
-            /**
-             * The DoorTo Element defines the type of delivery service that applies to the shipment.
-             * The valid values are DD (Door to Door), DA (Door to Airport) , AA and DC (Door to
-             * Door non-compliant)
-             */
-            $nodeShipmentDetails->addChild('DoorTo', 'DD');
-            $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
-            if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
-                $packageType = 'CP';
-            }
-            $nodeShipmentDetails->addChild('PackageType', $packageType);
-            if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
-                $nodeShipmentDetails->addChild('IsDutiable', 'Y');
-            }
-            $nodeShipmentDetails->addChild(
-                'CurrencyCode',
-                $this->_storeManager->getWebsite($this->_request->getWebsiteId())->getBaseCurrencyCode()
-            );
-        } else {
-            if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
-                $packageType = 'CP';
-            }
-            $nodeShipmentDetails->addChild('PackageType', $packageType);
-            $nodeShipmentDetails->addChild('Weight', sprintf('%.3f', $rawRequest->getPackageWeight()));
-            $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
-            $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
-            $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
-            $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
-
-            /**
-             * The DoorTo Element defines the type of delivery service that applies to the shipment.
-             * The valid values are DD (Door to Door), DA (Door to Airport) , AA and DC (Door to
-             * Door non-compliant)
-             */
-            $nodeShipmentDetails->addChild('DoorTo', 'DD');
-            $nodeShipmentDetails->addChild('Date', $this->_coreDate->date('Y-m-d'));
-            $nodeShipmentDetails->addChild('Contents', 'DHL Parcel TEST');
+        $nodeShipmentDetails->addChild('Weight', sprintf('%.3f', $rawRequest->getPackageWeight()));
+        $nodeShipmentDetails->addChild('WeightUnit', substr($this->_getWeightUnit(), 0, 1));
+        $nodeShipmentDetails->addChild('GlobalProductCode', $rawRequest->getShippingMethod());
+        $nodeShipmentDetails->addChild('LocalProductCode', $rawRequest->getShippingMethod());
+        $nodeShipmentDetails->addChild(
+            'Date',
+            $this->_coreDate->date('Y-m-d', strtotime('now + 1day'))
+        );
+        $nodeShipmentDetails->addChild('Contents', 'DHL Parcel');
+        /**
+         * The DoorTo Element defines the type of delivery service that applies to the shipment.
+         * The valid values are DD (Door to Door), DA (Door to Airport) , AA and DC (Door to
+         * Door non-compliant)
+         */
+        $nodeShipmentDetails->addChild('DoorTo', 'DD');
+        $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
+        if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
+            $packageType = 'CP';
         }
+        $nodeShipmentDetails->addChild('PackageType', $packageType);
+        if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
+            $nodeShipmentDetails->addChild('IsDutiable', 'Y');
+        }
+        $nodeShipmentDetails->addChild(
+            'CurrencyCode',
+            $this->_storeManager->getWebsite($this->_request->getWebsiteId())->getBaseCurrencyCode()
+        );
     }
 
     /**
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 311dfe2eac736..82eb379d75be0 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -8,12 +8,14 @@
 use Magento\Dhl\Model\Carrier;
 use Magento\Dhl\Model\Validator\XmlValidator;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Filesystem\Directory\Read;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Framework\HTTP\ZendClientFactory;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Module\Dir\Reader;
+use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
@@ -89,6 +91,17 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
      */
     private $logger;
 
+    /**
+     * @var DateTime|MockObject
+     */
+    private $coreDateMock;
+
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadataMock;
+
+
     /**
      * @inheritdoc
      */
@@ -143,6 +156,20 @@ protected function setUp()
 
         $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
 
+        $this->coreDateMock = $this->getMockBuilder(DateTime::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->coreDateMock->method('date')
+            ->willReturn('currentTime');
+
+        $this->productMetadataMock = $this->getMockBuilder(ProductMetadataInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->productMetadataMock->method('getName')
+            ->willReturn('Software_Product_Name_30_Char_123456789');
+        $this->productMetadataMock->method('getVersion')
+            ->willReturn('10Char_Ver123456789');
+
         $this->model = $this->objectManager->getObject(
             Carrier::class,
             [
@@ -160,6 +187,8 @@ protected function setUp()
                 'carrierHelper' => $carrierHelper,
                 'data' => ['id' => 'dhl', 'store' => '1'],
                 'xmlValidator' => $this->xmlValidator,
+                'coreDate' => $this->coreDateMock,
+                'productMetadata' => $this->productMetadataMock
             ]
         );
     }
@@ -308,11 +337,26 @@ public function testCollectRatesFail()
 
     /**
      * Test request to shipment sends valid xml values.
+     *
+     * @param string $origCountryId
+     * @param string $expectedRegionCode
+     * @dataProvider requestToShipmentDataProvider
      */
-    public function testRequestToShipment()
+    public function testRequestToShipment(string $origCountryId, string $expectedRegionCode)
     {
+        $expectedRequestXml = file_get_contents(__DIR__ . '/_files/shipment_request.xml');
+        $scopeConfigValueMap = [
+            ['carriers/dhl/account', 'store', null, '1234567890'],
+            ['carriers/dhl/gateway_url', 'store', null, 'https://xmlpi-ea.dhl.com/XMLShippingServlet'],
+            ['carriers/dhl/id', 'store', null, 'some ID'],
+            ['carriers/dhl/password', 'store', null, 'some password'],
+            ['carriers/dhl/content_type', 'store', null, 'N'],
+            ['carriers/dhl/nondoc_methods', 'store', null, '1,3,4,8,P,Q,E,F,H,J,M,V,Y'],
+            ['shipping/origin/country_id', 'store', null, $origCountryId],
+        ];
+
         $this->scope->method('getValue')
-            ->willReturnCallback([$this, 'scopeConfigGetValue']);
+            ->willReturnMap($scopeConfigValueMap);
 
         $this->httpResponse->method('getBody')
             ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
@@ -352,7 +396,7 @@ public function testRequestToShipment()
         $this->request->method('getPackages')
             ->willReturn($packages);
         $this->request->method('getOrigCountryId')
-            ->willReturn('GB');
+            ->willReturn($origCountryId);
         $this->request->method('setPackages')
             ->willReturnSelf();
         $this->request->method('setPackageWeight')
@@ -382,7 +426,17 @@ public function testRequestToShipment()
         $rawPostData->setAccessible(true);
 
         $this->assertNotNull($result);
-        $this->assertContains('<Weight>0.454</Weight>', $rawPostData->getValue($this->httpClient));
+        $requestXml = $rawPostData->getValue($this->httpClient);
+        $requestElement = new Element($requestXml);
+        $this->assertEquals($expectedRegionCode, $requestElement->RegionCode->__toString());
+        $requestElement->RegionCode = 'Checked';
+        $messageReference = $requestElement->Request->ServiceHeader->MessageReference->__toString();
+        $this->assertStringStartsWith('MAGE_SHIP_', $messageReference);
+        $this->assertGreaterThanOrEqual(28, strlen($messageReference));
+        $this->assertLessThanOrEqual(32, strlen($messageReference));
+        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_CHECKED';
+        $expectedRequestElement = new Element($expectedRequestXml);
+        $this->assertXmlStringEqualsXmlString($expectedRequestElement->asXML(), $requestElement->asXML());
     }
 
     /**
@@ -394,86 +448,14 @@ public function requestToShipmentDataProvider()
     {
         return [
             [
-                'GB'
+                'GB', 'EU'
             ],
             [
-                null
+                'SG', 'AP'
             ]
         ];
     }
 
-    /**
-     * Test that shipping label request for origin country from AP region doesn't contain restricted fields.
-     *
-     * @return void
-     */
-    public function testShippingLabelRequestForAsiaPacificRegion()
-    {
-        $this->scope->method('getValue')
-            ->willReturnMap(
-                [
-                    ['shipping/origin/country_id', ScopeInterface::SCOPE_STORE, null, 'SG'],
-                    ['carriers/dhl/gateway_url', ScopeInterface::SCOPE_STORE, null, 'https://xmlpi-ea.dhl.com'],
-                ]
-            );
-
-        $this->httpResponse->method('getBody')
-            ->willReturn(utf8_encode(file_get_contents(__DIR__ . '/_files/response_shipping_label.xml')));
-
-        $packages = [
-            'package' => [
-                'params' => [
-                    'width' => '1',
-                    'length' => '1',
-                    'height' => '1',
-                    'dimension_units' => 'INCH',
-                    'weight_units' => 'POUND',
-                    'weight' => '0.45',
-                    'customs_value' => '10.00',
-                    'container' => Carrier::DHL_CONTENT_TYPE_NON_DOC,
-                ],
-                'items' => [
-                    'item1' => [
-                        'name' => 'item_name',
-                    ],
-                ],
-            ],
-        ];
-
-        $this->request->method('getPackages')->willReturn($packages);
-        $this->request->method('getOrigCountryId')->willReturn('SG');
-        $this->request->method('setPackages')->willReturnSelf();
-        $this->request->method('setPackageWeight')->willReturnSelf();
-        $this->request->method('setPackageValue')->willReturnSelf();
-        $this->request->method('setValueWithDiscount')->willReturnSelf();
-        $this->request->method('setPackageCustomsValue')->willReturnSelf();
-
-        $result = $this->model->requestToShipment($this->request);
-
-        $reflectionClass = new \ReflectionObject($this->httpClient);
-        $rawPostData = $reflectionClass->getProperty('raw_post_data');
-        $rawPostData->setAccessible(true);
-
-        $this->assertNotNull($result);
-        $requestXml = $rawPostData->getValue($this->httpClient);
-
-        $this->assertNotContains(
-            'NewShipper',
-            $requestXml,
-            'NewShipper is restricted field for AP region'
-        );
-        $this->assertNotContains(
-            'Division',
-            $requestXml,
-            'Division is restricted field for AP region'
-        );
-        $this->assertNotContains(
-            'RegisteredAccount',
-            $requestXml,
-            'RegisteredAccount is restricted field for AP region'
-        );
-    }
-    
     /**
      * @dataProvider dhlProductsDataProvider
      *
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
index 3f28111f229d1..792465ce45942 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/countries.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!--
 /**
  * Copyright © Magento, Inc. All rights reserved.
@@ -83,7 +83,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Austria</name>
         <domestic>1</domestic>
     </AT>
@@ -132,7 +132,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Belgium</name>
         <domestic>1</domestic>
     </BE>
@@ -146,7 +146,7 @@
         <currency>BGN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Bulgaria</name>
         <domestic>1</domestic>
     </BG>
@@ -257,7 +257,7 @@
         <currency>CHF</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Switzerland</name>
     </CH>
     <CI>
@@ -331,7 +331,7 @@
         <currency>CZK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Czech Republic, The</name>
         <domestic>1</domestic>
     </CZ>
@@ -339,7 +339,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Germany</name>
         <domestic>1</domestic>
     </DE>
@@ -353,7 +353,7 @@
         <currency>DKK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Denmark</name>
         <domestic>1</domestic>
     </DK>
@@ -389,7 +389,7 @@
         <currency>EEK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Estonia</name>
         <domestic>1</domestic>
     </EE>
@@ -410,7 +410,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Spain</name>
         <domestic>1</domestic>
     </ES>
@@ -424,7 +424,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Finland</name>
         <domestic>1</domestic>
     </FI>
@@ -457,7 +457,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>France</name>
         <domestic>1</domestic>
     </FR>
@@ -471,7 +471,7 @@
         <currency>GBP</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>United Kingdom</name>
         <domestic>1</domestic>
     </GB>
@@ -549,7 +549,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Greece</name>
         <domestic>1</domestic>
     </GR>
@@ -612,7 +612,7 @@
         <currency>HUF</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Hungary</name>
         <domestic>1</domestic>
     </HU>
@@ -633,7 +633,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Ireland, Republic Of</name>
         <domestic>1</domestic>
     </IE>
@@ -668,14 +668,14 @@
         <currency>ISK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Iceland</name>
     </IS>
     <IT>
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Italy</name>
         <domestic>1</domestic>
     </IT>
@@ -834,7 +834,7 @@
         <currency>LTL</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Lithuania</name>
         <domestic>1</domestic>
     </LT>
@@ -842,7 +842,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Luxembourg</name>
         <domestic>1</domestic>
     </LU>
@@ -850,7 +850,7 @@
         <currency>LVL</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Latvia</name>
         <domestic>1</domestic>
     </LV>
@@ -1039,7 +1039,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Netherlands, The</name>
         <domestic>1</domestic>
     </NL>
@@ -1047,7 +1047,7 @@
         <currency>NOK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Norway</name>
     </NO>
     <NP>
@@ -1127,7 +1127,7 @@
         <currency>PLN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Poland</name>
         <domestic>1</domestic>
     </PL>
@@ -1142,7 +1142,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Portugal</name>
         <domestic>1</domestic>
     </PT>
@@ -1177,7 +1177,7 @@
         <currency>RON</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Romania</name>
         <domestic>1</domestic>
     </RO>
@@ -1231,7 +1231,7 @@
         <currency>SEK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Sweden</name>
         <domestic>1</domestic>
     </SE>
@@ -1246,7 +1246,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Slovenia</name>
         <domestic>1</domestic>
     </SI>
@@ -1254,7 +1254,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Slovakia</name>
         <domestic>1</domestic>
     </SK>
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
new file mode 100644
index 0000000000000..7a87046b87b76
--- /dev/null
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.2.xsd" schemaVersion="6.2">
+    <Request xmlns="">
+        <ServiceHeader>
+            <MessageTime>currentTime</MessageTime>
+            <MessageReference>MAGE_SHIP_CHECKED</MessageReference>
+            <SiteID>some ID</SiteID>
+            <Password>some password</Password>
+        </ServiceHeader>
+        <MetaData>
+            <SoftwareName>Software_Product_Name_30_Char_</SoftwareName>
+            <SoftwareVersion>10Char_Ver</SoftwareVersion>
+        </MetaData>
+    </Request>
+    <RegionCode xmlns="">CHECKED</RegionCode>
+    <RequestedPickupTime xmlns="">N</RequestedPickupTime>
+    <NewShipper xmlns="">N</NewShipper>
+    <LanguageCode xmlns="">EN</LanguageCode>
+    <PiecesEnabled xmlns="">Y</PiecesEnabled>
+    <Billing xmlns="">
+        <ShipperAccountNumber>1234567890</ShipperAccountNumber>
+        <ShippingPaymentType>S</ShippingPaymentType>
+        <BillingAccountNumber>1234567890</BillingAccountNumber>
+        <DutyPaymentType>S</DutyPaymentType>
+        <DutyAccountNumber>1234567890</DutyAccountNumber>
+    </Billing>
+    <Consignee xmlns="">
+        <CompanyName/>
+        <AddressLine/>
+        <City/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact>
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Consignee>
+    <Commodity xmlns="">
+        <CommodityCode>1</CommodityCode>
+    </Commodity>
+    <Dutiable xmlns="">
+        <DeclaredValue>10.00</DeclaredValue>
+        <DeclaredCurrency>USD</DeclaredCurrency>
+    </Dutiable>
+    <Reference xmlns="">
+        <ReferenceID>shipment reference</ReferenceID>
+        <ReferenceType>St</ReferenceType>
+    </Reference>
+    <ShipmentDetails xmlns="">
+        <NumberOfPieces>1</NumberOfPieces>
+        <Pieces xmlns="">
+            <Piece xmlns="">
+                <PieceID>1</PieceID>
+                <PackageType>CP</PackageType>
+                <Weight>0.454</Weight>
+                <Width>3</Width>
+                <Height>3</Height>
+                <Depth>3</Depth>
+                <PieceContents>item_name</PieceContents>
+            </Piece>
+        </Pieces>
+        <Weight>0.454</Weight>
+        <WeightUnit>K</WeightUnit>
+        <GlobalProductCode/>
+        <LocalProductCode/>
+        <Date>currentTime</Date>
+        <Contents>DHL Parcel</Contents>
+        <DoorTo>DD</DoorTo>
+        <DimensionUnit>C</DimensionUnit>
+        <PackageType>CP</PackageType>
+        <IsDutiable>Y</IsDutiable>
+        <CurrencyCode>USD</CurrencyCode>
+    </ShipmentDetails>
+    <Shipper xmlns="">
+        <ShipperID>1234567890</ShipperID>
+        <CompanyName/>
+        <RegisteredAccount>1234567890</RegisteredAccount>
+        <AddressLine/>
+        <City/>
+        <PostalCode/>
+        <CountryCode/>
+        <CountryName/>
+        <Contact xmlns="">
+            <PersonName/>
+            <PhoneNumber/>
+        </Contact>
+    </Shipper>
+    <LabelImageFormat xmlns="">PDF</LabelImageFormat>
+</req:ShipmentRequest>
diff --git a/app/code/Magento/Dhl/etc/countries.xml b/app/code/Magento/Dhl/etc/countries.xml
index 48837dbefb576..792465ce45942 100644
--- a/app/code/Magento/Dhl/etc/countries.xml
+++ b/app/code/Magento/Dhl/etc/countries.xml
@@ -83,7 +83,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Austria</name>
         <domestic>1</domestic>
     </AT>
@@ -132,7 +132,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Belgium</name>
         <domestic>1</domestic>
     </BE>
@@ -146,7 +146,7 @@
         <currency>BGN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Bulgaria</name>
         <domestic>1</domestic>
     </BG>
@@ -257,7 +257,7 @@
         <currency>CHF</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Switzerland</name>
     </CH>
     <CI>
@@ -331,7 +331,7 @@
         <currency>CZK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Czech Republic, The</name>
         <domestic>1</domestic>
     </CZ>
@@ -339,7 +339,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Germany</name>
         <domestic>1</domestic>
     </DE>
@@ -353,7 +353,7 @@
         <currency>DKK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Denmark</name>
         <domestic>1</domestic>
     </DK>
@@ -389,7 +389,7 @@
         <currency>EEK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Estonia</name>
         <domestic>1</domestic>
     </EE>
@@ -410,7 +410,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Spain</name>
         <domestic>1</domestic>
     </ES>
@@ -424,7 +424,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Finland</name>
         <domestic>1</domestic>
     </FI>
@@ -457,7 +457,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>France</name>
         <domestic>1</domestic>
     </FR>
@@ -471,7 +471,7 @@
         <currency>GBP</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>United Kingdom</name>
         <domestic>1</domestic>
     </GB>
@@ -549,7 +549,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Greece</name>
         <domestic>1</domestic>
     </GR>
@@ -612,7 +612,7 @@
         <currency>HUF</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Hungary</name>
         <domestic>1</domestic>
     </HU>
@@ -633,7 +633,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Ireland, Republic Of</name>
         <domestic>1</domestic>
     </IE>
@@ -668,14 +668,14 @@
         <currency>ISK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Iceland</name>
     </IS>
     <IT>
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Italy</name>
         <domestic>1</domestic>
     </IT>
@@ -834,7 +834,7 @@
         <currency>LTL</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Lithuania</name>
         <domestic>1</domestic>
     </LT>
@@ -842,7 +842,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Luxembourg</name>
         <domestic>1</domestic>
     </LU>
@@ -850,7 +850,7 @@
         <currency>LVL</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Latvia</name>
         <domestic>1</domestic>
     </LV>
@@ -1039,7 +1039,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Netherlands, The</name>
         <domestic>1</domestic>
     </NL>
@@ -1047,7 +1047,7 @@
         <currency>NOK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Norway</name>
     </NO>
     <NP>
@@ -1127,7 +1127,7 @@
         <currency>PLN</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Poland</name>
         <domestic>1</domestic>
     </PL>
@@ -1142,7 +1142,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Portugal</name>
         <domestic>1</domestic>
     </PT>
@@ -1177,7 +1177,7 @@
         <currency>RON</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Romania</name>
         <domestic>1</domestic>
     </RO>
@@ -1231,7 +1231,7 @@
         <currency>SEK</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Sweden</name>
         <domestic>1</domestic>
     </SE>
@@ -1246,7 +1246,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Slovenia</name>
         <domestic>1</domestic>
     </SI>
@@ -1254,7 +1254,7 @@
         <currency>EUR</currency>
         <weight_unit>KG</weight_unit>
         <measure_unit>CM</measure_unit>
-        <region>EA</region>
+        <region>EU</region>
         <name>Slovakia</name>
         <domestic>1</domestic>
     </SK>

From 517bc44edb9042afcba85adfad157991274adb13 Mon Sep 17 00:00:00 2001
From: Kavitha <kanair@adobe.com>
Date: Thu, 17 Jan 2019 16:22:53 -0600
Subject: [PATCH 703/932] MC-4377: Convert UpdateTopCategoryEntityTest to MFTF

---
 .../Catalog/Test/Mftf/Data/CategoryData.xml   | 16 ++++
 ...UpdateTopCategoryUrlWithNoRedirectTest.xml | 78 ++++++++++++++++++
 ...inUpdateTopCategoryUrlWithRedirectTest.xml | 80 +++++++++++++++++++
 .../Section/AdminUrlRewriteIndexSection.xml   |  2 +
 4 files changed, 176 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index 8ee9b294673dc..2b192329826a1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -68,4 +68,20 @@
         <data key="is_active">true</data>
         <data key="include_in_menu">true</data>
     </entity>
+    <entity name="Two_nested_categories" type="category">
+        <data key="name" unique="suffix">SecondLevel</data>
+        <data key="url_key" unique="suffix">secondlevel</data>
+        <data key="name_lwr" unique="suffix">secondlevel</data>
+        <data key="is_active">true</data>
+        <data key="include_in_menu">true</data>
+        <var key="parent_id" entityType="category" entityKey="id" />
+    </entity>
+    <entity name="Three_nested_categories" type="category">
+        <data key="name" unique="suffix">ThirdLevel</data>
+        <data key="url_key" unique="suffix">thirdlevel</data>
+        <data key="name_lwr" unique="suffix">thirdlevel</data>
+        <data key="is_active">true</data>
+        <data key="include_in_menu">true</data>
+        <var key="parent_id" entityType="category" entityKey="id" />
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
new file mode 100644
index 0000000000000..c0362f461bd03
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
@@ -0,0 +1,78 @@
+<?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="AdminUpdateTopCategoryUrlWithNoRedirectTest">
+        <annotations>
+            <stories value="Update category"/>
+            <title value="Update top category url and do not create redirect"/>
+            <description value="Login as admin and update top category url and do not create redirect"/>
+            <testCaseId value="MC-6056"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <!-- Create three level nested category -->
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+            <createData entity="Two_nested_categories" stepKey="createTwoLevelNestedCategories">
+                <requiredEntity createDataKey="createDefaultCategory"/>
+            </createData>
+            <createData entity="Three_nested_categories" stepKey="createThreeLevelNestedCategories">
+                <requiredEntity createDataKey="createTwoLevelNestedCategories"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createThreeLevelNestedCategories" stepKey="deleteThreeNestedCategories"/>
+            <deleteData createDataKey="createTwoLevelNestedCategories" stepKey="deleteTwoLevelNestedCategory"/>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Open Category page -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <!-- Open 3rd Level category -->
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createThreeLevelNestedCategories.name$$)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <!--Update category UrlKey and uncheck permanent redirect for old URL -->
+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="updatedurl" stepKey="updateUrlKey"/>
+        <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="uncheckPermanentRedirectCheckBox"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <!-- Get Category Id -->
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+        <!-- Open Url Rewrite Page -->
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
+        <waitForPageLoad stepKey="waitForUrlRewritePage"/>
+        <!-- Verify third level category's  Redirect Path, Target Path and Redirect Type after the URL Update -->
+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad0"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="updatedurl" stepKey="fillUpdatedUrlInRedirectPathFilter"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <see stepKey="seeTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
+        <see stepKey="seeTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}"/>
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{Two_nested_categories.name_lwr}}2/updatedurl.html" stepKey="seeTheRedirectPath"/>
+        <!-- Verify third level category's old URL path doesn't show redirect path-->
+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{Three_nested_categories.name_lwr}}" stepKey="fillOldUrlInRedirectPathFilter"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
+        <see stepKey="seeEmptyRecodsMessage" selector="{{AdminUrlRewriteIndexSection.emptyRecords}}" userInput="We couldn't find any records."/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
new file mode 100644
index 0000000000000..8388e8ab1f7ea
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
@@ -0,0 +1,80 @@
+<?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="AdminUpdateTopCategoryUrlWithRedirectTest">
+        <annotations>
+            <stories value="Update category"/>
+            <title value="Update top category url and create redirect"/>
+            <description value="Login as admin and update top category url and create redirect"/>
+            <testCaseId value="MC-6057"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <!-- Create three level nested category -->
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+            <createData entity="Two_nested_categories" stepKey="createTwoLevelNestedCategories">
+                <requiredEntity createDataKey="createDefaultCategory"/>
+            </createData>
+            <createData entity="Three_nested_categories" stepKey="createThreeLevelNestedCategories">
+                <requiredEntity createDataKey="createTwoLevelNestedCategories"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createThreeLevelNestedCategories" stepKey="deleteThreeNestedCategories"/>
+            <deleteData createDataKey="createTwoLevelNestedCategories" stepKey="deleteTwoLevelNestedCategory"/>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Open Category page -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <!-- Open 3rd Level category -->
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createThreeLevelNestedCategories.name$$)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <!--Update category UrlKey and check permanent redirect for old URL -->
+        <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="updateredirecturl" stepKey="updateUrlKey"/>
+        <checkOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="checkPermanentRedirectCheckBox"/>
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <!-- Get Category ID -->
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+        <!-- Open Url Rewrite Page -->
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
+        <waitForPageLoad stepKey="waitForUrlRewritePage"/>
+        <!-- Verify third level category's Redirect Path, Target Path and Redirect Type after the URL update -->
+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="updateredirecturl" stepKey="fillUpdatedURLInRedirectPathFilter"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <see stepKey="seeTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
+        <see stepKey="seeTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}"/>
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{Two_nested_categories.name_lwr}}2/updateredirecturl.html" stepKey="seeTheRedirectPath"/>
+        <!-- Verify third level category's Redirect path, Target Path and Redirect type for old URL -->
+        <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{Three_nested_categories.name_lwr}}" stepKey="fillOldUrlInRedirectPathFilter"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad5"/>
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{Two_nested_categories.name_lwr}}2/{{Three_nested_categories.name_lwr}}2.html" stepKey="seeTheRedirectPathForOldUrl"/>
+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{Two_nested_categories.name_lwr}}2/updateredirecturl.html" stepKey="seeTheTargetPathForOldUrl"/>
+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" stepKey="seeTheRedirectTypeForOldUrl" />
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
index c78af2a91644d..5ff630dcf7659 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Section/AdminUrlRewriteIndexSection.xml
@@ -13,7 +13,9 @@
         <element name="requestPathColumnValue" type="text" selector="//*[@id='urlrewriteGrid']//tbody//td[@data-column='request_path' and normalize-space(.)='{{columnValue}}']" parameterized="true"/>
         <element name="targetPathColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='target_path']" parameterized="true"/>
         <element name="searchButton" type="button" selector="button[data-ui-id='widget-button-1']" timeout="30"/>
+        <element name="resetButton" type="button" selector="button[data-ui-id='widget-button-0']" timeout="30"/>
         <element name="redirectTypeColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='redirect_type']" parameterized="true"/>
         <element name="requestPathColumn" type="text" selector="//tr[@data-role='row'][{{var1}}]/td[@data-column='request_path']" parameterized="true"/>
+        <element name="emptyRecords" type="text" selector="//td[@class='empty-text']"/>
     </section>
 </sections>

From 9846caa2bd555718a69044b48f7bdbe21d82419d Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 17 Jan 2019 16:32:33 -0600
Subject: [PATCH 704/932] MC-6289: Support Billing Agreements for Smart buttons
 on checkout flow

---
 .../web/js/in-context/express-checkout-smart-buttons.js       | 4 +++-
 .../payment/method-renderer/in-context/checkout-express.js    | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 242d46a11766f..a1460dda5182a 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -68,7 +68,9 @@ define([
                     button: clientConfig.button,
                     form_key: clientConfig.formKey
                 };
-
+                    if (clientConfig.hasOwnProperty('billingAgreement')) {
+                        params.paypal_ec_create_ba = clientConfig.billingAgreement;
+                    }
                 if (!clientConfig.button) {
                     return new paypal.Promise(function (resolve, reject) {
                         clientConfig.additionalAction(clientConfig.messageContainer).done(function () {
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index 5f84f3057f883..aee3c5ac74c42 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -107,6 +107,9 @@ define(
                 /** Add logic to be triggered onClick action for smart buttons component*/
                 this.clientConfig.onClick = function () {
                     additionalValidators.validate();
+                    if (this.getBillingAgreementCode()) {
+                        this.clientConfig.billingAgreement = this.billingAgreement()
+                    }
                     this.selectPaymentMethod();
                 };
                 this.clientConfig.additionalAction = setPaymentMethodAction;

From ea668e190ab857ac4c0a3708044e2a621727fddc Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Thu, 17 Jan 2019 16:55:16 -0600
Subject: [PATCH 705/932] MC-6297: Update KnownTrackingRequest

- updated schema
- added integration test
---
 app/code/Magento/Dhl/Model/Carrier.php        |  11 +-
 .../Magento/Dhl/Model/CarrierTest.php         | 241 ++++++++++++++++++
 ...SingleknownTrackResponse-no-data-found.xml |  28 ++
 .../Dhl/_files/Track-res-XML-Parse-Err.xml    |  26 ++
 .../_files/TrackingRequest_MultipleAWB.xml    |  24 ++
 .../Dhl/_files/TrackingRequest_SingleAWB.xml  |  20 ++
 .../_files/TrackingResponse_MultipleAWB.xml   | 174 +++++++++++++
 .../Dhl/_files/TrackingResponse_SingleAWB.xml |  69 +++++
 8 files changed, 590 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
 create mode 100755 dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
 create mode 100755 dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml
 create mode 100755 dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
 create mode 100755 dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
 create mode 100755 dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
 create mode 100755 dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index e765b33bfdba1..92460cfc4cb61 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1693,7 +1693,7 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
      * Get tracking
      *
      * @param string|string[] $trackings
-     * @return Result|null
+     * @return \Magento\Shipping\Model\Tracking\Result|null
      */
     public function getTracking($trackings)
     {
@@ -1717,12 +1717,15 @@ protected function _getXMLTracking($trackings)
             '<req:KnownTrackingRequest' .
             ' xmlns:req="http://www.dhl.com"' .
             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-            ' xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown.xsd" />';
+            ' xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown-1.0.xsd"' .
+            ' schemaVersion="1.0" />';
 
         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
 
         $requestNode = $xml->addChild('Request', '', '');
         $serviceHeaderNode = $requestNode->addChild('ServiceHeader', '', '');
+        $serviceHeaderNode->addChild('MessageTime', $this->buildMessageTimestamp());
+        $serviceHeaderNode->addChild('MessageReference', $this->buildMessageReference(self::SERVICE_PREFIX_TRACKING));
         $serviceHeaderNode->addChild('SiteID', (string)$this->getConfigData('id'));
         $serviceHeaderNode->addChild('Password', (string)$this->getConfigData('password'));
 
@@ -1966,12 +1969,14 @@ protected function _prepareShippingLabelContent(\SimpleXMLElement $xml)
     }
 
     /**
+     * Verify if the shipment is dutiable
+     *
      * @param string $origCountryId
      * @param string $destCountryId
      *
      * @return bool
      */
-    protected function isDutiable($origCountryId, $destCountryId)
+    protected function isDutiable($origCountryId, $destCountryId) : bool
     {
         $this->_checkDomesticStatus($origCountryId, $destCountryId);
 
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
new file mode 100644
index 0000000000000..d5f3c30c17397
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Dhl\Model;
+
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Framework\Simplexml\Element;
+use Magento\Shipping\Model\Tracking\Result\Error;
+use Magento\Shipping\Model\Tracking\Result\Status;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+class CarrierTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Dhl\Model\Carrier
+     */
+    private $dhlCarrier;
+
+    /**
+     * @var ZendClient|MockObject
+     */
+    private $httpClientMock;
+
+    /**
+     * @var \Zend_Http_Response|MockObject
+     */
+    private $httpResponseMock;
+
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->dhlCarrier = $objectManager->create(
+            \Magento\Dhl\Model\Carrier::class,
+            ['httpClientFactory' => $this->getHttpClientFactory()]
+        );
+    }
+
+    /**
+     * @magentoConfigFixture default_store carriers/dhl/id CustomerSiteID
+     * @magentoConfigFixture default_store carriers/dhl/password CustomerPassword
+     * @param string[] $trackingNumbers
+     * @param string $responseXml
+     * @param $expectedTrackingData
+     * @param string $expectedRequestXml
+     * @dataProvider getTrackingDataProvider
+     */
+    public function testGetTracking(
+        $trackingNumbers,
+        string $responseXml,
+        $expectedTrackingData,
+        string $expectedRequestXml = ''
+    ) {
+        $this->httpResponseMock->method('getBody')
+            ->willReturn($responseXml);
+        $trackingResult = $this->dhlCarrier->getTracking($trackingNumbers);
+        $this->assertTrackingResult($expectedTrackingData, $trackingResult->getAllTrackings());
+        if ($expectedRequestXml !== '') {
+            $method = new \ReflectionMethod($this->httpClientMock, '_prepareBody');
+            $method->setAccessible(true);
+            $requestXml = $method->invoke($this->httpClientMock);
+            $this->assertRequest($expectedRequestXml, $requestXml);
+        }
+    }
+
+    /**
+     * Get tracking data provider
+     * @return array
+     */
+    public function getTrackingDataProvider() : array
+    {
+        $expectedMultiAWBRequestXml = file_get_contents(__DIR__ . '/../_files/TrackingRequest_MultipleAWB.xml');
+        $multiAWBResponseXml = file_get_contents(__DIR__ . '/../_files/TrackingResponse_MultipleAWB.xml');
+        $expectedSingleAWBRequestXml = file_get_contents(__DIR__ . '/../_files/TrackingRequest_SingleAWB.xml');
+        $singleAWBResponseXml = file_get_contents(__DIR__ . '/../_files/TrackingResponse_SingleAWB.xml');
+        $singleNoDataResponseXml = file_get_contents(__DIR__ . '/../_files/SingleknownTrackResponse-no-data-found.xml');
+        $failedResponseXml = file_get_contents(__DIR__ . '/../_files/Track-res-XML-Parse-Err.xml');
+        $expectedTrackingDataA = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 4781584780,
+            'service' => 'DOCUMENT',
+            'progressdetail' => [
+                [
+                    'activity' => 'SD Shipment information received',
+                    'deliverydate' => '2017-12-25',
+                    'deliverytime' => '14:38:00',
+                    'deliverylocation' => 'BEIJING-CHN [PEK]'
+                ]
+            ],
+            'weight' => '0.5 K',
+        ];
+        $expectedTrackingDataB = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 4781585060,
+            'service' => 'NOT RESTRICTED FOR TRANSPORT,',
+            'progressdetail' => [
+                [
+                    'activity' => 'SD Shipment information received',
+                    'deliverydate' => '2017-12-24',
+                    'deliverytime' => '13:35:00',
+                    'deliverylocation' => 'HONG KONG-HKG [HKG]'
+                ]
+            ],
+            'weight' => '2.0 K',
+        ];
+        $expectedTrackingDataC = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 5702254250,
+            'service' => 'CD',
+            'progressdetail' => [
+                [
+                    'activity' => 'SD Shipment information received',
+                    'deliverydate' => '2017-12-24',
+                    'deliverytime' => '04:12:00',
+                    'deliverylocation' => 'BIRMINGHAM-GBR [BHX]'
+                ]
+            ],
+            'weight' => '0.12 K',
+        ];
+        $expectedTrackingDataD = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 4781585060,
+            'error_message' => __('Unable to retrieve tracking')
+        ];
+        $expectedTrackingDataE = [
+            'carrier' => 'dhl',
+            'carrier_title' => 'DHL',
+            'tracking' => 111,
+            'error_message' => __(
+                'Error #%1 : %2',
+                '111',
+                ' Error Parsing incoming request XML
+                    Error: The content of element type
+                    "ShipperReference" must match
+                    "(ReferenceID,ReferenceType?)". at line
+                    16, column 22'
+            )
+        ];
+        return [
+            'multi-AWB' => [
+                ['4781584780', '4781585060', '5702254250'],
+                $multiAWBResponseXml,
+                [$expectedTrackingDataA, $expectedTrackingDataB, $expectedTrackingDataC],
+                $expectedMultiAWBRequestXml
+            ],
+            'single-AWB' => [
+                ['4781585060'],
+                $singleAWBResponseXml,
+                [$expectedTrackingDataB],
+                $expectedSingleAWBRequestXml
+            ],
+            'single-AWB-no-data' => [
+                ['4781585061'],
+                $singleNoDataResponseXml,
+                [$expectedTrackingDataD]
+            ],
+            'failed-response' => [
+                ['4781585060-failed'],
+                $failedResponseXml,
+                [$expectedTrackingDataE]
+            ]
+        ];
+    }
+
+    /**
+     * Get mocked Http Client Factory
+     *
+     * @return MockObject
+     */
+    private function getHttpClientFactory(): MockObject
+    {
+        $this->httpResponseMock = $this->getMockBuilder(\Zend_Http_Response::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->httpClientMock = $this->getMockBuilder(ZendClient::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['request'])
+            ->getMock();
+        $this->httpClientMock->method('request')
+            ->willReturn($this->httpResponseMock);
+        /** @var ZendClientFactory|MockObject $httpClientFactoryMock */
+        $httpClientFactoryMock = $this->getMockBuilder(ZendClientFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $httpClientFactoryMock->method('create')
+            ->willReturn($this->httpClientMock);
+
+        return $httpClientFactoryMock;
+    }
+
+    /**
+     * Assert request
+     *
+     * @param string $expectedRequestXml
+     * @param string $requestXml
+     */
+    private function assertRequest(string $expectedRequestXml, string $requestXml): void
+    {
+        $expectedRequestElement = new Element($expectedRequestXml);
+        $requestElement = new Element($requestXml);
+        $requestMessageTime = $requestElement->Request->ServiceHeader->MessageTime->__toString();
+        $this->assertEquals(
+            1,
+            preg_match("/\d{4}\-\d{2}\-\d{2}T\d{2}\:\d{2}\:\d{2}\+\d{2}\:\d{2}/", $requestMessageTime)
+        );
+        $expectedRequestElement->Request->ServiceHeader->MessageTime = $requestMessageTime;
+        $messageReference = $requestElement->Request->ServiceHeader->MessageReference->__toString();
+        $this->assertStringStartsWith('MAGE_TRCK_', $messageReference);
+        $this->assertGreaterThanOrEqual(28, strlen($messageReference));
+        $this->assertLessThanOrEqual(32, strlen($messageReference));
+        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_TRCK_CHECKED';
+        $this->assertXmlStringEqualsXmlString($expectedRequestElement->asXML(), $requestElement->asXML());
+    }
+
+    /**
+     * Assert tracking
+     *
+     * @param array|null $expectedTrackingData
+     * @param Status[]|null $trackingResults
+     * @return void
+     */
+    private function assertTrackingResult($expectedTrackingData, $trackingResults): void
+    {
+        if (null === $expectedTrackingData) {
+            $this->assertNull($trackingResults);
+        } else {
+            $ctr = 0;
+            foreach ($trackingResults as $trackingResult) {
+                $this->assertEquals($expectedTrackingData[$ctr++], $trackingResult->getData());
+            }
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
new file mode 100755
index 0000000000000..e3e7b93fc652b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:TrackingResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingResponse.xsd">
+    <Response>
+        <ServiceHeader>
+            <MessageTime>2018-02-27T12:59:34+01:00</MessageTime>
+            <MessageReference>tracking_4781585060</MessageReference>
+            <SiteID>CustomerSiteID</SiteID>
+        </ServiceHeader>
+    </Response>
+    <AWBInfo>
+        <AWBNumber>4781585060</AWBNumber>
+        <Status>
+            <ActionStatus>No Shipments Found</ActionStatus>
+            <Condition>
+                <ConditionCode>209</ConditionCode>
+                <ConditionData>No Shipments Found for AWBNumber 6017300993</ConditionData>
+            </Condition>
+        </Status>
+    </AWBInfo>
+    <LanguageCode>String</LanguageCode>
+</req:TrackingResponse>
+<!-- ServiceInvocationId:20180227125934_5793_74fbd9e1-a8b0-4f6a-a326-26aae979e5f0 -->
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml
new file mode 100755
index 0000000000000..c2abd68d3c4ae
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/Track-res-XML-Parse-Err.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:ShipmentTrackingErrorResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com track-err-res.xsd">
+    <Response>
+        <ServiceHeader>
+            <MessageTime>2018-02-27T12:55:05+01:00</MessageTime>
+        </ServiceHeader>
+        <Status>
+            <ActionStatus>Failure</ActionStatus>
+            <Condition>
+                <ConditionCode>111</ConditionCode>
+                <ConditionData> Error Parsing incoming request XML
+                    Error: The content of element type
+                    &quot;ShipperReference&quot; must match
+                    &quot;(ReferenceID,ReferenceType?)&quot;. at line
+                    16, column 22</ConditionData>
+            </Condition>
+        </Status>
+    </Response>
+</req:ShipmentTrackingErrorResponse>
+<!-- ServiceInvocationId:20180227125505_5793_2008671c-9292-4790-87b6-b02ccdf913db -->
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
new file mode 100755
index 0000000000000..f3aa662cd68fd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:KnownTrackingRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown-1.0.xsd" schemaVersion="1.0">
+	<Request>
+		<ServiceHeader>
+			<MessageTime>2002-06-25T11:28:56-08:00</MessageTime>
+			<MessageReference>MAGE_TRCK_CHECKED</MessageReference>
+			<SiteID>CustomerSiteID</SiteID>
+			<Password>CustomerPassword</Password>
+		</ServiceHeader>
+	</Request>
+	<LanguageCode>en</LanguageCode>
+	<AWBNumber>4781584780</AWBNumber>
+	<AWBNumber>4781585060</AWBNumber>
+	<AWBNumber>5702254250</AWBNumber>
+	<LevelOfDetails>ALL_CHECK_POINTS</LevelOfDetails>
+</req:KnownTrackingRequest>
+
+
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
new file mode 100755
index 0000000000000..b45988249f665
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:KnownTrackingRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingRequestKnown-1.0.xsd" schemaVersion="1.0">
+	<Request>
+		<ServiceHeader>
+			<MessageTime>2002-06-25T11:28:56-08:00</MessageTime>
+			<MessageReference>MAGE_TRCK_CHECKED</MessageReference>
+			<SiteID>CustomerSiteID</SiteID>
+			<Password>CustomerPassword</Password>
+		</ServiceHeader>
+	</Request>
+	<LanguageCode>en</LanguageCode>
+	<AWBNumber>4781585060</AWBNumber>
+	<LevelOfDetails>ALL_CHECK_POINTS</LevelOfDetails>
+</req:KnownTrackingRequest>
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
new file mode 100755
index 0000000000000..8375eaea1770d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:TrackingResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingResponse.xsd">
+    <Response>
+        <ServiceHeader>
+            <MessageTime>2018-02-27T12:43:44+01:00</MessageTime>
+            <MessageReference>TrackingRequest_Multiple_AWB</MessageReference>
+            <SiteID>CustomerSiteID</SiteID>
+        </ServiceHeader>
+    </Response>
+    <AWBInfo>
+        <AWBNumber>4781584780</AWBNumber>
+        <Status>
+            <ActionStatus>success</ActionStatus>
+        </Status>
+        <ShipmentInfo>
+            <OriginServiceArea>
+                <ServiceAreaCode>PEK</ServiceAreaCode>
+                <Description>BEIJING-CHN</Description>
+            </OriginServiceArea>
+            <DestinationServiceArea>
+                <ServiceAreaCode>PHL</ServiceAreaCode>
+                <Description>WEST PHILADELPHIA,PA-USA</Description>
+            </DestinationServiceArea>
+            <ShipperName>THE EXP HIGH SCH ATT TO BNU</ShipperName>
+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
+            <ConsigneeName>HAVEFORD COLLEGE</ConsigneeName>
+            <ShipmentDate>2017-12-25T14:38:00</ShipmentDate>
+            <Pieces>1</Pieces>
+            <Weight>0.5</Weight>
+            <WeightUnit>K</WeightUnit>
+            <GlobalProductCode>D</GlobalProductCode>
+            <ShipmentDesc>DOCUMENT</ShipmentDesc>
+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
+            <Shipper>
+                <City>BEIJING</City>
+                <PostalCode>100032</PostalCode>
+                <CountryCode>CN</CountryCode>
+            </Shipper>
+            <Consignee>
+                <City>HAVERFORD</City>
+                <DivisionCode>PA</DivisionCode>
+                <PostalCode>19041</PostalCode>
+                <CountryCode>US</CountryCode>
+            </Consignee>
+            <ShipperReference>
+                <ReferenceID>2469</ReferenceID>
+            </ShipperReference>
+            <ShipmentEvent>
+                <Date>2017-12-25</Date>
+                <Time>14:38:00</Time>
+                <ServiceEvent>
+                    <EventCode>SD</EventCode>
+                    <Description>Shipment information received</Description>
+                </ServiceEvent>
+                <Signatory/>
+                <ServiceArea>
+                    <ServiceAreaCode>PEK</ServiceAreaCode>
+                    <Description>BEIJING-CHN</Description>
+                </ServiceArea>
+            </ShipmentEvent>
+        </ShipmentInfo>
+    </AWBInfo>
+    <AWBInfo>
+        <AWBNumber>4781585060</AWBNumber>
+        <Status>
+            <ActionStatus>success</ActionStatus>
+        </Status>
+        <ShipmentInfo>
+            <OriginServiceArea>
+                <ServiceAreaCode>HKG</ServiceAreaCode>
+                <Description>HONG KONG-HKG</Description>
+            </OriginServiceArea>
+            <DestinationServiceArea>
+                <ServiceAreaCode>HKG</ServiceAreaCode>
+                <Description>HONG KONG-HKG</Description>
+            </DestinationServiceArea>
+            <ShipperName>NET-A-PORTER</ShipperName>
+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
+            <ConsigneeName>NICOLE LI</ConsigneeName>
+            <ShipmentDate>2017-12-24T13:35:00</ShipmentDate>
+            <Pieces>1</Pieces>
+            <Weight>2.0</Weight>
+            <WeightUnit>K</WeightUnit>
+            <GlobalProductCode>N</GlobalProductCode>
+            <ShipmentDesc>NOT RESTRICTED FOR TRANSPORT,</ShipmentDesc>
+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
+            <Shipper>
+                <City>HONG KONG</City>
+                <CountryCode>HK</CountryCode>
+            </Shipper>
+            <Consignee>
+                <City>HONG KONG</City>
+                <DivisionCode>CH</DivisionCode>
+                <CountryCode>HK</CountryCode>
+            </Consignee>
+            <ShipperReference>
+                <ReferenceID>1060571</ReferenceID>
+            </ShipperReference>
+            <ShipmentEvent>
+                <Date>2017-12-24</Date>
+                <Time>13:35:00</Time>
+                <ServiceEvent>
+                    <EventCode>SD</EventCode>
+                    <Description>Shipment information received</Description>
+                </ServiceEvent>
+                <Signatory/>
+                <ServiceArea>
+                    <ServiceAreaCode>HKG</ServiceAreaCode>
+                    <Description>HONG KONG-HKG</Description>
+                </ServiceArea>
+            </ShipmentEvent>
+        </ShipmentInfo>
+    </AWBInfo>
+    <AWBInfo>
+        <AWBNumber>5702254250</AWBNumber>
+        <Status>
+            <ActionStatus>success</ActionStatus>
+        </Status>
+        <ShipmentInfo>
+            <OriginServiceArea>
+                <ServiceAreaCode>BHX</ServiceAreaCode>
+                <Description>BIRMINGHAM-GBR</Description>
+            </OriginServiceArea>
+            <DestinationServiceArea>
+                <ServiceAreaCode>AOI</ServiceAreaCode>
+                <Description>ANCONA-ITA</Description>
+            </DestinationServiceArea>
+            <ShipperName>AMAZON EU SARL</ShipperName>
+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
+            <ConsigneeName>MATTEO LOMBO</ConsigneeName>
+            <ShipmentDate>2017-12-24T04:12:00</ShipmentDate>
+            <Pieces>1</Pieces>
+            <Weight>0.12</Weight>
+            <WeightUnit>K</WeightUnit>
+            <GlobalProductCode>U</GlobalProductCode>
+            <ShipmentDesc>CD</ShipmentDesc>
+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
+            <Shipper>
+                <City>PETERBOROUGH</City>
+                <PostalCode>PE2 9EN</PostalCode>
+                <CountryCode>GB</CountryCode>
+            </Shipper>
+            <Consignee>
+                <City>ORTONA</City>
+                <PostalCode>66026</PostalCode>
+                <CountryCode>IT</CountryCode>
+            </Consignee>
+            <ShipperReference>
+                <ReferenceID>DGWYDy4xN_1</ReferenceID>
+            </ShipperReference>
+            <ShipmentEvent>
+                <Date>2017-12-24</Date>
+                <Time>04:12:00</Time>
+                <ServiceEvent>
+                    <EventCode>SD</EventCode>
+                    <Description>Shipment information received</Description>
+                </ServiceEvent>
+                <Signatory/>
+                <ServiceArea>
+                    <ServiceAreaCode>BHX</ServiceAreaCode>
+                    <Description>BIRMINGHAM-GBR</Description>
+                </ServiceArea>
+            </ShipmentEvent>
+        </ShipmentInfo>
+    </AWBInfo>
+    <LanguageCode>en</LanguageCode>
+</req:TrackingResponse>
+<!-- ServiceInvocationId:20180227124344_5793_23bed3d9-e792-4955-8055-9472b1b41929 -->
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml
new file mode 100755
index 0000000000000..ffa4982183851
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<req:TrackingResponse xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.dhl.com TrackingResponse.xsd">
+    <Response>
+        <ServiceHeader>
+            <MessageTime>2018-02-27T12:27:42+01:00</MessageTime>
+            <MessageReference>tracking_4781585060</MessageReference>
+            <SiteID>CustomerSiteID</SiteID>
+        </ServiceHeader>
+    </Response>
+    <AWBInfo>
+        <AWBNumber>4781585060</AWBNumber>
+        <Status>
+            <ActionStatus>success</ActionStatus>
+        </Status>
+        <ShipmentInfo>
+            <OriginServiceArea>
+                <ServiceAreaCode>HKG</ServiceAreaCode>
+                <Description>HONG KONG-HKG</Description>
+            </OriginServiceArea>
+            <DestinationServiceArea>
+                <ServiceAreaCode>HKG</ServiceAreaCode>
+                <Description>HONG KONG-HKG</Description>
+            </DestinationServiceArea>
+            <ShipperName>NET-A-PORTER</ShipperName>
+            <ShipperAccountNumber>123456789</ShipperAccountNumber>
+            <ConsigneeName>NICOLE LI</ConsigneeName>
+            <ShipmentDate>2017-12-24T13:35:00</ShipmentDate>
+            <Pieces>1</Pieces>
+            <Weight>2.0</Weight>
+            <WeightUnit>K</WeightUnit>
+            <GlobalProductCode>N</GlobalProductCode>
+            <ShipmentDesc>NOT RESTRICTED FOR TRANSPORT,</ShipmentDesc>
+            <DlvyNotificationFlag>Y</DlvyNotificationFlag>
+            <Shipper>
+                <City>HONG KONG</City>
+                <CountryCode>HK</CountryCode>
+            </Shipper>
+            <Consignee>
+                <City>HONG KONG</City>
+                <DivisionCode>CH</DivisionCode>
+                <CountryCode>HK</CountryCode>
+            </Consignee>
+            <ShipperReference>
+                <ReferenceID>1060571</ReferenceID>
+            </ShipperReference>
+            <ShipmentEvent>
+                <Date>2017-12-24</Date>
+                <Time>13:35:00</Time>
+                <ServiceEvent>
+                    <EventCode>SD</EventCode>
+                    <Description>Shipment information received</Description>
+                </ServiceEvent>
+                <Signatory/>
+                <ServiceArea>
+                    <ServiceAreaCode>HKG</ServiceAreaCode>
+                    <Description>HONG KONG-HKG</Description>
+                </ServiceArea>
+            </ShipmentEvent>
+        </ShipmentInfo>
+    </AWBInfo>
+    <LanguageCode>en</LanguageCode>
+</req:TrackingResponse>
+<!-- ServiceInvocationId:20180227122741_5793_e0f8c40e-5245-4737-ab31-323030366721 -->

From 6f585f43ebba9036350aaa2dadb1f82255230313 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Thu, 17 Jan 2019 17:20:09 -0600
Subject: [PATCH 706/932] GraphQl-93: Implement support for variables in query

---
 app/code/Magento/GraphQl/etc/di.xml           | 16 +--
 .../Framework/GraphQl/Config/Element/Enum.php |  2 +-
 .../GraphQl/Config/Element/Input.php          | 74 ++++++++++++++
 .../GraphQl/Config/Element/InputFactory.php   | 97 +++++++++++++++++++
 .../GraphQl/Config/Element/InterfaceType.php  |  4 +-
 .../Framework/GraphQl/Config/Element/Type.php | 20 +---
 .../GraphQl/Config/Element/TypeFactory.php    |  5 +-
 .../Framework/GraphQl/Query/Fields.php        | 10 +-
 .../Argument/FieldEntityAttributesPool.php    |  2 +-
 .../GraphQl/Schema/SchemaGenerator.php        | 62 ++++--------
 .../Schema/Type/Input/InputFactory.php        | 60 ------------
 .../GraphQl/Schema/Type/Input/InputMapper.php | 70 +++----------
 .../Schema/Type/Input/InputObjectType.php     | 41 +++-----
 .../Output/ElementMapper/Formatter/Fields.php |  9 --
 .../Schema/Type/Output/OutputFactory.php      | 65 -------------
 .../Schema/Type/Output/OutputMapper.php       | 53 +++-------
 .../GraphQl/Schema/Type/TypeRegistry.php      | 93 ++++++++++++++++++
 17 files changed, 338 insertions(+), 345 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Config/Element/Input.php
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
 delete mode 100644 lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php
 delete mode 100644 lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php

diff --git a/app/code/Magento/GraphQl/etc/di.xml b/app/code/Magento/GraphQl/etc/di.xml
index b2083ea758e56..6acb78f9c7f9e 100644
--- a/app/code/Magento/GraphQl/etc/di.xml
+++ b/app/code/Magento/GraphQl/etc/di.xml
@@ -27,7 +27,7 @@
             <argument name="factoryMapByConfigElementType" xsi:type="array">
                 <item name="graphql_interface" xsi:type="object">Magento\Framework\GraphQl\Config\Element\InterfaceFactory</item>
                 <item name="graphql_type" xsi:type="object">Magento\Framework\GraphQl\Config\Element\TypeFactory</item>
-                <item name="graphql_input" xsi:type="object">Magento\Framework\GraphQl\Config\Element\TypeFactory</item>
+                <item name="graphql_input" xsi:type="object">Magento\Framework\GraphQl\Config\Element\InputFactory</item>
                 <item name="graphql_enum" xsi:type="object">Magento\Framework\GraphQl\Config\Element\EnumFactory</item>
             </argument>
         </arguments>
@@ -55,24 +55,16 @@
             </argument>
         </arguments>
     </virtualType>
-    <type name="Magento\Framework\GraphQl\Schema\Type\Output\OutputFactory">
+    <type name="Magento\Framework\GraphQl\Schema\Type\TypeRegistry">
         <arguments>
-            <argument name="prototypes" xsi:type="array">
+            <argument name="configToTypeMap" xsi:type="array">
                 <item name="Magento\Framework\GraphQl\Config\Element\Type" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Output\OutputTypeObject</item>
+                <item name="Magento\Framework\GraphQl\Config\Element\Input" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Input\InputObjectType</item>
                 <item name="Magento\Framework\GraphQl\Config\Element\InterfaceType" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Output\OutputInterfaceObject</item>
                 <item name="Magento\Framework\GraphQl\Config\Element\Enum" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Enum\Enum</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\GraphQl\Schema\Type\Input\InputFactory">
-        <arguments>
-            <argument name="prototypes" xsi:type="array">
-                <item name="Magento\Framework\GraphQl\Config\Element\Type" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Input\InputObjectType</item>
-                <item name="Magento\Framework\GraphQl\Config\Element\InterfaceType" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Input\InputObjectType</item>
-                <item name="Magento\Framework\GraphQl\Config\Element\Enum" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Enum\Enum</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper">
         <arguments>
             <argument name="formatter" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterComposite</argument>
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php
index b1210e986b772..994ae489af128 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Enum.php
@@ -37,7 +37,7 @@ class Enum implements ConfigElementInterface
     public function __construct(
         string $name,
         array $values,
-        string $description = ""
+        string $description
     ) {
         $this->name = $name;
         $this->values = $values;
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Input.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Input.php
new file mode 100644
index 0000000000000..8e86f701672c6
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Input.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+/**
+ * Class representing 'input' GraphQL config element.
+ */
+class Input implements TypeInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var Field[]
+     */
+    private $fields;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @param string $name
+     * @param Field[] $fields
+     * @param string $description
+     */
+    public function __construct(
+        string $name,
+        array $fields,
+        string $description
+    ) {
+        $this->name = $name;
+        $this->fields = $fields;
+        $this->description = $description;
+    }
+
+    /**
+     * Get the type name.
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get a list of fields that make up the possible return or input values of a type.
+     *
+     * @return Field[]
+     */
+    public function getFields(): array
+    {
+        return $this->fields;
+    }
+
+    /**
+     * Get a human-readable description of the type.
+     *
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
new file mode 100644
index 0000000000000..677354f67e230
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementFactoryInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for config elements of 'input' type.
+ */
+class InputFactory implements ConfigElementFactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ArgumentFactory
+     */
+    private $argumentFactory;
+
+    /**
+     * @var FieldFactory
+     */
+    private $fieldFactory;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param ArgumentFactory $argumentFactory
+     * @param FieldFactory $fieldFactory
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ArgumentFactory $argumentFactory,
+        FieldFactory $fieldFactory
+    ) {
+        $this->objectManager = $objectManager;
+        $this->argumentFactory = $argumentFactory;
+        $this->fieldFactory = $fieldFactory;
+    }
+
+    /**
+     * Instantiate an object representing 'input' GraphQL config element.
+     *
+     * @param array $data
+     * @return ConfigElementInterface
+     */
+    public function createFromConfigData(array $data): ConfigElementInterface
+    {
+        $fields = [];
+        $data['fields'] = isset($data['fields']) ? $data['fields'] : [];
+        foreach ($data['fields'] as $field) {
+            $arguments = [];
+            foreach ($field['arguments'] as $argument) {
+                $arguments[$argument['name']] = $this->argumentFactory->createFromConfigData($argument);
+            }
+            $fields[$field['name']] = $this->fieldFactory->createFromConfigData(
+                $field,
+                $arguments
+            );
+        }
+        return $this->create(
+            $data,
+            $fields
+        );
+    }
+
+    /**
+     * Create type object based off array of configured GraphQL InputType data.
+     *
+     * Type data must contain name and the type's fields. Optional data includes description.
+     *
+     * @param array $typeData
+     * @param array $fields
+     * @return Input
+     */
+    private function create(
+        array $typeData,
+        array $fields
+    ): Input {
+        return $this->objectManager->create(
+            Input::class,
+            [
+                'name' => $typeData['name'],
+                'fields' => $fields,
+                'description' => isset($typeData['description']) ? $typeData['description'] : ''
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php
index 320199c14a6d6..73ebd42acfb27 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/InterfaceType.php
@@ -8,7 +8,7 @@
 namespace Magento\Framework\GraphQl\Config\Element;
 
 /**
- * Describes the configured data for a GraphQL interface type.
+ * Class representing 'interface' GraphQL config element.
  */
 class InterfaceType implements TypeInterface
 {
@@ -42,7 +42,7 @@ public function __construct(
         string $name,
         string $typeResolver,
         array $fields,
-        string $description = ""
+        string $description
     ) {
         $this->name = $name;
         $this->fields = $fields;
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
index bda2c5ad5bd52..20d017cc71062 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
@@ -8,7 +8,7 @@
 namespace Magento\Framework\GraphQl\Config\Element;
 
 /**
- * Describes all the configured data of an Output or Input type in GraphQL.
+ * Class representing 'type' GraphQL config element.
  */
 class Type implements TypeInterface
 {
@@ -27,11 +27,6 @@ class Type implements TypeInterface
      */
     private $interfaces;
 
-    /**
-     * @var string
-     */
-    private $type;
-
     /**
      * @var string
      */
@@ -41,20 +36,17 @@ class Type implements TypeInterface
      * @param string $name
      * @param Field[] $fields
      * @param string[] $interfaces
-     * @param string $type
      * @param string $description
      */
     public function __construct(
         string $name,
         array $fields,
         array $interfaces,
-        string $type,
         string $description
     ) {
         $this->name = $name;
         $this->fields = $fields;
         $this->interfaces = $interfaces;
-        $this->type = $type;
         $this->description = $description;
     }
 
@@ -97,14 +89,4 @@ public function getDescription() : string
     {
         return $this->description;
     }
-
-    /**
-     * Get a type.
-     *
-     * @return string
-     */
-    public function getType() : string
-    {
-        return $this->type;
-    }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
index a6a6de8475009..f17d99be9bd65 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
@@ -73,10 +73,10 @@ public function createFromConfigData(array $data): ConfigElementInterface
     }
 
     /**
-     * Create type object based off array of configured GraphQL Output/InputType data.
+     * Create type object based off array of configured GraphQL Type data.
      *
      * Type data must contain name and the type's fields. Optional data includes 'implements' (i.e. the interfaces
-     * implemented by the types), and description. An InputType cannot implement an interface.
+     * implemented by the types), and description.
      *
      * @param array $typeData
      * @param array $fields
@@ -92,7 +92,6 @@ public function create(
                 'name' => $typeData['name'],
                 'fields' => $fields,
                 'interfaces' => isset($typeData['implements']) ? $typeData['implements'] : [],
-                'type' => isset($typeData['type']) ? $typeData['type'] : '',
                 'description' => isset($typeData['description']) ? $typeData['description'] : ''
             ]
         );
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
index 9c812e5259032..d0c88cb0f898e 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
@@ -28,7 +28,7 @@ class Fields
      *
      * @return void
      */
-    public function setQuery($query, $variables = null)
+    public function setQuery($query, array $variables = null)
     {
         $queryFields = [];
         try {
@@ -43,6 +43,9 @@ public function setQuery($query, $variables = null)
                     ]
                 ]
             );
+            if (isset($variables)) {
+                $queryFields = array_merge($queryFields, $this->getVariables($variables));
+            }
         } catch (\Exception $e) {
             // If a syntax error is encountered do not collect fields
         }
@@ -50,9 +53,6 @@ public function setQuery($query, $variables = null)
             // It must be possible to query any fields during introspection query
             $queryFields = [];
         }
-        if (isset($variables)) {
-            $queryFields = array_merge($queryFields, $this->getVariables($variables));
-        }
         $this->fieldsUsedInQuery = $queryFields;
     }
 
@@ -75,7 +75,7 @@ public function getFieldsUsedInQuery()
      *
      * @return string[]
      */
-    private function getVariables($variables)
+    private function getVariables(array $variables): array
     {
         $fields = [];
         foreach ($variables as $key => $value){
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php
index e7d14a81b9dee..bd9de206ccda1 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/FieldEntityAttributesPool.php
@@ -38,7 +38,7 @@ public function getEntityAttributesForEntityFromField(string $fieldName) : array
         if (isset($this->attributesInstances[$fieldName])) {
             return $this->attributesInstances[$fieldName]->getEntityAttributes();
         } else {
-            throw new \LogicException(sprintf('There is no attrribute class assigned to field %1', $fieldName));
+            throw new \LogicException(sprintf('There is no attribute class assigned to field %1', $fieldName));
         }
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
index c768d2fab5afa..ef78bea476f49 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
@@ -9,8 +9,7 @@
 
 use Magento\Framework\GraphQl\ConfigInterface;
 use Magento\Framework\GraphQl\Schema;
-use Magento\Framework\GraphQl\Schema\Type\Input\InputMapper;
-use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
 use Magento\Framework\GraphQl\SchemaFactory;
 
 /**
@@ -24,36 +23,28 @@ class SchemaGenerator implements SchemaGeneratorInterface
     private $schemaFactory;
 
     /**
-     * @var OutputMapper
-     */
-    private $outputMapper;
-
-    /**
-     * @var InputMapper
+     * @var ConfigInterface
      */
-    private $inputMapper;
+    private $config;
 
     /**
-     * @var ConfigInterface
+     * @var TypeRegistry
      */
-    private $config;
+    private $typeRegistry;
 
     /**
      * @param SchemaFactory $schemaFactory
-     * @param OutputMapper $outputMapper
-     * @param InputMapper $inputMapper
      * @param ConfigInterface $config
+     * @param TypeRegistry $typeRegistry
      */
     public function __construct(
         SchemaFactory $schemaFactory,
-        OutputMapper $outputMapper,
-        InputMapper $inputMapper,
-        ConfigInterface $config
+        ConfigInterface $config,
+        TypeRegistry $typeRegistry
     ) {
         $this->schemaFactory = $schemaFactory;
-        $this->outputMapper = $outputMapper;
-        $this->inputMapper = $inputMapper;
         $this->config = $config;
+        $this->typeRegistry = $typeRegistry;
     }
 
     /**
@@ -63,35 +54,20 @@ public function generate() : Schema
     {
         $schema = $this->schemaFactory->create(
             [
-                'query' => $this->outputMapper->getOutputType('Query'),
-                'mutation' => $this->outputMapper->getOutputType('Mutation'),
+                'query' => $this->typeRegistry->get('Query'),
+                'mutation' => $this->typeRegistry->get('Mutation'),
                 'typeLoader' => function ($name) {
-                    return $this->outputMapper->getOutputType($name);
+                    return $this->typeRegistry->get($name);
                 },
-                'types' => $this->getTypes()
+                'types' => function () {
+                    $typesImplementors = [];
+                    foreach ($this->config->getDeclaredTypeNames() as $type) {
+                        $typesImplementors [] = $this->typeRegistry->get($type['name']);
+                    }
+                    return $typesImplementors;
+                }
             ]
         );
         return $schema;
     }
-
-    /**
-     * @return array
-     * @throws \Magento\Framework\GraphQl\Exception\GraphQlInputException
-     */
-    private function getTypes()
-    {
-        $typesImplementors = [];
-        foreach ($this->config->getDeclaredTypeNames() as $type) {
-            switch ($type['type']) {
-                case 'graphql_type' :
-                    $typesImplementors [] = $this->outputMapper->getOutputType($type['name']);
-                    break;
-                case 'graphql_input' :
-                    $typesImplementors [] = $this->inputMapper->getInputType($type['name']);
-                    break;
-            }
-        }
-
-        return $typesImplementors;
-    }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php
deleted file mode 100644
index cbbd97cfdb8c7..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputFactory.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\GraphQl\Schema\Type\Input;
-
-use Magento\Framework\GraphQl\Config\ConfigElementInterface;
-use Magento\Framework\GraphQl\Schema\Type\InputTypeInterface;
-use Magento\Framework\ObjectManagerInterface;
-
-class InputFactory
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @var string
-     */
-    private $prototypes;
-
-    /**
-     * @var array
-     */
-    private $typeRegistry;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     * @param array $prototypes
-     */
-    public function __construct(
-        ObjectManagerInterface $objectManager,
-        array $prototypes
-    ) {
-        $this->objectManager = $objectManager;
-        $this->prototypes = $prototypes;
-    }
-
-    /**
-     * @param ConfigElementInterface $configElement
-     * @return InputTypeInterface
-     */
-    public function create(ConfigElementInterface $configElement) : InputTypeInterface
-    {
-        if (!isset($this->typeRegistry[$configElement->getName()])) {
-            $this->typeRegistry[$configElement->getName()] =
-                $this->objectManager->create(
-                    $this->prototypes[get_class($configElement)],
-                    [
-                        'configElement' => $configElement
-                    ]
-                );
-        }
-        return $this->typeRegistry[$configElement->getName()];
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
index 0785ea1278045..95ab1635e968b 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
@@ -9,64 +9,40 @@
 
 use Magento\Framework\GraphQl\Config\Data\WrappedTypeProcessor;
 use Magento\Framework\GraphQl\Config\Element\Argument;
-use Magento\Framework\GraphQl\ConfigInterface;
-use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
-use Magento\Framework\GraphQl\Schema\Type\InputTypeInterface;
-use Magento\Framework\GraphQl\Schema\TypeFactory;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\Phrase;
+use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
 
 class InputMapper
 {
-    /**
-     * @var InputFactory
-     */
-    private $inputFactory;
-
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
     /**
      * @var ScalarTypes
      */
     private $scalarTypes;
 
     /**
-     * @var InputTypeInterface[]
+     * @var WrappedTypeProcessor
      */
-    private $inputTypes;
+    private $wrappedTypeProcessor;
 
     /**
-     * @var WrappedTypeProcessor
+     * @var TypeRegistry
      */
-    private $wrappedTypeProcessor;
+    private $typeRegistry;
 
     /**
-     * @param InputFactory $inputFactory
-     * @param ConfigInterface $config
-     * @param TypeFactory $typeFactory
      * @param ScalarTypes $scalarTypes
      * @param WrappedTypeProcessor $wrappedTypeProcessor
+     * @param TypeRegistry $typeRegistry
      */
     public function __construct(
-        InputFactory $inputFactory,
-        ConfigInterface $config,
-        TypeFactory $typeFactory,
         ScalarTypes $scalarTypes,
-        WrappedTypeProcessor $wrappedTypeProcessor
+        WrappedTypeProcessor $wrappedTypeProcessor,
+        TypeRegistry $typeRegistry
     ) {
-        $this->inputFactory = $inputFactory;
-        $this->config = $config;
-        $this->typeFactory = $typeFactory;
         $this->scalarTypes = $scalarTypes;
         $this->wrappedTypeProcessor = $wrappedTypeProcessor;
+        $this->typeRegistry = $typeRegistry;
     }
 
     /**
@@ -74,6 +50,7 @@ public function __construct(
      *
      * @param Argument $argument
      * @return array
+     * @throws GraphQlInputException
      */
     public function getRepresentation(Argument $argument) : array
     {
@@ -81,8 +58,7 @@ public function getRepresentation(Argument $argument) : array
         if ($this->scalarTypes->isScalarType($typeName)) {
             $instance = $this->wrappedTypeProcessor->processScalarWrappedType($argument);
         } else {
-            $configElement = $this->config->getConfigElement($typeName);
-            $instance = $this->inputFactory->create($configElement);
+            $instance = $this->typeRegistry->get($typeName);
             $instance = $this->wrappedTypeProcessor->processWrappedType($argument, $instance);
         }
 
@@ -109,26 +85,4 @@ public function getRepresentation(Argument $argument) : array
 
         return $calculatedArgument;
     }
-
-    /**
-     * Get GraphQL input type object by type name.
-     *
-     * @param string $typeName
-     * @return InputTypeInterface
-     * @throws GraphQlInputException
-     */
-    public function getInputType($typeName)
-    {
-        if (!isset($this->inputTypes[$typeName])) {
-            $configElement = $this->config->getConfigElement($typeName);
-            $this->inputTypes[$typeName] = $this->inputFactory->create($configElement);
-            if (!($this->inputTypes[$typeName] instanceof InputTypeInterface)) {
-                throw new GraphQlInputException(
-                    new Phrase("Type '{$typeName}' was requested but is not declared in the GraphQL schema.")
-                );
-            }
-        }
-
-        return $this->inputTypes[$typeName];
-    }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php
index ae2d07ade2ad0..fa0327f79bc66 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputObjectType.php
@@ -8,21 +8,16 @@
 namespace Magento\Framework\GraphQl\Schema\Type\Input;
 
 use Magento\Framework\GraphQl\Config\Data\WrappedTypeProcessor;
-use Magento\Framework\GraphQl\Config\Element\Type as TypeConfigElement;
-use Magento\Framework\GraphQl\ConfigInterface;
+use Magento\Framework\GraphQl\Config\Element\Input as InputConfigElement;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
-use Magento\Framework\GraphQl\Schema\TypeFactory;
+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
 
 /**
  * Class InputObjectType
  */
 class InputObjectType extends \Magento\Framework\GraphQl\Schema\Type\InputObjectType
 {
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
     /**
      * @var ScalarTypes
      */
@@ -34,36 +29,27 @@ class InputObjectType extends \Magento\Framework\GraphQl\Schema\Type\InputObject
     private $wrappedTypeProcessor;
 
     /**
-     * @var InputFactory
+     * @var TypeRegistry
      */
-    private $inputFactory;
+    private $typeRegistry;
 
     /**
-     * @var ConfigInterface
-     */
-    public $graphQlConfig;
-
-    /**
-     * @param TypeConfigElement $configElement
-     * @param TypeFactory $typeFactory
+     * @param InputConfigElement $configElement
      * @param ScalarTypes $scalarTypes
      * @param WrappedTypeProcessor $wrappedTypeProcessor
-     * @param InputFactory $inputFactory
-     * @param ConfigInterface $graphQlConfig
+     * @param TypeRegistry $typeRegistry
+     * @throws GraphQlInputException
      */
     public function __construct(
-        TypeConfigElement $configElement,
-        TypeFactory $typeFactory,
+        InputConfigElement $configElement,
         ScalarTypes $scalarTypes,
         WrappedTypeProcessor $wrappedTypeProcessor,
-        InputFactory $inputFactory,
-        ConfigInterface $graphQlConfig
+        TypeRegistry $typeRegistry
     ) {
-        $this->typeFactory = $typeFactory;
         $this->scalarTypes = $scalarTypes;
         $this->wrappedTypeProcessor = $wrappedTypeProcessor;
-        $this->inputFactory = $inputFactory;
-        $this->graphQlConfig = $graphQlConfig;
+        $this->typeRegistry = $typeRegistry;
+
         $config = [
             'name' => $configElement->getName(),
             'description' => $configElement->getDescription()
@@ -75,8 +61,7 @@ public function __construct(
                 if ($field->getTypeName() == $configElement->getName()) {
                     $type = $this;
                 } else {
-                    $fieldConfigElement = $this->graphQlConfig->getConfigElement($field->getTypeName());
-                    $type = $this->inputFactory->create($fieldConfigElement);
+                    $type = $this->typeRegistry->get($field->getTypeName());
                 }
                 $type = $this->wrappedTypeProcessor->processWrappedType($field, $type);
             }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
index b54cd4d8ca218..9c61211f84bde 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
@@ -16,7 +16,6 @@
 use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
 use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
 use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
-use Magento\Framework\GraphQl\Schema\TypeFactory;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfoFactory;
 
@@ -40,11 +39,6 @@ class Fields implements FormatterInterface
      */
     private $inputMapper;
 
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
     /**
      * @var ScalarTypes
      */
@@ -64,7 +58,6 @@ class Fields implements FormatterInterface
      * @param ObjectManagerInterface $objectManager
      * @param OutputMapper $outputMapper
      * @param InputMapper $inputMapper
-     * @param TypeFactory $typeFactory
      * @param ScalarTypes $scalarTypes
      * @param WrappedTypeProcessor $wrappedTypeProcessor
      * @param ResolveInfoFactory $resolveInfoFactory
@@ -73,7 +66,6 @@ public function __construct(
         ObjectManagerInterface $objectManager,
         OutputMapper $outputMapper,
         InputMapper $inputMapper,
-        TypeFactory $typeFactory,
         ScalarTypes $scalarTypes,
         WrappedTypeProcessor $wrappedTypeProcessor,
         ResolveInfoFactory $resolveInfoFactory
@@ -81,7 +73,6 @@ public function __construct(
         $this->objectManager = $objectManager;
         $this->outputMapper = $outputMapper;
         $this->inputMapper = $inputMapper;
-        $this->typeFactory = $typeFactory;
         $this->scalarTypes = $scalarTypes;
         $this->wrappedTypeProcessor = $wrappedTypeProcessor;
         $this->resolveInfoFactory = $resolveInfoFactory;
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php
deleted file mode 100644
index 81dad11774b01..0000000000000
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputFactory.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\GraphQl\Schema\Type\Output;
-
-use Magento\Framework\GraphQl\Config\ConfigElementInterface;
-use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
-use Magento\Framework\ObjectManagerInterface;
-
-/**
- * Factory for 'output type' objects compatible with GraphQL schema generator.
- */
-class OutputFactory
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @var string
-     */
-    private $prototypes;
-
-    /**
-     * @var array
-     */
-    private $typeRegistry;
-
-    /**
-     * @param ObjectManagerInterface $objectManager
-     * @param array $prototypes
-     */
-    public function __construct(
-        ObjectManagerInterface $objectManager,
-        array $prototypes
-    ) {
-        $this->objectManager = $objectManager;
-        $this->prototypes = $prototypes;
-    }
-
-    /**
-     * Create output type.
-     *
-     * @param ConfigElementInterface $configElement
-     * @return OutputTypeInterface
-     */
-    public function create(ConfigElementInterface $configElement) : OutputTypeInterface
-    {
-        if (!isset($this->typeRegistry[$configElement->getName()])) {
-            $this->typeRegistry[$configElement->getName()] =
-                $this->objectManager->create(
-                    $this->prototypes[get_class($configElement)],
-                    [
-                        'configElement' => $configElement
-                    ]
-                );
-        }
-        return $this->typeRegistry[$configElement->getName()];
-    }
-}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
index b7f4b8a1f60db..046eeb5b1f93d 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
@@ -7,50 +7,28 @@
 
 namespace Magento\Framework\GraphQl\Schema\Type\Output;
 
-use Magento\Framework\GraphQl\ConfigInterface;
 use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
-use Magento\Framework\GraphQl\Schema\TypeFactory;
+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\Phrase;
 
 /**
- * Map type names to their output type/interface classes.
+ * Map type names to their output type/interface/enum classes.
  */
 class OutputMapper
 {
     /**
-     * @var OutputFactory
+     * @var TypeRegistry
      */
-    private $outputFactory;
+    private $typeRegistry;
 
     /**
-     * @var OutputTypeInterface[]
-     */
-    private $outputTypes;
-
-    /**
-     * @var TypeFactory
-     */
-    private $typeFactory;
-
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
-    /**
-     * @param OutputFactory $outputFactory
-     * @param TypeFactory $typeFactory
-     * @param ConfigInterface $config
+     * @param TypeRegistry $typeRegistry
      */
     public function __construct(
-        OutputFactory $outputFactory,
-        TypeFactory $typeFactory,
-        ConfigInterface $config
+        TypeRegistry $typeRegistry
     ) {
-        $this->outputFactory = $outputFactory;
-        $this->config = $config;
-        $this->typeFactory = $typeFactory;
+        $this->typeRegistry = $typeRegistry;
     }
 
     /**
@@ -62,16 +40,13 @@ public function __construct(
      */
     public function getOutputType($typeName)
     {
-        if (!isset($this->outputTypes[$typeName])) {
-            $configElement = $this->config->getConfigElement($typeName);
-            $this->outputTypes[$typeName] = $this->outputFactory->create($configElement);
-            if (!($this->outputTypes[$typeName] instanceof OutputTypeInterface)) {
-                throw new GraphQlInputException(
-                    new Phrase("Type '{$typeName}' was requested but is not declared in the GraphQL schema.")
-                );
-            }
-        }
+        $outputType = $this->typeRegistry->get($typeName);
 
-        return $this->outputTypes[$typeName];
+        if (!$outputType instanceof OutputTypeInterface) {
+            throw new GraphQlInputException(
+                new Phrase("Type '{$typeName}' was requested but is not declared in the GraphQL schema.")
+            );
+        }
+        return $outputType;
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
new file mode 100644
index 0000000000000..6b1e20f996def
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+use Magento\Framework\GraphQl\ConfigInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Schema\Type\InputTypeInterface;
+use Magento\Framework\GraphQl\Schema\TypeInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
+
+/**
+ * GraphQL type object registry
+ */
+class TypeRegistry
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * Key is config class name, value is related type class name
+     *
+     * @var array
+     */
+    private $configToTypeMap;
+
+    /**
+     * @var TypeInterface[]
+     */
+    private $types;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param ConfigInterface $config
+     * @param array $configToTypeMap
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ConfigInterface $config,
+        array $configToTypeMap
+    ) {
+        $this->objectManager = $objectManager;
+        $this->config = $config;
+        $this->configToTypeMap = $configToTypeMap;
+    }
+
+    /**
+     * Get GraphQL type object by type name
+     *
+     * @param string $typeName
+     * @return TypeInterface|InputTypeInterface|OutputTypeInterface
+     * @throws GraphQlInputException
+     */
+    public function get(string $typeName): TypeInterface
+    {
+        if (!isset($this->types[$typeName])) {
+            $configElement = $this->config->getConfigElement($typeName);
+
+            $configElementClass = get_class($configElement);
+            if (!isset($this->configToTypeMap[$configElementClass])) {
+                throw new GraphQlInputException(
+                    new Phrase("Type for '{$configElementClass}' has not declared.")
+                );
+            }
+
+            $this->types[$typeName] = $this->objectManager->create(
+                $this->configToTypeMap[$configElementClass],
+                [
+                    'configElement' => $configElement,
+                ]
+            );
+
+            if (!($this->types[$typeName] instanceof TypeInterface)) {
+                throw new GraphQlInputException(
+                    new Phrase("Type '{$typeName}' was requested but is not declared in the GraphQL schema.")
+                );
+            }
+        }
+        return $this->types[$typeName];
+    }
+}

From 1af8c7820f59a238742979db38cd3d652f7e789b Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 18 Jan 2019 10:49:39 +0200
Subject: [PATCH 707/932] Fix static test.

---
 .../Shipping/Controller/Adminhtml/Order/Shipment/Save.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index e36292b7c2e36..100ba029beabd 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -89,6 +89,7 @@ protected function _saveShipment($shipment)
 
     /**
      * Save shipment
+     *
      * We can save only new shipment. Existing shipments are not editable
      *
      * @return \Magento\Framework\Controller\ResultInterface

From 50c50d44a69eeb8f72fc52c87ee6bf319e5e605a Mon Sep 17 00:00:00 2001
From: Mastiuhin Olexandr <mastiuhin.olexandr@transoftgroup.com>
Date: Fri, 18 Jan 2019 11:29:41 +0200
Subject: [PATCH 708/932] MAGETWO-97091: Zip code is not validated for address
 entered in My Account and for new address entered during checkout

---
 .../DataProviders/PostCodesPatternsAttributeData.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
index ac83602548abb..37d9b573c0225 100644
--- a/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
+++ b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Customer\Block\DataProviders;
 
-use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Directory\Model\Country\Postcode\Config as PostCodeConfig;
 
@@ -22,7 +22,7 @@ class PostCodesPatternsAttributeData implements ArgumentInterface
     private $postCodeConfig;
 
     /**
-     * @var Json
+     * @var SerializerInterface
      */
     private $serializer;
 
@@ -30,9 +30,9 @@ class PostCodesPatternsAttributeData implements ArgumentInterface
      * Constructor
      *
      * @param PostCodeConfig $postCodeConfig
-     * @param Json $serializer
+     * @param SerializerInterface $serializer
      */
-    public function __construct(PostCodeConfig $postCodeConfig, Json $serializer)
+    public function __construct(PostCodeConfig $postCodeConfig, SerializerInterface $serializer)
     {
         $this->postCodeConfig = $postCodeConfig;
         $this->serializer = $serializer;

From 62510097611032f179e1077d881d3b1c548acdc2 Mon Sep 17 00:00:00 2001
From: Mastiuhin Olexandr <mastiuhin.olexandr@transoftgroup.com>
Date: Fri, 18 Jan 2019 11:45:47 +0200
Subject: [PATCH 709/932] MAGETWO-97091: Zip code is not validated for address
 entered in My Account and for new address entered during checkout

---
 .../Block/DataProviders/PostCodesPatternsAttributeData.php    | 4 ++--
 .../Customer/view/frontend/templates/address/edit.phtml       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
index 37d9b573c0225..280948439e1f8 100644
--- a/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
+++ b/app/code/Magento/Customer/Block/DataProviders/PostCodesPatternsAttributeData.php
@@ -39,11 +39,11 @@ public function __construct(PostCodeConfig $postCodeConfig, SerializerInterface
     }
 
     /**
-     * Get post codes in json format
+     * Get serialized post codes
      *
      * @return string
      */
-    public function getPostCodesJson(): string
+    public function getSerializedPostCodes(): string
     {
         return $this->serializer->serialize($this->postCodeConfig->getPostCodes());
     }
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index c26e0390db817..df3f000410830 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -188,7 +188,7 @@
     {
         "#form-validate": {
             "addressValidation": {
-                "postCodes": <?= /* @noEscape */ $block->getPostCodeConfig()->getPostCodesJson(); ?>
+                "postCodes": <?= /* @noEscape */ $block->getPostCodeConfig()->getSerializedPostCodes(); ?>
             }
         },
         "#country": {

From 5d4ff3a309e70b9a69eba6a45de1fc805af6da61 Mon Sep 17 00:00:00 2001
From: Mastiuhin Olexandr <mastiuhin.olexandr@transoftgroup.com>
Date: Fri, 18 Jan 2019 11:55:53 +0200
Subject: [PATCH 710/932] MAGETWO-97091: Zip code is not validated for address
 entered in My Account and for new address entered during checkout

---
 .../Checkout/view/frontend/web/js/model/postcode-validator.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
index 4a506915dc8f7..0a5334a42c7e5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/postcode-validator.js
@@ -20,7 +20,7 @@ define([
         validate: function (postCode, countryId, postCodesPatterns) {
             var pattern, regex,
                 patterns = postCodesPatterns ? postCodesPatterns[countryId] :
-                window.checkoutConfig.postCodes[countryId];
+                    window.checkoutConfig.postCodes[countryId];
 
             this.validatedPostCodeExample = [];
 

From 7565dd8dfc18b6c50fe4ed23157b4fcf8476ed1e Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Fri, 18 Jan 2019 12:33:00 +0200
Subject: [PATCH 711/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Model/Import/Product.php                  | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 613c3adc408a2..30a57bd69b67c 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2432,6 +2432,7 @@ public function getRowScope(array $rowData)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws \Zend_Validate_Exception
      */
     public function validateRow(array $rowData, $rowNum)
     {
@@ -2459,25 +2460,23 @@ public function validateRow(array $rowData, $rowNum)
             return true;
         }
 
+        // if product doesn't exist, need to throw critical error else all errors should be not critical.
+        $errorLevel = $this->getValidationErrorLevel();
+
         if (!$this->validator->isValid($rowData)) {
             foreach ($this->validator->getMessages() as $message) {
-                $this->skipRow(
-                    $rowNum,
-                    $message,
-                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL,
-                    $this->validator->getInvalidAttribute()
-                );
+                $this->skipRow($rowNum, $message, $errorLevel, $this->validator->getInvalidAttribute());
             }
         }
 
         if (null === $sku) {
-            $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_IS_EMPTY);
+            $this->skipRow($rowNum, ValidatorInterface::ERROR_SKU_IS_EMPTY, $errorLevel);
         } elseif (false === $sku) {
-            $this->skipRow($rowNum, ValidatorInterface::ERROR_ROW_IS_ORPHAN);
+            $this->skipRow($rowNum, ValidatorInterface::ERROR_ROW_IS_ORPHAN, $errorLevel);
         } elseif (self::SCOPE_STORE == $rowScope
             && !$this->storeResolver->getStoreCodeToId($rowData[self::COL_STORE])
         ) {
-            $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_STORE);
+            $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_STORE, $errorLevel);
         }
 
         // SKU is specified, row is SCOPE_DEFAULT, new product block begins
@@ -2492,15 +2491,15 @@ public function validateRow(array $rowData, $rowNum)
                     $this->prepareNewSkuData($sku)
                 );
             } else {
-                $this->skipRow($rowNum, ValidatorInterface::ERROR_TYPE_UNSUPPORTED);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_TYPE_UNSUPPORTED, $errorLevel);
             }
         } else {
             // validate new product type and attribute set
             if (!isset($rowData[self::COL_TYPE], $this->_productTypeModels[$rowData[self::COL_TYPE]])) {
-                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_TYPE);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_TYPE, $errorLevel);
             } elseif (!isset($rowData[self::COL_ATTR_SET], $this->_attrSetNameToId[$rowData[self::COL_ATTR_SET]])
             ) {
-                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_ATTR_SET);
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_INVALID_ATTR_SET, $errorLevel);
             } elseif ($this->skuProcessor->getNewSku($sku) === null) {
                 $this->skuProcessor->addNewSku(
                     $sku,
@@ -2570,11 +2569,7 @@ public function validateRow(array $rowData, $rowNum)
             $newFromTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_FROM_DATE], false));
             $newToTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_TO_DATE], false));
             if ($newFromTimestamp > $newToTimestamp) {
-                $this->addRowError(
-                    ValidatorInterface::ERROR_NEW_TO_DATE,
-                    $rowNum,
-                    $rowData[self::COL_NEW_TO_DATE]
-                );
+                $this->skipRow($rowNum, ValidatorInterface::ERROR_NEW_TO_DATE, $errorLevel, $rowData[self::COL_NEW_TO_DATE]);
             }
         }
 
@@ -3121,4 +3116,17 @@ private function skipRow(
             ->addRowToSkip($rowNum);
         return $this;
     }
+
+    /**
+     * Returns errorLevel for validation
+     *
+     * @param string $sku
+     * @return string
+     */
+    private function getValidationErrorLevel($sku): string
+    {
+        return (!$this->isSkuExist($sku) && Import::BEHAVIOR_REPLACE !== $this->getBehavior())
+            ? ProcessingError::ERROR_LEVEL_CRITICAL
+            : ProcessingError::ERROR_LEVEL_NOT_CRITICAL;
+    }
 }

From 8d4e4a23973f8d3d1a0b0f71c18ad90fed161c88 Mon Sep 17 00:00:00 2001
From: Cristiano Casciotti <teknoman84@gmail.com>
Date: Fri, 18 Jan 2019 13:01:54 +0100
Subject: [PATCH 712/932] Changed way to calculate values

---
 app/code/Magento/Quote/Model/Quote.php         | 17 +++++++----------
 app/code/Magento/Quote/Model/Quote/Address.php | 14 ++++----------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 636f5c2dd06e2..ecda0dd2c0d74 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -2284,11 +2284,10 @@ public function validateMinimumAmount($multishipping = false)
                 $taxes = ($taxInclude) ? $address->getBaseTaxAmount() : 0;
                 foreach ($address->getQuote()->getItemsCollection() as $item) {
                     /** @var \Magento\Quote\Model\Quote\Item $item */
-                    if ($includeDiscount) {
-                        $amount = $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $taxes;
-                    } else {
-                        $amount = $taxInclude ? $item->getBaseRowTotalInclTax() : $item->getBaseRowTotal();
-                    }
+                    $amount = $includeDiscount ?
+                        $item->getBaseRowTotal() - $item->getBaseDiscountAmount() + $taxes :
+                        $item->getBaseRowTotal() + $taxes;
+
                     if ($amount < $minAmount) {
                         return false;
                     }
@@ -2298,11 +2297,9 @@ public function validateMinimumAmount($multishipping = false)
             $baseTotal = 0;
             foreach ($addresses as $address) {
                 $taxes = ($taxInclude) ? $address->getBaseTaxAmount() : 0;
-                if ($includeDiscount) {
-                    $baseTotal += $address->getBaseSubtotalWithDiscount() + $taxes;
-                } else {
-                    $baseTotal += $taxInclude ? $address->getBaseSubtotalTotalInclTax() : $address->getBaseSubtotal();
-                }
+                $baseTotal += $includeDiscount ?
+                    $address->getBaseSubtotalWithDiscount() + $taxes :
+                    $address->getBaseSubtotal() + $taxes;
             }
             if ($baseTotal < $minAmount) {
                 return false;
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 8cac16989d5ca..96e6d7e90c7c0 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1159,17 +1159,11 @@ public function validateMinimumAmount()
             $storeId
         );
 
-        if ($includeDiscount) {
-            $taxes = $taxInclude ? $this->getBaseTaxAmount() : 0;
+        $taxes = $taxInclude ? $this->getBaseTaxAmount() : 0;
 
-            $isMinimumReached = ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount);
-        } else {
-            $isMinimumReached = $taxInclude
-                ? ($this->getBaseSubtotalTotalInclTax() >= $amount)
-                : ($this->getBaseSubtotal() >= $amount);
-        }
-
-        return $isMinimumReached;
+        return $includeDiscount ?
+            ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount) :
+            ($this->getBaseSubtotal() + $taxes >= $amount);
     }
 
     /**

From 12a0f05c811f61ae4907ca14a6b842fff70fb8f3 Mon Sep 17 00:00:00 2001
From: Nainesh <nainesh@2jcommerce.in>
Date: Fri, 18 Jan 2019 17:45:35 +0530
Subject: [PATCH 713/932] 'wishlist-page-edit-remove-item-misalign' :: On wish
 list page edit, remove item misalign in 640 X 767 resolution

---
 .../Magento/blank/Magento_Wishlist/web/css/source/_module.less   | 1 +
 .../Magento/luma/Magento_Wishlist/web/css/source/_module.less    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
index 0e8350261e002..f34ed404e86d9 100644
--- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
@@ -194,6 +194,7 @@
 
                 &-actions {
                     display: block;
+                    float: left;
 
                     .action {
                         margin-right: 15px;
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index 584eefb9bc643..3b6f724508220 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -203,6 +203,7 @@
 
                 &-actions {
                     display: block;
+                    float: left;
 
                     .action {
                         margin-right: 15px;

From f4d09473f93e80b0c6c99bac45f925b9a7e122d2 Mon Sep 17 00:00:00 2001
From: "v.shatylo" <v.shatylo@ism-ukraine.com>
Date: Fri, 18 Jan 2019 15:41:57 +0200
Subject: [PATCH 714/932] magento/magento2#12194: Tier price on configurable
 product sorting sometimes-wrong

---
 .../Magento/Catalog/Model/ResourceModel/Product/Collection.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 0d62d120f80e0..4166f44222190 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -2205,7 +2205,7 @@ private function getTierPriceSelect(array $productIds)
             $this->getLinkField() . ' IN(?)',
             $productIds
         )->order(
-            $this->getLinkField()
+            'qty'
         );
         return $select;
     }

From ba9f4f8fba861028c062c98bcbf3d71afb75e2ee Mon Sep 17 00:00:00 2001
From: Rafael Kassner <kassner@gmail.com>
Date: Fri, 18 Jan 2019 15:02:39 +0100
Subject: [PATCH 715/932] aclResource for UIComponent buttons

---
 .../ui_component/sales_order_grid.xml         |  1 +
 .../etc/definition/ui_settings.xsd            |  7 ++
 .../View/Element/UiComponent/Context.php      | 12 ++++
 .../Unit/Element/UiComponent/ContextTest.php  | 70 ++++++++++++++++++-
 4 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
index fe67f4d5e2de2..e1f047b372c95 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
@@ -17,6 +17,7 @@
                 <url path="sales/order_create/start"/>
                 <class>primary</class>
                 <label translate="true">Create New Order</label>
+                <aclResource>Magento_Sales::create</aclResource>
             </button>
         </buttons>
         <spinner>sales_order_columns</spinner>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
index cbf69e6046943..ff4d530b5bfd8 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
@@ -476,6 +476,13 @@
                                     </xs:documentation>
                                 </xs:annotation>
                             </xs:element>
+                            <xs:element name="aclResource" type="xs:string" minOccurs="0" maxOccurs="1">
+                                <xs:annotation>
+                                    <xs:documentation>
+                                        ACL Resource used to validate access to UI Component data
+                                    </xs:documentation>
+                                </xs:annotation>
+                            </xs:element>
                             <xs:element ref="param"/>
                         </xs:choice>
                         <xs:attribute name="name" type="xs:string" use="required">
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
index e472a9c9effb1..fa90933bc840e 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
@@ -6,6 +6,7 @@
 namespace Magento\Framework\View\Element\UiComponent;
 
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Element\UiComponent\ContentType\ContentTypeFactory;
 use Magento\Framework\View\Element\UiComponent\Control\ActionPoolFactory;
@@ -94,6 +95,11 @@ class Context implements ContextInterface
      */
     protected $uiComponentFactory;
 
+    /**
+     * @var AuthorizationInterface
+     */
+    protected $authorization;
+
     /**
      * @param PageLayoutInterface $pageLayout
      * @param RequestInterface $request
@@ -103,6 +109,7 @@ class Context implements ContextInterface
      * @param UrlInterface $urlBuilder
      * @param Processor $processor
      * @param UiComponentFactory $uiComponentFactory
+     * @param AuthorizationInterface $authorization
      * @param DataProviderInterface|null $dataProvider
      * @param string|null $namespace
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -116,6 +123,7 @@ public function __construct(
         UrlInterface $urlBuilder,
         Processor $processor,
         UiComponentFactory $uiComponentFactory,
+        AuthorizationInterface $authorization,
         DataProviderInterface $dataProvider = null,
         $namespace = null
     ) {
@@ -129,6 +137,7 @@ public function __construct(
         $this->urlBuilder = $urlBuilder;
         $this->processor = $processor;
         $this->uiComponentFactory = $uiComponentFactory;
+        $this->authorization = $authorization;
         $this->setAcceptType();
     }
 
@@ -280,6 +289,9 @@ public function addButtons(array $buttons, UiComponentInterface $component)
             uasort($buttons, [$this, 'sortButtons']);
 
             foreach ($buttons as $buttonId => $buttonData) {
+                if (isset($buttonData['aclResource']) && !$this->authorization->isAllowed($buttonData['aclResource'])) {
+                    continue;
+                }
                 if (isset($buttonData['url'])) {
                     $buttonData['url'] = $this->getUrl($buttonData['url']);
                 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
index b7301c4cad5d4..8f5dacc8159b5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
@@ -19,6 +19,16 @@ class ContextTest extends \PHPUnit\Framework\TestCase
      */
     protected $context;
 
+    /**
+     * @var \Magento\Framework\View\Element\UiComponent\Control\ActionPoolInterface
+     */
+    private $actionPool;
+
+    /**
+     * @var \Magento\Framework\AuthorizationInterface
+     */
+    private $authorization;
+
     protected function setUp()
     {
         $pageLayout = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class)->getMock();
@@ -33,6 +43,10 @@ protected function setUp()
             $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Control\ActionPoolFactory::class)
                 ->disableOriginalConstructor()
                 ->getMock();
+        $this->actionPool = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Control\ActionPoolInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $actionPoolFactory->method('create')->willReturn($this->actionPool);
         $contentTypeFactory =
             $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContentType\ContentTypeFactory::class)
                 ->disableOriginalConstructor()
@@ -43,6 +57,9 @@ protected function setUp()
             $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentFactory::class)
                 ->disableOriginalConstructor()
                 ->getMock();
+        $this->authorization = $this->getMockBuilder(\Magento\Framework\AuthorizationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->context = $objectManagerHelper->getObject(
@@ -55,11 +72,62 @@ protected function setUp()
                 'contentTypeFactory'    => $contentTypeFactory,
                 'urlBuilder'            => $urlBuilder,
                 'processor'             => $processor,
-                'uiComponentFactory'    => $uiComponentFactory
+                'uiComponentFactory'    => $uiComponentFactory,
+                'authorization'         => $this->authorization,
             ]
         );
     }
 
+    public function testAddButtonWithoutAclResource()
+    {
+        $component = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->actionPool->expects($this->once())->method('add');
+        $this->authorization->expects($this->never())->method('isAllowed');
+
+        $this->context->addButtons([
+            'button_1' => [
+                'name' => 'button_1',
+            ],
+        ], $component);
+    }
+
+    public function testAddButtonWithAclResourceAllowed()
+    {
+        $component = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->actionPool->expects($this->once())->method('add');
+        $this->authorization->expects($this->once())->method('isAllowed')->willReturn(true);
+
+        $this->context->addButtons([
+            'button_1' => [
+                'name' => 'button_1',
+                'aclResource' => 'Magento_Framwork::acl',
+            ],
+        ], $component);
+    }
+
+    public function testAddButtonWithAclResourceDenied()
+    {
+        $component = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->actionPool->expects($this->never())->method('add');
+        $this->authorization->expects($this->once())->method('isAllowed')->willReturn(false);
+
+        $this->context->addButtons([
+            'button_1' => [
+                'name' => 'button_1',
+                'aclResource' => 'Magento_Framwork::acl',
+            ],
+        ], $component);
+    }
+
     /**
      * @dataProvider addComponentDefinitionDataProvider
      * @param array $components

From 40d65a753184525bf50adcc3dba0242b187ed394 Mon Sep 17 00:00:00 2001
From: Rafael Kassner <kassner@gmail.com>
Date: Fri, 18 Jan 2019 15:19:06 +0100
Subject: [PATCH 716/932] Code review changes

---
 .../Framework/View/Element/UiComponent/Context.php     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
index fa90933bc840e..3760e052a9130 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
@@ -98,7 +98,7 @@ class Context implements ContextInterface
     /**
      * @var AuthorizationInterface
      */
-    protected $authorization;
+    private $authorization;
 
     /**
      * @param PageLayoutInterface $pageLayout
@@ -123,9 +123,9 @@ public function __construct(
         UrlInterface $urlBuilder,
         Processor $processor,
         UiComponentFactory $uiComponentFactory,
-        AuthorizationInterface $authorization,
         DataProviderInterface $dataProvider = null,
-        $namespace = null
+        $namespace = null,
+        AuthorizationInterface $authorization = null
     ) {
         $this->namespace = $namespace;
         $this->request = $request;
@@ -137,7 +137,9 @@ public function __construct(
         $this->urlBuilder = $urlBuilder;
         $this->processor = $processor;
         $this->uiComponentFactory = $uiComponentFactory;
-        $this->authorization = $authorization;
+        $this->authorization = $authorization ?: ObjectManager::getInstance()->get(
+            AuthorizationInterface::class
+        );
         $this->setAcceptType();
     }
 

From a051e8aba3330ed8c662e0862690ba0f107aa3e6 Mon Sep 17 00:00:00 2001
From: Rafael Kassner <kassner@gmail.com>
Date: Fri, 18 Jan 2019 15:19:41 +0100
Subject: [PATCH 717/932] Code review changes

---
 .../Magento/Framework/View/Element/UiComponent/Context.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
index 3760e052a9130..3e4de596ff084 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\View\Element\UiComponent;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\UrlInterface;

From a801e1e57feccc00c780c4e750f540782638981a Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 18 Jan 2019 08:44:30 -0600
Subject: [PATCH 718/932] MC-12963: Error from PayPal when place order using
 PayPal Credit

---
 .../Magento/Paypal/Controller/Express/OnAuthorization.php     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index b82f0ba31437d..fd8985c1792a7 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Paypal\Model\Config as PayPalConfig;
 use Magento\Paypal\Model\Express\Checkout as PayPalCheckout;
+use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 
 /**
  * Processes data after returning from PayPal
@@ -140,6 +141,9 @@ public function execute()
                 $responseContent['redirectUrl'] = $this->urlBuilder->getUrl('paypal/express/review');
                 $this->_checkoutSession->setQuoteId($quote->getId());
             }
+        } catch (ApiProcessableException $e) {
+            $responseContent['success'] = false;
+            $responseContent['error_message'] = $e->getUserMessage();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $responseContent['success'] = false;
             $responseContent['error_message'] = $e->getMessage();

From f199b7d018db2bd2572a727e92bb51006ef24798 Mon Sep 17 00:00:00 2001
From: Milind Singh <milind7@live.com>
Date: Fri, 18 Jan 2019 20:14:31 +0530
Subject: [PATCH 719/932] #20409 Fixed Unnecessary slash in namespace

---
 app/code/Magento/CatalogInventory/etc/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogInventory/etc/di.xml b/app/code/Magento/CatalogInventory/etc/di.xml
index ace72bb11c37b..8d57fab843f4c 100644
--- a/app/code/Magento/CatalogInventory/etc/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/di.xml
@@ -111,7 +111,7 @@
             <argument name="batchSizeManagement" xsi:type="object">Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement</argument>
         </arguments>
     </type>
-    <type name="\Magento\Framework\Data\CollectionModifier">
+    <type name="Magento\Framework\Data\CollectionModifier">
         <arguments>
             <argument name="conditions" xsi:type="array">
                 <item name="stockStatusCondition" xsi:type="object">Magento\CatalogInventory\Model\ProductCollectionStockCondition</item>

From 18ae227d2411b7d0f1709971b1ce93dfce2e8108 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 18 Jan 2019 17:09:59 +0200
Subject: [PATCH 720/932] ENGCOM-3887: Static and Unit tests fix.

---
 .../Sales/Controller/Download/DownloadCustomOption.php     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
index c966a6ea7a4d1..d30839e96dccb 100644
--- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Sales\Controller\Download;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Action\Context;
 use Magento\Catalog\Model\Product\Type\AbstractType;
@@ -14,9 +15,10 @@
 
 /**
  * Class DownloadCustomOption
+ *
  * @package Magento\Sales\Controller\Download
  */
-class DownloadCustomOption extends \Magento\Framework\App\Action\Action
+class DownloadCustomOption extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
 {
     /**
      * @var ForwardFactory
@@ -95,7 +97,8 @@ public function execute()
             /** @var $productOption \Magento\Catalog\Model\Product\Option */
             $productOption = $this->_objectManager->create(
                 \Magento\Catalog\Model\Product\Option::class
-            )->load($optionId);
+            );
+            $productOption->load($optionId);
         }
 
         if ($productOption->getId() && $productOption->getType() != 'file') {

From f4bec92a9a56da80dde2d54b1f8445a13b08bdb8 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 18 Jan 2019 09:19:26 -0600
Subject: [PATCH 721/932] MQE-1408: Deliver weekly MTF to MFTF conversion PR

- Remove AdminCheckPaginationInStorefrontTest because it fails in Jenkins
---
 .../AdminCheckPaginationInStorefrontTest.xml  | 158 ------------------
 1 file changed, 158 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
deleted file mode 100644
index cbe11cc2e9507..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminCheckPaginationInStorefrontTest">
-        <annotations>
-            <stories value="Create flat catalog product"/>
-            <title value="Verify that pagination works when Flat Category is enabled"/>
-            <description value="Login as admin, create flat catalog product and check pagination"/>
-            <testCaseId value="MC-6051"/>
-            <severity value="CRITICAL"/>
-            <group value="mtf_migrated"/>
-            <group value="Catalog"/>
-        </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
-            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1 "/>
-            <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 1 "/>
-            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct1"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct2"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct3"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct4"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct5"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct6"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct7"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct8"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct9"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct10"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct11"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct12"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct13"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct14"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct15"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct16"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct17"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct18"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct19"/>
-            <createData entity="PaginationProduct" stepKey="simpleProduct20"/>
-        </before>
-        <after>
-            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
-            <deleteData  createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-            <deleteData  createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-            <deleteData  createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
-            <deleteData  createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
-            <deleteData  createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
-            <deleteData  createDataKey="simpleProduct6" stepKey="deleteSimpleProduct6"/>
-            <deleteData  createDataKey="simpleProduct7" stepKey="deleteSimpleProduct7"/>
-            <deleteData  createDataKey="simpleProduct8" stepKey="deleteSimpleProduct8"/>
-            <deleteData  createDataKey="simpleProduct9" stepKey="deleteSimpleProduct9"/>
-            <deleteData  createDataKey="simpleProduct10" stepKey="deleteSimpleProduct10"/>
-            <deleteData  createDataKey="simpleProduct11" stepKey="deleteSimpleProduct11"/>
-            <deleteData  createDataKey="simpleProduct12" stepKey="deleteSimpleProduct12"/>
-            <deleteData  createDataKey="simpleProduct13" stepKey="deleteSimpleProduct13"/>
-            <deleteData  createDataKey="simpleProduct14" stepKey="deleteSimpleProduct14"/>
-            <deleteData  createDataKey="simpleProduct15" stepKey="deleteSimpleProduct15"/>
-            <deleteData  createDataKey="simpleProduct16" stepKey="deleteSimpleProduct16"/>
-            <deleteData  createDataKey="simpleProduct17" stepKey="deleteSimpleProduct17"/>
-            <deleteData  createDataKey="simpleProduct18" stepKey="deleteSimpleProduct18"/>
-            <deleteData  createDataKey="simpleProduct19" stepKey="deleteSimpleProduct19"/>
-            <deleteData  createDataKey="simpleProduct20" stepKey="deleteSimpleProduct20"/>
-            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0" />
-            <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 0" />
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
-        <!--Open Category Page and select created category-->
-        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
-        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForPageToLoad0"/>
-        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
-        <waitForPageLoad stepKey="waitForPageToLoaded2"/>
-        <!--Select Products-->
-        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
-        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
-        <waitForPageLoad stepKey="waitForProductsToLoad"/>
-        <scrollTo selector="{{CatalogProductsSection.resetFilter}}" stepKey="scrollToResetFilter"/>
-        <waitForElementVisible selector="{{CatalogProductsSection.resetFilter}}" time="30" stepKey="waitForResetButtonToVisible"/>
-        <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
-        <waitForPageLoad stepKey="waitForPageToLoad3"/>
-        <selectOption selector="{{AdminProductGridFilterSection.productPerPage}}" userInput="20" stepKey="selectPagePerView"/>
-        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="pagi"  stepKey="selectProduct1"/>
-        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitFroPageToLoad1"/>
-        <see selector="{{AdminProductGridFilterSection.productCount}}" userInput="20" stepKey="seeNumberOfProductsFound"/>
-        <click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
-        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
-        <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
-        <!--Open Category Store Front Page-->
-        <amOnPage url="{{_defaultCategory.name}}.html" stepKey="goToStorefront"/>
-        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
-        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
-        <waitForPageLoad stepKey="waitForProductToLoad"/>
-        <!--Select 9 items per page and verify number of products displayed in each page -->
-        <conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
-        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
-        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="9" stepKey="selectPerPageOption"/>
-        <!--Verify number of products displayed in First Page -->
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage"/>
-        <!--Verify number of products displayed in Second Page -->
-        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
-        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
-        <waitForPageLoad stepKey="waitForPageToLoad4"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage"/>
-        <!--Verify number of products displayed in third  Page -->
-        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
-        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
-        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage"/>
-        <!--Change Pages using Previous Page selector and verify number of products displayed in each page-->
-        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage"/>
-        <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage1"/>
-        <waitForPageLoad stepKey="waitForPageToLoad5"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage1"/>
-        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage1"/>
-        <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage2"/>
-        <waitForPageLoad stepKey="waitForPageToLoad6"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage1"/>
-        <!--Select Pages by using page Number and verify number of products displayed-->
-        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage2"/>
-        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
-        <waitForPageLoad stepKey="waitForPageToLoad7"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage2"/>
-        <!--Select Third Page using page number-->
-        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage3"/>
-        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('3')}}" stepKey="clickOnThirdPage"/>
-        <waitForPageLoad stepKey="waitForPageToLoad8"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage2"/>
-        <!--Select First Page using page number-->
-        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage4"/>
-        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage"/>
-        <waitForPageLoad stepKey="waitForPageToLoad9"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsFirstPage2"/>
-        <!--Select 15 items per page and verify number of products displayed in each page -->
-        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
-        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="15" stepKey="selectPerPageOption1"/>
-        <waitForPageLoad stepKey="waitForPageToLoad10"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="15" stepKey="seeNumberOfProductsInFirstPage3"/>
-        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
-        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
-        <waitForPageLoad stepKey="waitForPageToLoad11"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="5" stepKey="seeNumberOfProductsInSecondPage3"/>
-        <!--Select 30 items per page  and verify number of products displayed in each page -->
-        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
-        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="30" stepKey="selectPerPageOption2"/>
-        <waitForPageLoad stepKey="waitForPageToLoad12"/>
-        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="20" stepKey="seeNumberOfProductsInFirstPage4"/>
-    </test>
-</tests>

From 4433747710a381bfab4cdeeb3d1c11fd47fb6331 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Fri, 18 Jan 2019 09:25:07 -0600
Subject: [PATCH 722/932] MC-6289: Billing Agreements - fix static failures

---
 .../web/js/in-context/express-checkout-smart-buttons.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index a1460dda5182a..d03677c0e47f4 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -68,9 +68,9 @@ define([
                     button: clientConfig.button,
                     form_key: clientConfig.formKey
                 };
-                    if (clientConfig.hasOwnProperty('billingAgreement')) {
-                        params.paypal_ec_create_ba = clientConfig.billingAgreement;
-                    }
+                if (clientConfig.hasOwnProperty('billingAgreement')) {
+                    params.paypal_ec_create_ba = clientConfig.billingAgreement;
+                }
                 if (!clientConfig.button) {
                     return new paypal.Promise(function (resolve, reject) {
                         clientConfig.additionalAction(clientConfig.messageContainer).done(function () {

From f27036f48f54ef01f0a18ead544a19f95e537c96 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Fri, 18 Jan 2019 17:36:00 +0200
Subject: [PATCH 723/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 app/code/Magento/CatalogImportExport/Model/Import/Product.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 30a57bd69b67c..5a051a425608e 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2461,7 +2461,7 @@ public function validateRow(array $rowData, $rowNum)
         }
 
         // if product doesn't exist, need to throw critical error else all errors should be not critical.
-        $errorLevel = $this->getValidationErrorLevel();
+        $errorLevel = $this->getValidationErrorLevel($sku);
 
         if (!$this->validator->isValid($rowData)) {
             foreach ($this->validator->getMessages() as $message) {

From cd257f24bcc5e3b8a6a98202eb824ba5a81dd6d7 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 18 Jan 2019 10:14:50 -0600
Subject: [PATCH 724/932] MQE-1408: Deliver weekly MTF to MFTF conversion PR

- Add waitForPageLoad to StorefrontOnePageCheckoutDataWhenChangeQtyTest
---
 .../Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
index 778c1637a802d..65c19252c8ba7 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -57,6 +57,7 @@
         <!--Select shipping method and finalize checkout-->
         <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>

From 9610a789f60ca9645af291524275018cd2e2d834 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 18 Jan 2019 10:57:49 -0600
Subject: [PATCH 725/932] MQE-1408: Deliver weekly MTF to MFTF conversion PR

- Remove duplicate data entity SimpleRootSubCategory
---
 .../Catalog/Test/Mftf/Data/CategoryData.xml        | 14 +++-----------
 ...UpdateCategoryWithInactiveIncludeInMenuTest.xml | 10 +++++-----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index 042393266e923..e832153e45ca6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -30,14 +30,6 @@
         <data key="include_in_menu">true</data>
         <data key="parent_id">1</data>
     </entity>
-    <entity name="SimpleRootSubCategory" type="category">
-        <data key="name" unique="suffix">SimpleRootSubCategory</data>
-        <data key="name_lwr" unique="suffix">simplerootsubcategory</data>
-        <data key="is_active">true</data>
-        <data key="include_in_menu">true</data>
-        <data key="url_key" unique="suffix">simplerootsubcategory</data>
-        <var key="parent_id" entityType="category" entityKey="id" />
-    </entity>
     <entity name="SubCategoryWithParent" type="category">
         <data key="name" unique="suffix">subCategory</data>
         <data key="name_lwr" unique="suffix">subCategory</data>
@@ -71,11 +63,11 @@
         <data key="name_lwr" unique="suffix">category</data>
     </entity>
     <entity name="SimpleRootSubCategory" type="category">
-        <data key="name" unique="prefix">SimpleRootSubCat</data>
-        <data key="name_lwr" unique="prefix">simplerootsubcat</data>
-        <data key="urlKey"  unique="prefix">simplerootsubcat</data>
+        <data key="name" unique="suffix">SimpleRootSubCategory</data>
+        <data key="name_lwr" unique="suffix">simplerootsubcategory</data>
         <data key="is_active">true</data>
         <data key="include_in_menu">true</data>
+        <data key="url_key" unique="suffix">simplerootsubcategory</data>
         <var key="parent_id" entityType="category" entityKey="id" />
     </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
index 44a764245ee72..7e84a83c07ee2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
@@ -40,7 +40,7 @@
         <fillField selector="{{AdminCategoryContentSection.description}}"  userInput="Updated category Description Fields" stepKey="fillUpdatedDescription"/>
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
-        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleRootSubCategory.urlKey}}" stepKey="fillUpdatedUrlKey"/>
+        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleRootSubCategory.url_key}}" stepKey="fillUpdatedUrlKey"/>
         <fillField selector="{{AdminCategorySEOSection.MetaTitleInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="fillUpdatedMetaTitle"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForCategorySaved"/>
@@ -49,12 +49,12 @@
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
         <waitForPageLoad stepKey="waitForUrlRewritePage"/>
         <!--Verify Updated Category UrlKey-->
-        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleRootSubCategory.urlKey}}" stepKey="fillUpdatedCategoryUrlKey"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleRootSubCategory.url_key}}" stepKey="fillUpdatedCategoryUrlKey"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <see stepKey="seeCategoryUrlKey" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{SimpleRootSubCategory.urlKey}}.html" />
+        <see stepKey="seeCategoryUrlKey" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{SimpleRootSubCategory.url_key}}.html" />
         <!--Verify Updated Category UrlKey directs to category Store Front-->
-        <amOnPage url="{{SimpleRootSubCategory.urlKey}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
+        <amOnPage url="{{SimpleRootSubCategory.url_key}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
         <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleRootSubCategory.name)}}" stepKey="seeUpdatedCategoryInStoreFrontPage"/>
         <!--Verify Updated fields in Category Page-->
@@ -72,7 +72,7 @@
         <seeInField stepKey="seeUpdatedDiscription" selector="{{AdminCategoryContentSection.description}}" userInput="Updated category Description Fields"/>
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
-        <seeInField stepKey="seeUpdatedUrlKey" selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleRootSubCategory.urlKey}}"/>
+        <seeInField stepKey="seeUpdatedUrlKey" selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleRootSubCategory.url_key}}"/>
         <seeInField stepKey="seeUpdatedMetaTitleInput" selector="{{AdminCategorySEOSection.MetaTitleInput}}" userInput="{{SimpleRootSubCategory.name}}"/>
     </test>
 </tests>

From 7e2e4cfa47f0db04274b960fd28665d814667c3a Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Fri, 18 Jan 2019 11:37:11 -0600
Subject: [PATCH 726/932] MC-4394: Convert CreateVirtualProductEntityTest to
 MFTF

Addressing review comments
---
 .../Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml   | 1 +
 .../Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml  | 2 +-
 .../Test/Mftf/Section/StorefrontProductInfoMainSection.xml      | 2 +-
 ...dminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 744660c1c4a62..483f2341fc448 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -160,6 +160,7 @@
 
         <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection"/>
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput}}" userInput="option1" stepKey="fillOptionTitle"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeOpenDropDown}}" stepKey="openTypeDropDown"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeTextField}}" stepKey="selectTypeTextField"/>
         <fillField userInput="20" selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput}}" stepKey="fillMaxChars"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
index 58cd3c5d86c6d..2d966dde64c4a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/CustomOptionsActionGroup.xml
@@ -47,7 +47,7 @@
         <fillField selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{option.title}}" stepKey="fillTitle"/>
         <click selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}" stepKey="openTypeSelect"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionType('File')}}" stepKey="selectTypeFile"/>
-        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPrice}}" stepKey="waitForElements"/>
+        <waitForElementVisible selector="{{AdminProductCustomizableOptionsSection.optionPrice('0')}}" stepKey="waitForElements"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionPrice('0')}}" userInput="{{option.price}}" stepKey="fillPrice"/>
         <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{option.price_type}}" stepKey="selectPriceType"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionFileExtensions('0')}}" userInput="{{option.file_extension}}" stepKey="fillCompatibleExtensions"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index af1a6a99afbf7..af49a253bb893 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -33,10 +33,10 @@
 
         <!-- The parameter is the nth custom option that you want to get -->
         <element name="nthCustomOption" type="block" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]" parameterized="true" />
+
         <!-- The 1st parameter is the nth custom option, the 2nd parameter is the nth value in the option -->
         <element name="nthCustomOptionInput" type="radio" selector="//*[@id='product-options-wrapper']/*[@class='fieldset']/*[contains(@class, 'field')][{{customOptionNum}}]//*[contains(@class, 'admin__field-option')][{{customOptionValueNum}}]//input" parameterized="true" />
         <element name="productOptionRadioButtonsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//input[@price='{{var2}}']" parameterized="true"/>
-
         <element name="productOptionDataMonth" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='month']" parameterized="true"/>
         <element name="productOptionDataDay" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='day']" parameterized="true"/>
         <element name="productOptionDataYear" type="date" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//legend[contains(.,'{{var1}}')]/../div[@class='control']//select[@data-calendar-role='year']" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
index c48f11115e6aa..4fe29c4781505 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
@@ -55,7 +55,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-        <click selector="{{AdminProductFormSection.visibility}}" stepKey="clickVisibility"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductGeneralGroup.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSectionHeader"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductGeneralGroup.urlKey}}" stepKey="fillUrlKeyInput"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>

From cc77e21a68a76c30f075318d2249abee299a406f Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 18 Jan 2019 12:03:35 -0600
Subject: [PATCH 727/932] MC-6280: [Frontend part] Implement Smart button
 component - code cleanup

---
 .../view/frontend/web/js/in-context/button.js |  84 +++----
 .../express-checkout-smart-buttons.js         | 155 ++++++------
 .../payment/method-renderer/iframe-methods.js |   3 +-
 .../in-context/checkout-express.js            | 223 +++++++++---------
 .../method-renderer/payflowpro/vault.js       |   6 +-
 .../web/js/view/review/actions/iframe.js      |   3 +-
 .../payment/paypal-express-in-context.html    |  36 +--
 7 files changed, 242 insertions(+), 268 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
index 8b4855cff6853..39f9b98de9e5c 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
@@ -2,50 +2,40 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-define(
-    [
-        'uiComponent',
-        'jquery',
-        'domReady!'
-    ],
-    function (
-        Component,
-        $
-    ) {
-        'use strict';
-
-        return Component.extend({
-
-            defaults: {},
-
-            /**
-             * @returns {Object}
-             */
-            initialize: function () {
-                this._super();
-
-                return this.initEvents();
-            },
-
-            /**
-             * @returns {Object}
-             */
-            initEvents: function () {
-                $('a[data-action="' + this.linkDataAction + '"]').off('click.' + this.id)
-                    .on('click.' + this.id, this.click.bind(this));
-
-                return this;
-            },
-
-            /**
-             * @param {Object} event
-             * @returns void
-             */
-            click: function (event) {
-                event.preventDefault();
-
-                $('#' + this.paypalButton).click();
-            }
-        });
-    }
-);
+define([
+    'uiComponent',
+    'jquery'
+], function (Component, $) {
+    'use strict';
+
+    return Component.extend({
+        /**
+         * @returns {Object}
+         */
+        initialize: function () {
+            this._super();
+
+            return this.initEvents();
+        },
+
+        /**
+         * @returns {Object}
+         */
+        initEvents: function () {
+            $('a[data-action="' + this.linkDataAction + '"]').off('click.' + this.id)
+                .on('click.' + this.id, this.click.bind(this));
+
+            return this;
+        },
+
+        /**
+         * @param {Object} event
+         * @returns void
+         */
+        click: function (event) {
+            event.preventDefault();
+
+            $('#' + this.paypalButton).click();
+        }
+    });
+});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index d03677c0e47f4..e5497b59b58f2 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -3,12 +3,10 @@
  * See COPYING.txt for license details.
  */
 define([
-    'jquery',
     'paypalInContextExpressCheckout',
     'Magento_Ui/js/model/messageList',
-    'underscore',
-    'domReady!'
-], function ($, paypal, messageList, _) {
+    'mage/translate'
+], function (paypal, messageList, $t) {
     'use strict';
 
     /**
@@ -19,20 +17,14 @@ define([
      */
     function getFunding(config) {
         return config.map(function (name) {
-            return paypal.FUNDING[name]
-        })
-    };
+            return paypal.FUNDING[name];
+        });
+    }
 
     return function (clientConfig, element) {
-
-        var environment = clientConfig.environment;
-
         paypal.Button.render({
-
             env: clientConfig.environment,
-            client: {
-                [environment]: clientConfig.merchantId
-            },
+            client: clientConfig.client,
             locale: clientConfig.locale,
             funding: {
                 allowed: getFunding(clientConfig.allowedFunding),
@@ -43,8 +35,13 @@ define([
             // Enable Pay Now checkout flow (optional)
             commit: true,
 
+            /**
+             * Validate payment method
+             *
+             * @param {Object} actions
+             */
             validate: function (actions) {
-                clientConfig.rendererComponent.initButtonActions(actions)
+                clientConfig.rendererComponent.initButtonActions(actions);
             },
 
             /**
@@ -63,100 +60,94 @@ define([
              */
             payment: function () {
                 var params = {
-                    quote_id: clientConfig.quoteId,
-                    customer_id: clientConfig.customerId || '',
-                    button: clientConfig.button,
-                    form_key: clientConfig.formKey
+                    'quote_id': clientConfig.quoteId,
+                    'customer_id': clientConfig.customerId || '',
+                    'form_key': clientConfig.formKey,
+                    button: clientConfig.button
                 };
+
                 if (clientConfig.hasOwnProperty('billingAgreement')) {
-                    params.paypal_ec_create_ba = clientConfig.billingAgreement;
+                    params['paypal_ec_create_ba'] = clientConfig.billingAgreement;
                 }
+
                 if (!clientConfig.button) {
                     return new paypal.Promise(function (resolve, reject) {
                         clientConfig.additionalAction(clientConfig.messageContainer).done(function () {
-                                paypal.request.post(clientConfig.getTokenUrl, params)
-                                    .then(function (res) {
-                                        if (res.success) {
-
-                                            return resolve(res.token);
-                                        } else {
-                                            messageList.addErrorMessage({
-                                                message: res.error_message
-                                            });
-
-                                            return reject(new Error(res.error_message));
-                                        }
-                                    })
-                            }
-                        ).fail(
-                            function (response) {
-                                var error;
-
-                                try {
-                                    error = JSON.parse(response.responseText);
-                                } catch (exception) {
-                                    error = $t('Something went wrong with your request. Please try again later.');
+                            paypal.request.post(clientConfig.getTokenUrl, params).then(function (res) {
+                                if (res.success) {
+
+                                    return resolve(res.token);
                                 }
+
                                 messageList.addErrorMessage({
-                                    message: error
+                                    message: res['error_message']
                                 });
 
-                                return reject(new Error(error));
-                            }
-                        );
-                    });
-                } else {
-                    return paypal.request.post(clientConfig.getTokenUrl, params)
-                        .then(function (res) {
-                            if (res.success) {
+                                return reject(new Error(res['error_message']));
+                            });
+                        }).fail(function (response) {
+                            var error;
 
-                                return res.token;
-                            } else {
-                                messageList.addErrorMessage({
-                                    message: res.error_message
-                                });
+                            try {
+                                error = JSON.parse(response.responseText);
+                            } catch (exception) {
+                                error = $t('Something went wrong with your request. Please try again later.');
                             }
+                            messageList.addErrorMessage({
+                                message: error
+                            });
+
+                            return reject(new Error(error));
                         });
+                    });
                 }
+
+                return paypal.request.post(clientConfig.getTokenUrl, params).then(function (res) {
+                    if (res.success) {
+                        return res.token;
+                    }
+
+                    messageList.addErrorMessage({
+                        message: res['error_message']
+                    });
+                });
             },
 
             /**
              * Execute the payment
              *
-             * @param data
-             * @param actions
+             * @param {Object} data
+             * @param {Object} actions
              * @return {*}
              */
             onAuthorize: function (data, actions) {
-                var params =
-                    {
-                        paymentToken: data.paymentToken,
-                        payerId: data.payerID,
-                        quoteId: clientConfig.quoteId,
-                        method: clientConfig.payment.method,
-                        customerId: clientConfig.customerId || '',
-                        form_key: clientConfig.formKey
-                    };
-
-                return paypal.request.post(clientConfig.onAuthorizeUrl, params)
-                    .then(function (res) {
-                        if (res.success) {
-
-                            return actions.redirect(window, res.redirectUrl);
-                        } else {
-                            messageList.addErrorMessage({
-                                message: res.error_message
-                            });
-                        }
+                var params = {
+                    paymentToken: data.paymentToken,
+                    payerId: data.payerID,
+                    quoteId: clientConfig.quoteId,
+                    method: clientConfig.payment.method,
+                    customerId: clientConfig.customerId || '',
+                    'form_key': clientConfig.formKey
+                };
+
+                return paypal.request.post(clientConfig.onAuthorizeUrl, params).then(function (res) {
+                    if (res.success) {
+
+                        return actions.redirect(window, res.redirectUrl);
+                    }
+
+                    messageList.addErrorMessage({
+                        message: res['error_message']
                     });
+                });
 
             },
 
             /**
              * Process cancel action
              *
-             * @param data
-             * @param actions
+             * @param {Object} data
+             * @param {Object} actions
              */
             onCancel: function (data, actions) {
                 actions.redirect(window, clientConfig.onCancelUrl);
@@ -164,10 +155,8 @@ define([
 
             /**
              * Process errors
-             *
-             * @param {Object} err
              */
-            onError: function (err) {
+            onError: function () {
                 // Uncaught error isn't displayed in the console
             }
         }, element);
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
index 3315a7c402d65..7fb94a7e2348e 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js
@@ -4,10 +4,9 @@
  */
 define([
     'Magento_Checkout/js/view/payment/default',
-    'ko',
     'Magento_Paypal/js/model/iframe',
     'Magento_Checkout/js/model/full-screen-loader'
-], function (Component, ko, iframe, fullScreenLoader) {
+], function (Component, iframe, fullScreenLoader) {
     'use strict';
 
     return Component.extend({
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index aee3c5ac74c42..00afc65ac0fb3 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -2,127 +2,126 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-define(
-    [
-        'underscore',
-        'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract',
-        'Magento_Paypal/js/action/set-payment-method',
-        'Magento_Checkout/js/model/payment/additional-validators',
-        'Magento_Ui/js/lib/view/utils/dom-observer',
-        'Magento_Customer/js/customer-data',
-        'Magento_Ui/js/model/messageList',
-        'Magento_Paypal/js/in-context/express-checkout-smart-buttons'
-    ],
-    function (
-        _,
-        Component,
-        setPaymentMethodAction,
-        additionalValidators,
-        domObserver,
-        customerData,
-        messageList,
-        checkoutSmartButtons
-    ) {
-        'use strict';
+define([
+    'underscore',
+    'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract',
+    'Magento_Paypal/js/action/set-payment-method',
+    'Magento_Checkout/js/model/payment/additional-validators',
+    'Magento_Ui/js/lib/view/utils/dom-observer',
+    'Magento_Customer/js/customer-data',
+    'Magento_Ui/js/model/messageList',
+    'Magento_Paypal/js/in-context/express-checkout-smart-buttons'
+], function (
+    _,
+    Component,
+    setPaymentMethodAction,
+    additionalValidators,
+    domObserver,
+    customerData,
+    messageList,
+    checkoutSmartButtons
+) {
+    'use strict';
 
-        /**
-         * Handler function
-         * @param {String} id
-         * @param {Function} handler
-         */
-        function onChangeValidateStatus(id, handler) {
-            _.each(jQuery('.payment-group')
-                .find('input'), function (element) {
-                element.addEventListener('change', handler);
-            }, this);
-        }
-
-        return Component.extend({
+    /**
+     * Handler function
+     * @param {String} id
+     * @param {Function} handler
+     */
+    function onChangeValidateStatus(id, handler) {
+        _.each(jQuery('.payment-group').find('input'), function (element) {
+            element.addEventListener('change', handler);
+        }, this);
+    }
 
-            defaults: {
-                template: 'Magento_Paypal/payment/paypal-express-in-context'
-            },
+    return Component.extend({
+        defaults: {
+            template: 'Magento_Paypal/payment/paypal-express-in-context',
+            billingAgreementTemplate: 'Magento_Paypal/payment/express/billing-agreement'
+        },
 
-            /**
-             * Initialize Button Actions
-             * @param {Object} actions
-             * @param {Function} actions.enable() - Enables Smart Buttons
-             * @param {Function} actions.disable() - Disables Smart Buttons
-             */
-            initButtonActions: function (actions) {
-                var renderContext = this;
+        /**
+         * Initialize Button Actions
+         * @param {Object} actions
+         * @param {Function} actions.enable() - Enables Smart Buttons
+         * @param {Function} actions.disable() - Disables Smart Buttons
+         */
+        initButtonActions: function (actions) {
+            var renderContext = this;
 
-                this.clientConfig.buttonActions = actions;
+            this.clientConfig.buttonActions = actions;
+            renderContext.validate();
+            onChangeValidateStatus(this.getAgreementId(), function () {
                 renderContext.validate();
-                onChangeValidateStatus(this.getAgreementId(), function () {
-                    renderContext.validate();
-                });
-            },
+            });
+        },
+
+        /**
+         *  Validates Smart Buttons
+         */
+        validate: function () {
+            additionalValidators.validate() && this.clientConfig.buttonActions ?
+                this.clientConfig.buttonActions.enable() : this.clientConfig.buttonActions.disable();
+        },
 
-            /**
-             *  Validates Smart Buttons
-             */
-            validate: function () {
-                additionalValidators.validate() && this.clientConfig.buttonActions ?
-                    this.clientConfig.buttonActions.enable() : this.clientConfig.buttonActions.disable();
-            },
+        /**
+         * Render PayPal buttons using checkout.js
+         */
+        renderPayPalButtons: function () {
+            checkoutSmartButtons(this.prepareClientConfig(), '#' + this.getButtonId());
+        },
 
-            /**
-             * Render PayPal buttons using checkout.js
-             */
-            renderPayPalButtons: function () {
-                checkoutSmartButtons(this.prepareClientConfig(), '#' + this.getButtonId());
-            },
+        /**
+         * @returns {String}
+         */
+        getButtonId: function () {
+            return this.inContextId;
+        },
 
-            /**
-             * @returns {String}
-             */
-            getButtonId: function () {
-                return this.inContextId;
-            },
+        /**
+         * @returns {String}
+         */
+        getAgreementId: function () {
+            return this.inContextId + '-agreement';
+        },
 
-            /**
-             * @returns {String}
-             */
-            getAgreementId: function () {
-                return this.inContextId + '-agreement';
-            },
+        /**
+         * Populate client config with all required data
+         *
+         * @return {Object}
+         */
+        prepareClientConfig: function () {
+            this.clientConfig.payment = {
+                method: this.item.method
+            };
+            this.clientConfig.quoteId = window.checkoutConfig.quoteData['entity_id'];
+            this.clientConfig.formKey = window.checkoutConfig.formKey;
+            this.clientConfig.customerId = window.customerData.id;
+            this.clientConfig.button = 0;
+            this.clientConfig.merchantId = this.merchantId;
+            this.clientConfig.validator = additionalValidators;
+            this.clientConfig.client = {};
+            this.clientConfig.client[this.clientConfig.environment] = this.merchantId;
 
-            /**
-             * Populate client config with all required data
-             *
-             * @return {Object}
-             */
-            prepareClientConfig: function () {
-                this.clientConfig.payment = {
-                    'method': this.item.method
-                };
-                this.clientConfig.quoteId = window.checkoutConfig.quoteData['entity_id'];
-                this.clientConfig.formKey = window.checkoutConfig.formKey;
-                this.clientConfig.customerId = window.customerData.id;
-                this.clientConfig.button = 0;
-                this.clientConfig.merchantId = this.merchantId;
-                this.clientConfig.validator = additionalValidators;
+            /** Add logic to be triggered onClick action for smart buttons component*/
+            this.clientConfig.onClick = function () {
+                additionalValidators.validate();
 
-                /** Add logic to be triggered onClick action for smart buttons component*/
-                this.clientConfig.onClick = function () {
-                    additionalValidators.validate();
-                    if (this.getBillingAgreementCode()) {
-                        this.clientConfig.billingAgreement = this.billingAgreement()
-                    }
-                    this.selectPaymentMethod();
-                };
-                this.clientConfig.additionalAction = setPaymentMethodAction;
-                this.clientConfig.rendererComponent = this;
-                this.clientConfig.messageContainer = this.messageContainer;
-                _.each(this.clientConfig, function (fn, name) {
-                    if (typeof fn === 'function') {
-                        this.clientConfig[name] = fn.bind(this);
-                    }
-                }, this);
+                if (this.getBillingAgreementCode()) {
+                    this.clientConfig.billingAgreement = this.billingAgreement();
+                }
+                this.selectPaymentMethod();
+            };
+            this.clientConfig.additionalAction = setPaymentMethodAction;
+            this.clientConfig.rendererComponent = this;
+            this.clientConfig.messageContainer = this.messageContainer;
+            _.each(this.clientConfig, function (fn, name) {
+                if (typeof fn === 'function') {
+                    this.clientConfig[name] = fn.bind(this);
+                }
+            }, this);
 
-                return this.clientConfig;
-            }
-        });
-    }
-);
+            return this.clientConfig;
+        }
+    });
+});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js
index d0d72bf7dcdf3..a0f3d3867fe78 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/payflowpro/vault.js
@@ -2,12 +2,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/*browser:true*/
-/*global define*/
+
 define([
-    'jquery',
     'Magento_Vault/js/view/payment/method-renderer/vault'
-], function ($, VaultComponent) {
+], function (VaultComponent) {
     'use strict';
 
     return VaultComponent.extend({
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js b/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js
index e181faf56e365..09dffc73baadf 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/review/actions/iframe.js
@@ -8,9 +8,8 @@
  */
 define([
     'uiComponent',
-    'ko',
     'Magento_Paypal/js/model/iframe'
-], function (Component, ko, iframe) {
+], function (Component, iframe) {
     'use strict';
 
     return Component.extend({
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index 7fa1baa329585..b3643c6bdd527 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -4,33 +4,33 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="payment-method" data-bind="css: {'_active': (getCode() == isChecked())}">
+<div class="payment-method" css="_active: getCode() == isChecked()">
     <div class="payment-method-title field choice">
         <input type="radio"
                name="payment[method]"
                class="radio"
-               data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
-        <label data-bind="attr: {'for': getCode()}" class="label">
+               attr="id: getCode()"
+               ko-value="getCode()"
+               ko-checked="isChecked"
+               click="selectPaymentMethod"
+               visible="isRadioButtonVisible()"/>
+        <label attr="for: getCode()" class="label">
             <!-- PayPal Logo -->
-            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}" class="payment-icon"/>
+            <img attr="src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')" class="payment-icon"/>
             <!-- PayPal Logo -->
-            <span data-bind="text: getTitle()"></span>
-            <a data-bind="attr: {href: getPaymentAcceptanceMarkHref()}, click: showAcceptanceWindow"
-               class="action action-help">
-                <!-- ko i18n: 'What is PayPal?' --><!-- /ko -->
-            </a>
+            <span text="getTitle()"/>
+            <a class="action action-help"
+               attr="href: getPaymentAcceptanceMarkHref()"
+               click="showAcceptanceWindow"
+               translate="'What is PayPal?'"/>
         </label>
     </div>
     <div class="payment-method-content">
-        <!-- ko foreach: getRegion('messages') -->
-        <!-- ko template: getTemplate() --><!-- /ko -->
-        <!--/ko-->
-        <!-- ko template: 'Magento_Paypal/payment/express/billing-agreement' --><!-- /ko -->
-        <div class="checkout-agreements-block" data-bind="attr: {id: getAgreementId()}">
-            <!-- ko foreach: $parent.getRegion('before-place-order') -->
-                <!-- ko template: getTemplate() --><!-- /ko -->
-            <!--/ko-->
+        <each args="getRegion('messages')" render=""/>
+        <render args="billingAgreementTemplate"/>
+        <div class="checkout-agreements-block" attr="id: getAgreementId()">
+            <each args="$parent.getRegion('before-place-order')" render=""/>
         </div>
-        <div class="actions-toolbar" data-bind="attr: {id: getButtonId()}" afterRender="renderPayPalButtons"></div>
+        <div class="actions-toolbar" attr="id: getButtonId()" afterRender="renderPayPalButtons"/>
     </div>
 </div>

From 498ba5379a491961ce0e27b392b773211ea5d2a0 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 18 Jan 2019 13:14:16 -0600
Subject: [PATCH 728/932] MQE-1408: Deliver weekly MTF to MFTF conversion PR

- Remove '2' from AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest assertion
---
 .../AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
index 047824b71ce64..dfdc4ed5f9f62 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
@@ -59,7 +59,7 @@
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
-        <seeInField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="seeCategoryUrlKey" userInput="2{{SimpleRootSubCategory.name_lwr}}" />
+        <seeInField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="seeCategoryUrlKey" userInput="{{SimpleRootSubCategory.name_lwr}}" />
         <!--Open Category in Store Front  Page-->
         <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>

From 84036d5e1738d15f436818e23119057c862abcee Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Fri, 18 Jan 2019 13:39:14 -0600
Subject: [PATCH 729/932] MC-6297: Update KnownTrackingRequest

- address review comments
---
 .../integration/testsuite/Magento/Dhl/Model/CarrierTest.php     | 2 +-
 .../Dhl/_files/SingleknownTrackResponse-no-data-found.xml       | 2 +-
 .../Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml          | 2 +-
 .../testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml  | 2 +-
 .../Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml         | 2 +-
 .../testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
index d5f3c30c17397..8874d880a4dd1 100644
--- a/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
+++ b/dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php
@@ -216,7 +216,7 @@ private function assertRequest(string $expectedRequestXml, string $requestXml):
         $this->assertStringStartsWith('MAGE_TRCK_', $messageReference);
         $this->assertGreaterThanOrEqual(28, strlen($messageReference));
         $this->assertLessThanOrEqual(32, strlen($messageReference));
-        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_TRCK_CHECKED';
+        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_TRCK_28TO32_Char_CHECKED';
         $this->assertXmlStringEqualsXmlString($expectedRequestElement->asXML(), $requestElement->asXML());
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
index e3e7b93fc652b..9887cecbd2d4e 100755
--- a/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/SingleknownTrackResponse-no-data-found.xml
@@ -9,7 +9,7 @@
     <Response>
         <ServiceHeader>
             <MessageTime>2018-02-27T12:59:34+01:00</MessageTime>
-            <MessageReference>tracking_4781585060</MessageReference>
+            <MessageReference>1234567890123456789012345678</MessageReference>
             <SiteID>CustomerSiteID</SiteID>
         </ServiceHeader>
     </Response>
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
index f3aa662cd68fd..c0a18fcc4e2f6 100755
--- a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_MultipleAWB.xml
@@ -9,7 +9,7 @@
 	<Request>
 		<ServiceHeader>
 			<MessageTime>2002-06-25T11:28:56-08:00</MessageTime>
-			<MessageReference>MAGE_TRCK_CHECKED</MessageReference>
+			<MessageReference>MAGE_TRCK_28TO32_Char_CHECKED</MessageReference>
 			<SiteID>CustomerSiteID</SiteID>
 			<Password>CustomerPassword</Password>
 		</ServiceHeader>
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
index b45988249f665..dac69a0d68c57 100755
--- a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingRequest_SingleAWB.xml
@@ -9,7 +9,7 @@
 	<Request>
 		<ServiceHeader>
 			<MessageTime>2002-06-25T11:28:56-08:00</MessageTime>
-			<MessageReference>MAGE_TRCK_CHECKED</MessageReference>
+			<MessageReference>MAGE_TRCK_28TO32_Char_CHECKED</MessageReference>
 			<SiteID>CustomerSiteID</SiteID>
 			<Password>CustomerPassword</Password>
 		</ServiceHeader>
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
index 8375eaea1770d..369236d80c614 100755
--- a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_MultipleAWB.xml
@@ -9,7 +9,7 @@
     <Response>
         <ServiceHeader>
             <MessageTime>2018-02-27T12:43:44+01:00</MessageTime>
-            <MessageReference>TrackingRequest_Multiple_AWB</MessageReference>
+            <MessageReference>1234567890123456789012345678</MessageReference>
             <SiteID>CustomerSiteID</SiteID>
         </ServiceHeader>
     </Response>
diff --git a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml
index ffa4982183851..ef303eaab64f7 100755
--- a/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml
+++ b/dev/tests/integration/testsuite/Magento/Dhl/_files/TrackingResponse_SingleAWB.xml
@@ -9,7 +9,7 @@
     <Response>
         <ServiceHeader>
             <MessageTime>2018-02-27T12:27:42+01:00</MessageTime>
-            <MessageReference>tracking_4781585060</MessageReference>
+            <MessageReference>1234567890123456789012345678</MessageReference>
             <SiteID>CustomerSiteID</SiteID>
         </ServiceHeader>
     </Response>

From 359d82ffdf2486d375e0082b993ad5d22844515c Mon Sep 17 00:00:00 2001
From: Brendan Falkowski <brendan@gravitydept.com>
Date: Fri, 18 Jan 2019 11:49:18 -0800
Subject: [PATCH 730/932] Fixing indentation in auth.json.sample (use 4 spaces
 not 3)

---
 auth.json.sample | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/auth.json.sample b/auth.json.sample
index 81c8fd220eae2..be1c70cfe1e18 100644
--- a/auth.json.sample
+++ b/auth.json.sample
@@ -1,8 +1,8 @@
 {
-   "http-basic": {
-      "repo.magento.com": {
-         "username": "<public-key>",
-         "password": "<private-key>"
-      }
-   }
+    "http-basic": {
+        "repo.magento.com": {
+            "username": "<public-key>",
+            "password": "<private-key>"
+        }
+    }
 }

From 4d56b687521e51bc36c166557b85c7ce4b2e711e Mon Sep 17 00:00:00 2001
From: Brendan Falkowski <brendan@gravitydept.com>
Date: Fri, 18 Jan 2019 11:49:45 -0800
Subject: [PATCH 731/932] Add placeholder for GitHub auth in auth.json.sample

---
 auth.json.sample | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/auth.json.sample b/auth.json.sample
index be1c70cfe1e18..48b13ee8b69da 100644
--- a/auth.json.sample
+++ b/auth.json.sample
@@ -1,4 +1,7 @@
 {
+    "github-oauth": {
+        "github.com": "<github-personal-access-token>"
+    },
     "http-basic": {
         "repo.magento.com": {
             "username": "<public-key>",

From 5a63e6f2049d9056d89173cb2d457095f78c67f5 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Fri, 18 Jan 2019 13:57:33 -0600
Subject: [PATCH 732/932] MC-6295: Update ShipmentValidationRequest

- address review comments
---
 app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php            | 2 +-
 .../Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 82eb379d75be0..835ef4bf1fe28 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -434,7 +434,7 @@ public function testRequestToShipment(string $origCountryId, string $expectedReg
         $this->assertStringStartsWith('MAGE_SHIP_', $messageReference);
         $this->assertGreaterThanOrEqual(28, strlen($messageReference));
         $this->assertLessThanOrEqual(32, strlen($messageReference));
-        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_CHECKED';
+        $requestElement->Request->ServiceHeader->MessageReference = 'MAGE_SHIP_28TO32_Char_CHECKED';
         $expectedRequestElement = new Element($expectedRequestXml);
         $this->assertXmlStringEqualsXmlString($expectedRequestElement->asXML(), $requestElement->asXML());
     }
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
index 7a87046b87b76..896d631f01d50 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
@@ -4,7 +4,7 @@
     <Request xmlns="">
         <ServiceHeader>
             <MessageTime>currentTime</MessageTime>
-            <MessageReference>MAGE_SHIP_CHECKED</MessageReference>
+            <MessageReference>MAGE_SHIP_28TO32_Char_CHECKED</MessageReference>
             <SiteID>some ID</SiteID>
             <Password>some password</Password>
         </ServiceHeader>

From 1b1db3367c73d7b145e3fb0dd3426254fe7c3488 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Fri, 18 Jan 2019 14:11:57 -0600
Subject: [PATCH 733/932] MC-6289: Support Billing Agreements for Smart buttons
 on checkout flow

- remove ba support for PayPal in context
---
 app/code/Magento/Paypal/Controller/Express/GetTokenData.php  | 5 -----
 .../web/js/in-context/express-checkout-smart-buttons.js      | 4 ----
 .../payment/method-renderer/in-context/checkout-express.js   | 5 -----
 .../web/template/payment/paypal-express-in-context.html      | 1 -
 4 files changed, 15 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
index 716eab8d7c2ad..2f8b5011d356c 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -170,11 +170,6 @@ private function getToken(): ?string
                 $quote->getBillingAddress(),
                 $quote->getShippingAddress()
             );
-
-            // billing agreement
-            $isBaRequested = (bool)$this->getRequest()
-                ->getParam(Checkout::PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT);
-            $this->_checkout->setIsBillingAgreementRequested($isBaRequested);
         }
 
         // giropay urls
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index e5497b59b58f2..0b2bdb90f915d 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -66,10 +66,6 @@ define([
                     button: clientConfig.button
                 };
 
-                if (clientConfig.hasOwnProperty('billingAgreement')) {
-                    params['paypal_ec_create_ba'] = clientConfig.billingAgreement;
-                }
-
                 if (!clientConfig.button) {
                     return new paypal.Promise(function (resolve, reject) {
                         clientConfig.additionalAction(clientConfig.messageContainer).done(function () {
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index 00afc65ac0fb3..d63cd9d7fc9a9 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -37,7 +37,6 @@ define([
     return Component.extend({
         defaults: {
             template: 'Magento_Paypal/payment/paypal-express-in-context',
-            billingAgreementTemplate: 'Magento_Paypal/payment/express/billing-agreement'
         },
 
         /**
@@ -106,10 +105,6 @@ define([
             /** Add logic to be triggered onClick action for smart buttons component*/
             this.clientConfig.onClick = function () {
                 additionalValidators.validate();
-
-                if (this.getBillingAgreementCode()) {
-                    this.clientConfig.billingAgreement = this.billingAgreement();
-                }
                 this.selectPaymentMethod();
             };
             this.clientConfig.additionalAction = setPaymentMethodAction;
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index b3643c6bdd527..dcfdacf37998a 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -27,7 +27,6 @@
     </div>
     <div class="payment-method-content">
         <each args="getRegion('messages')" render=""/>
-        <render args="billingAgreementTemplate"/>
         <div class="checkout-agreements-block" attr="id: getAgreementId()">
             <each args="$parent.getRegion('before-place-order')" render=""/>
         </div>

From 9c95cf4eb901d88742e56d11cf8c78e22b864256 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 18 Jan 2019 14:17:28 -0600
Subject: [PATCH 734/932] MQE-1408: Deliver weekly MTF to MFTF conversion PR

- Add a 2 to the end of an assertion in AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest
---
 .../AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
index dfdc4ed5f9f62..8dcaa46bf0574 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
@@ -59,7 +59,7 @@
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
-        <seeInField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="seeCategoryUrlKey" userInput="{{SimpleRootSubCategory.name_lwr}}" />
+        <seeInField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="seeCategoryUrlKey" userInput="{{SimpleRootSubCategory.name_lwr}}2" />
         <!--Open Category in Store Front  Page-->
         <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>

From 098524486aaad76c9af25cff83afd6134d4780e3 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 18 Jan 2019 14:46:28 -0600
Subject: [PATCH 735/932] GraphQl-93: Implement support for variables in query

-- Fixes after CR
---
 lib/internal/Magento/Framework/GraphQl/Config.php           | 6 +++---
 .../Framework/GraphQl/Config/Element/InputFactory.php       | 2 +-
 lib/internal/Magento/Framework/GraphQl/Query/Fields.php     | 6 +++---
 .../Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php  | 5 ++++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Config.php b/lib/internal/Magento/Framework/GraphQl/Config.php
index b7f198656d81d..3873044007b4e 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config.php
@@ -83,11 +83,11 @@ public function getConfigElement(string $configElementName) : ConfigElementInter
     /**
      * Return all type names declared in a GraphQL schema's configuration and their type.
      *
+     * Format is ['name' => 'example value', 'type' = 'example value']
+     *
      * @return array $types
-     *  name string
-     *  type string
      */
-    public function getDeclaredTypeNames() : array
+    public function getDeclaredTypes() : array
     {
         $types = [];
         foreach ($this->configData->get(null) as $item) {
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
index 677354f67e230..3d6e6a56781e0 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
@@ -73,7 +73,7 @@ public function createFromConfigData(array $data): ConfigElementInterface
     }
 
     /**
-     * Create type object based off array of configured GraphQL InputType data.
+     * Create input type object based off array of configured GraphQL InputType data.
      *
      * Type data must contain name and the type's fields. Optional data includes description.
      *
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
index d0c88cb0f898e..32f4e264f5eda 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
@@ -44,7 +44,7 @@ public function setQuery($query, array $variables = null)
                 ]
             );
             if (isset($variables)) {
-                $queryFields = array_merge($queryFields, $this->getVariables($variables));
+                $queryFields = array_merge($queryFields, $this->extracttVariables($variables));
             }
         } catch (\Exception $e) {
             // If a syntax error is encountered do not collect fields
@@ -75,12 +75,12 @@ public function getFieldsUsedInQuery()
      *
      * @return string[]
      */
-    private function getVariables(array $variables): array
+    private function extracttVariables(array $variables): array
     {
         $fields = [];
         foreach ($variables as $key => $value){
             if (is_array($value)){
-                $fields = array_merge($fields, $this->getVariables($value));
+                $fields = array_merge($fields, $this->extracttVariables($value));
             }
             $fields[$key] = $key;
         }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
index 6b1e20f996def..634975426cf80 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
@@ -71,7 +71,10 @@ public function get(string $typeName): TypeInterface
             $configElementClass = get_class($configElement);
             if (!isset($this->configToTypeMap[$configElementClass])) {
                 throw new GraphQlInputException(
-                    new Phrase("Type for '{$configElementClass}' has not declared.")
+                    new Phrase(
+                        "No mapping to Webonyx type is declared for '%1' config element type.",
+                        [$configElementClass]
+                    )
                 );
             }
 

From 4a535e92afd3b430e8e6f810103b27ba20ce66ea Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 18 Jan 2019 15:48:45 -0600
Subject: [PATCH 736/932] MC-6287: Button customization

- add cart and mini cart to configuration
---
 app/code/Magento/Paypal/Model/Config.php      |  48 +++++---
 .../etc/adminhtml/system/express_checkout.xml | 108 +++++++++++++++++-
 app/code/Magento/Paypal/i18n/en_US.csv        |   2 +
 3 files changed, 140 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 61bab11868c8f..6ab896be98ad5 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1645,26 +1645,10 @@ protected function _mapGenericStyleFieldset($fieldName)
             case 'paypal_hdrbackcolor':
             case 'paypal_hdrbordercolor':
             case 'paypal_payflowcolor':
-            case 'checkout_page_button_customize':
-            case 'checkout_page_button_layout':
-            case 'checkout_page_button_size':
-            case 'checkout_page_button_color':
-            case 'checkout_page_button_shape':
-            case 'checkout_page_button_label':
-            case 'checkout_page_button_mx_installment_period':
-            case 'checkout_page_button_br_installment_period':
-            case 'product_page_button_customize':
-            case 'product_page_button_layout':
-            case 'product_page_button_size':
-            case 'product_page_button_color':
-            case 'product_page_button_shape':
-            case 'product_page_button_label':
-            case 'product_page_button_mx_installment_period':
-            case 'product_page_button_br_installment_period':
             case 'disable_funding_options':
                 return "paypal/style/{$fieldName}";
             default:
-                return null;
+                return $this->_mapButtonStyles($fieldName);
         }
     }
 
@@ -1714,6 +1698,36 @@ protected function _mapMethodFieldset($fieldName)
         }
     }
 
+    /**
+     * Map PayPal button style config fields
+     *
+     * @param $fieldName
+     * @return null|string
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    private function _mapButtonStyles($fieldName)
+    {
+        $page = substr($fieldName, 0, (int)strpos($fieldName, '_page_button_'));
+
+        if (!$page) {
+            return null;
+        }
+
+        switch ($fieldName) {
+            case "{$page}_page_button_customize":
+            case "{$page}_page_button_layout":
+            case "{$page}_page_button_size":
+            case "{$page}_page_button_color":
+            case "{$page}_page_button_shape":
+            case "{$page}_page_button_label":
+            case "{$page}_page_button_mx_installment_period":
+            case "{$page}_page_button_br_installment_period":
+                return "paypal/style/{$fieldName}";
+            default:
+                return null;
+        }
+    }
+
     /**
      * Payment API authentication methods source getter
      *
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index a94370b02f0c6..fc5c7f4e931b5 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -781,7 +781,113 @@
                             </depends>
                         </field>
                     </group>
-                    <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                    <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
+                        <label>PayPal Button - Cart Page</label>
+                        <field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                            <comment/>
+                            <config_path>paypal/style/cart_page_button_customize</config_path>
+                        </field>
+                        <field id="cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                            <config_path>paypal/style/cart_page_button_label</config_path>
+                            <depends>
+                                <field id="cart_page_button_customize">1</field>
+                            </depends>
+                        </field>
+                        <field id="cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                            <config_path>paypal/style/cart_page_button_mx_installment_period</config_path>
+                            <depends>
+                                <field id="cart_page_button_customize">1</field>
+                                <field id="cart_page_button_label">installment</field>
+                            </depends>
+                        </field>
+                        <field id="cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                            <config_path>paypal/style/cart_page_button_br_installment_period</config_path>
+                            <depends>
+                                <field id="cart_page_button_customize">1</field>
+                                <field id="cart_page_button_label">installment</field>
+                            </depends>
+                        </field>
+                        <field id="cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                            <config_path>paypal/style/cart_page_button_layout</config_path>
+                            <depends>
+                                <field id="cart_page_button_customize">1</field>
+                                <field id="cart_page_button_label" negative="1">credit</field>
+                            </depends>
+                        </field>
+                        <field id="cart_page_button_size"  extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_size">
+                            <config_path>paypal/style/cart_page_button_size</config_path>
+                            <depends>
+                                <field id="cart_page_button_customize">1</field>
+                            </depends>
+                        </field>
+                        <field id="cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                            <config_path>paypal/style/cart_page_button_shape</config_path>
+                            <depends>
+                                <field id="cart_page_button_customize">1</field>
+                            </depends>
+                        </field>
+                        <field id="cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                            <config_path>paypal/style/cart_page_button_color</config_path>
+                            <depends>
+                                <field id="cart_page_button_customize">1</field>
+                                <field id="cart_page_button_label" negative="1">credit</field>
+                            </depends>
+                        </field>
+                    </group>
+                    <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
+                        <label>PayPal Button - Mini Cart</label>
+                        <field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                            <comment/>
+                            <config_path>paypal/style/mini_cart_page_button_customize</config_path>
+                        </field>
+                        <field id="mini_cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                            <config_path>paypal/style/mini_cart_page_button_label</config_path>
+                            <depends>
+                                <field id="mini_cart_page_button_customize">1</field>
+                            </depends>
+                        </field>
+                        <field id="mini_cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                            <config_path>paypal/style/mini_cart_page_button_mx_installment_period</config_path>
+                            <depends>
+                                <field id="mini_cart_page_button_customize">1</field>
+                                <field id="mini_cart_page_button_label">installment</field>
+                            </depends>
+                        </field>
+                        <field id="mini_cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                            <config_path>paypal/style/mini_cart_page_button_br_installment_period</config_path>
+                            <depends>
+                                <field id="mini_cart_page_button_customize">1</field>
+                                <field id="mini_cart_page_button_label">installment</field>
+                            </depends>
+                        </field>
+                        <field id="mini_cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                            <config_path>paypal/style/mini_cart_page_button_layout</config_path>
+                            <depends>
+                                <field id="mini_cart_page_button_customize">1</field>
+                                <field id="mini_cart_page_button_label" negative="1">credit</field>
+                            </depends>
+                        </field>
+                        <field id="mini_cart_page_button_size"  extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_size">
+                            <config_path>paypal/style/mini_cart_page_button_size</config_path>
+                            <depends>
+                                <field id="mini_cart_page_button_customize">1</field>
+                            </depends>
+                        </field>
+                        <field id="mini_cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                            <config_path>paypal/style/mini_cart_page_button_shape</config_path>
+                            <depends>
+                                <field id="mini_cart_page_button_customize">1</field>
+                            </depends>
+                        </field>
+                        <field id="mini_cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                            <config_path>paypal/style/mini_cart_page_button_color</config_path>
+                            <depends>
+                                <field id="mini_cart_page_button_customize">1</field>
+                                <field id="mini_cart_page_button_label" negative="1">credit</field>
+                            </depends>
+                        </field>
+                    </group>
+                    <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="130">
                         <label>Features</label>
                         <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Disable Funding Options</label>
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index 2e9d4eed8de62..de6cce79052a8 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -726,6 +726,8 @@ User,User
 "Silver","Silver"
 "Black","Black"
 "PayPal Button - Product Page","PayPal Button - Product Page"
+"PayPal Button - Cart Page","PayPal Button - Cart Page"
+"PayPal Button - Mini Cart","PayPal Button - Mini Cart"
 "Features","Features"
 "PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
 "PayPal Credit","PayPal Credit"

From a0ad012e145876395a3277dde9702d247e070078 Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Fri, 18 Jan 2019 15:56:01 -0600
Subject: [PATCH 737/932] MC-6296: Update DCTRequest

Updated unit tests to use data providers
---
 .../Dhl/Test/Unit/Model/CarrierTest.php       | 132 +++++++++---------
 1 file changed, 69 insertions(+), 63 deletions(-)

diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index d9eb6e04bb4da..bb402d3ebbc84 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -283,6 +283,11 @@ public function testCollectRates()
         $this->httpResponse->method('getBody')
             ->willReturn($responseXml);
 
+        $this->coreDateMock->method('date')
+           ->willReturnCallback(function () {
+               return date(\DATE_RFC3339);
+           });
+
         $request = $this->objectManager->getObject(RateRequest::class, $requestData);
 
         $reflectionClass = new \ReflectionObject($this->httpClient);
@@ -516,68 +521,104 @@ public function dhlProductsDataProvider() : array
     }
 
     /**
-     * Tests that the built message reference string is of the appropriate format.
+     * Tests that the built MessageReference string is of the appropriate format.
      *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Invalid service prefix
+     * @dataProvider buildMessageReferenceDataProvider
+     * @param $servicePrefix
      * @throws \ReflectionException
      */
-    public function testBuildMessageReference()
+    public function testBuildMessageReference($servicePrefix)
     {
         $method = new \ReflectionMethod($this->model, 'buildMessageReference');
         $method->setAccessible(true);
 
-        $constPrefixQuote = new \ReflectionClassConstant($this->model, 'SERVICE_PREFIX_QUOTE');
-        $constPrefixShipval = new \ReflectionClassConstant($this->model, 'SERVICE_PREFIX_SHIPVAL');
-        $constPrefixTracking = new \ReflectionClassConstant($this->model, 'SERVICE_PREFIX_TRACKING');
-
-        $msgRefQuote = $method->invoke($this->model, $constPrefixQuote->getValue());
-        self::assertGreaterThanOrEqual(28, strlen($msgRefQuote));
-        self::assertLessThanOrEqual(32, strlen($msgRefQuote));
+        $messageReference = $method->invoke($this->model, $servicePrefix);
+        $this->assertGreaterThanOrEqual(28, strlen($messageReference));
+        $this->assertLessThanOrEqual(32, strlen($messageReference));
+    }
 
-        $msgRefShip = $method->invoke($this->model, $constPrefixShipval->getValue());
-        self::assertGreaterThanOrEqual(28, strlen($msgRefShip));
-        self::assertLessThanOrEqual(32, strlen($msgRefShip));
+    /**
+     * @return array
+     */
+    public function buildMessageReferenceDataProvider()
+    {
+        return [
+            'quote_prefix' => ['QUOT'],
+            'shipval_prefix' => ['SHIP'],
+            'tracking_prefix' => ['TRCK']
+        ];
+    }
 
-        $msgRefTrack = $method->invoke($this->model, $constPrefixTracking->getValue());
-        self::assertGreaterThanOrEqual(28, strlen($msgRefTrack));
-        self::assertLessThanOrEqual(32, strlen($msgRefTrack));
+    /**
+     * Tests that an exception is thrown when an invalid service prefix is provided.
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Invalid service prefix
+     */
+    public function testBuildMessageReferenceInvalidPrefix()
+    {
+        $method = new \ReflectionMethod($this->model, 'buildMessageReference');
+        $method->setAccessible(true);
 
-        $method->invoke($this->model, 'TEST');
+        $method->invoke($this->model, 'INVALID');
     }
 
     /**
      * Tests that the built software name string is of the appropriate format.
      *
+     * @dataProvider buildSoftwareNameDataProvider
+     * @param $productName
      * @throws \ReflectionException
      */
-    public function testBuildSoftwareName()
+    public function testBuildSoftwareName($productName)
     {
         $method = new \ReflectionMethod($this->model, 'buildSoftwareName');
         $method->setAccessible(true);
 
-        $name = $method->invoke($this->model);
-        self::assertLessThanOrEqual(30, $name);
+        $this->productMetadataMock->method('getName')->willReturn($productName);
 
-        $nameExceedsLength = $method->invoke($this->model);
-        self::assertLessThanOrEqual(30, $nameExceedsLength);
+        $softwareName = $method->invoke($this->model);
+        $this->assertLessThanOrEqual(30, strlen($softwareName));
+    }
+
+    /**
+     * @return array
+     */
+    public function buildSoftwareNameDataProvider()
+    {
+        return [
+            'valid_length' => ['Magento'],
+            'exceeds_length' => ['Product_Name_Longer_Than_30_Char']
+        ];
     }
 
     /**
      * Tests that the built software version string is of the appropriate format.
      *
+     * @dataProvider buildSoftwareVersionProvider
+     * @param $productVersion
      * @throws \ReflectionException
      */
-    public function testBuildSoftwareVersion()
+    public function testBuildSoftwareVersion($productVersion)
     {
         $method = new \ReflectionMethod($this->model, 'buildSoftwareVersion');
         $method->setAccessible(true);
 
-        $version = $method->invoke($this->model);
-        self::assertLessThanOrEqual(10, strlen($version));
+        $this->productMetadataMock->method('getVersion')->willReturn($productVersion);
 
-        $versionExceedsLength = $method->invoke($this->model);
-        self::assertLessThanOrEqual(10, strlen($versionExceedsLength));
+        $softwareVersion = $method->invoke($this->model);
+        $this->assertLessThanOrEqual(10, strlen($softwareVersion));
+    }
+
+    /**
+     * @return array
+     */
+    public function buildSoftwareVersionProvider()
+    {
+        return [
+            'valid_length' => ['2.3.1'],
+            'exceeds_length' => ['dev-MC-1000']
+        ];
     }
 
     /**
@@ -725,21 +766,6 @@ private function getCarrierHelper(): CarrierHelper
         return $carrierHelper;
     }
 
-    /**
-     * @return MockObject
-     */
-    private function getCoreDate(): MockObject
-    {
-        $coreDate = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTime::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $coreDate->method('date')->willReturnCallback(function () {
-            return date(\DATE_RFC3339);
-        });
-
-        return $coreDate;
-    }
-
     /**
      * @return MockObject
      */
@@ -762,24 +788,4 @@ private function getHttpClientFactory(): MockObject
 
         return $httpClientFactory;
     }
-
-    /**
-     * @return MockObject
-     */
-    private function getProductMetadata(): MockObject
-    {
-        $productMetadata = $this->createMock(\Magento\Framework\App\ProductMetadata::class);
-
-        $productMetadata->method('getName')->willReturnOnConsecutiveCalls(
-            'Magento',
-            str_pad('Magento', 24, '_')
-        );
-
-        $productMetadata->method('getVersion')->willReturnOnConsecutiveCalls(
-            '2.3.1',
-            'dev-MC-1000'
-        );
-
-        return $productMetadata;
-    }
 }

From a0812b78949ef663786fdfd89f5e21aae819a6d8 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 18 Jan 2019 15:56:24 -0600
Subject: [PATCH 738/932] MC-6280: [Frontend part] Implement Smart button
 component - replace listener - fix error message issue

---
 .../js/model/payment/additional-validators.js |  6 +-
 .../web/js/model/agreement-validator.js       |  5 +-
 .../express-checkout-smart-buttons.js         |  2 +-
 .../in-context/checkout-express.js            | 57 +++++++++----------
 .../payment/paypal-express-in-context.html    |  2 +-
 lib/web/mage/validation.js                    |  7 ++-
 6 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/payment/additional-validators.js b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/additional-validators.js
index 1cb35a4cee2db..1337e1affd3d3 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/payment/additional-validators.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/additional-validators.js
@@ -35,15 +35,17 @@ define([], function () {
          *
          * @returns {Boolean}
          */
-        validate: function () {
+        validate: function (hideError) {
             var validationResult = true;
 
+            hideError = hideError || false;
+
             if (validators.length <= 0) {
                 return validationResult;
             }
 
             validators.forEach(function (item) {
-                if (item.validate() == false) { //eslint-disable-line eqeqeq
+                if (item.validate(hideError) == false) { //eslint-disable-line eqeqeq
                     validationResult = false;
 
                     return false;
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js
index 157923323fd0e..cbd06b51fe1b5 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js
@@ -19,7 +19,7 @@ define([
          *
          * @returns {Boolean}
          */
-        validate: function () {
+        validate: function (hideError) {
             var isValid = true;
 
             if (!agreementsConfig.isEnabled || $(agreementsInputPath).length === 0) {
@@ -28,7 +28,8 @@ define([
 
             $(agreementsInputPath).each(function (index, element) {
                 if (!$.validator.validateSingleElement(element, {
-                    errorElement: 'div'
+                    errorElement: 'div',
+                    hideError: hideError || false
                 })) {
                     isValid = false;
                 }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 0b2bdb90f915d..72441139c4a48 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -41,7 +41,7 @@ define([
              * @param {Object} actions
              */
             validate: function (actions) {
-                clientConfig.rendererComponent.initButtonActions(actions);
+                clientConfig.rendererComponent.validate(actions);
             },
 
             /**
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index d63cd9d7fc9a9..52f3e8e3f5819 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 define([
+    'jquery',
     'underscore',
     'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract',
     'Magento_Paypal/js/action/set-payment-method',
@@ -10,8 +11,10 @@ define([
     'Magento_Ui/js/lib/view/utils/dom-observer',
     'Magento_Customer/js/customer-data',
     'Magento_Ui/js/model/messageList',
-    'Magento_Paypal/js/in-context/express-checkout-smart-buttons'
+    'Magento_Paypal/js/in-context/express-checkout-smart-buttons',
+    'Magento_Ui/js/lib/view/utils/async'
 ], function (
+    $,
     _,
     Component,
     setPaymentMethodAction,
@@ -23,44 +26,36 @@ define([
 ) {
     'use strict';
 
-    /**
-     * Handler function
-     * @param {String} id
-     * @param {Function} handler
-     */
-    function onChangeValidateStatus(id, handler) {
-        _.each(jQuery('.payment-group').find('input'), function (element) {
-            element.addEventListener('change', handler);
-        }, this);
-    }
-
     return Component.extend({
         defaults: {
             template: 'Magento_Paypal/payment/paypal-express-in-context',
+            validationElements: 'input'
         },
 
         /**
-         * Initialize Button Actions
-         * @param {Object} actions
-         * @param {Function} actions.enable() - Enables Smart Buttons
-         * @param {Function} actions.disable() - Disables Smart Buttons
+         * Listens element on change and validate it.
+         *
+         * @param {HTMLElement} context
          */
-        initButtonActions: function (actions) {
-            var renderContext = this;
-
-            this.clientConfig.buttonActions = actions;
-            renderContext.validate();
-            onChangeValidateStatus(this.getAgreementId(), function () {
-                renderContext.validate();
-            });
+        initListeners: function (context) {
+            $.async(this.validationElements, context, function (element) {
+                $(element).on('change', function () {
+                    this.validate();
+                }.bind(this));
+            }.bind(this));
         },
 
         /**
          *  Validates Smart Buttons
          */
-        validate: function () {
-            additionalValidators.validate() && this.clientConfig.buttonActions ?
-                this.clientConfig.buttonActions.enable() : this.clientConfig.buttonActions.disable();
+        validate: function (actions) {
+            this.clientConfig.buttonActions = actions || this.clientConfig.buttonActions;
+
+            if (this.clientConfig.buttonActions) {
+                additionalValidators.validate(true) ?
+                    this.clientConfig.buttonActions.enable() :
+                    this.clientConfig.buttonActions.disable();
+            }
         },
 
         /**
@@ -101,17 +96,17 @@ define([
             this.clientConfig.validator = additionalValidators;
             this.clientConfig.client = {};
             this.clientConfig.client[this.clientConfig.environment] = this.merchantId;
+            this.clientConfig.additionalAction = setPaymentMethodAction;
+            this.clientConfig.rendererComponent = this;
+            this.clientConfig.messageContainer = this.messageContainer;
 
             /** Add logic to be triggered onClick action for smart buttons component*/
             this.clientConfig.onClick = function () {
                 additionalValidators.validate();
                 this.selectPaymentMethod();
             };
-            this.clientConfig.additionalAction = setPaymentMethodAction;
-            this.clientConfig.rendererComponent = this;
-            this.clientConfig.messageContainer = this.messageContainer;
             _.each(this.clientConfig, function (fn, name) {
-                if (typeof fn === 'function') {
+                if (_.isFunction(fn)) {
                     this.clientConfig[name] = fn.bind(this);
                 }
             }, this);
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index dcfdacf37998a..4d62a6d7e0ff5 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -25,7 +25,7 @@
                translate="'What is PayPal?'"/>
         </label>
     </div>
-    <div class="payment-method-content">
+    <div class="payment-method-content" afterRender="initListeners">
         <each args="getRegion('messages')" render=""/>
         <div class="checkout-agreements-block" attr="id: getAgreementId()">
             <each args="$parent.getRegion('before-place-order')" render=""/>
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 01ecaf7cf46c2..b180f8791cd4f 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1777,7 +1777,8 @@
             valid = true,
             validateConfig = {
                 errorElement: 'label',
-                ignore: '.ignore-validate'
+                ignore: '.ignore-validate',
+                hideError: false
             },
             form, validator, classes, elementValue;
 
@@ -1815,7 +1816,9 @@
                 valid = false;
                 errors[element.get(0).name] = this.messages[className];
                 validator.invalid[element.get(0).name] = true;
-                validator.showErrors(errors);
+                if (!validateConfig.hideError) {
+                    validator.showErrors(errors);
+                }
 
                 return valid;
             }

From de50586389b2fef5e70622c8b0fb4a1a37f78cde Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 18 Jan 2019 15:56:52 -0600
Subject: [PATCH 739/932] MC-4394: Convert CreateVirtualProductEntityTest to
 MFTF

- Add a timeout to AdminProductFormSection.advancedPricingLink
---
 .../Catalog/Test/Mftf/Section/AdminProductFormSection.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 963b22036c06c..89f904c26e090 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -25,7 +25,7 @@
         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
         <element name="productTaxClass" type="select" selector="//*[@name='product[tax_class_id]']"/>
         <element name="productTaxClassUseDefault" type="checkbox" selector="input[name='use_default[tax_class_id]']"/>
-        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']"/>
+        <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']" timeout="30"/>
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
         <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]"/>

From 82e4318e6ad5ddd1ed381f256010d57f800870b8 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 18 Jan 2019 16:00:16 -0600
Subject: [PATCH 740/932] MC-4394: Convert CreateVirtualProductEntityTest to
 MFTF

- Fix broken selector that was made parameterized
---
 .../Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index c0a45d61c0637..b74746035878b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -160,7 +160,7 @@
 
         <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection"/>
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOption"/>
-        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput}}" userInput="option1" stepKey="fillOptionTitle"/>
+        <fillField selector="{{AdminProductCustomizableOptionsSection.optionTitleInput('0')}}" userInput="option1" stepKey="fillOptionTitle"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeOpenDropDown}}" stepKey="openTypeDropDown"/>
         <click selector="{{AdminProductCustomizableOptionsSection.optionTypeTextField}}" stepKey="selectTypeTextField"/>
         <fillField userInput="20" selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput}}" stepKey="fillMaxChars"/>

From b5efb5cee5cd5a06a4a472d9554e3f4d1f44de63 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Sat, 19 Jan 2019 13:44:43 +0100
Subject: [PATCH 741/932] Fixes incorrect where condition when deleting swatch
 option, it deleted all options instead of a specific one.

---
 app/code/Magento/Swatches/Model/ResourceModel/Swatch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
index 9dc5b3a0c816f..313ad809beb61 100644
--- a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
+++ b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
@@ -49,7 +49,7 @@ public function clearSwatchOptionByOptionIdAndType($optionIDs, $type = null)
     {
         if (count($optionIDs)) {
             foreach ($optionIDs as $optionId) {
-                $where = ['option_id' => $optionId];
+                $where = ['option_id = ?' => $optionId];
                 if ($type !== null) {
                     $where['type = ?'] = $type;
                 }

From 989b0b17670c91e8ae8c91a383ba4dfb11135b30 Mon Sep 17 00:00:00 2001
From: milindsingh <milind7@live.com>
Date: Sun, 20 Jan 2019 17:13:18 +0530
Subject: [PATCH 742/932] Removed Unnecessary slash in namespace in di.xml

---
 app/code/Magento/Catalog/etc/adminhtml/di.xml    |  2 +-
 app/code/Magento/CheckoutAgreements/etc/di.xml   |  2 +-
 app/code/Magento/Elasticsearch/etc/di.xml        | 16 ++++++++--------
 .../Magento/ImportExport/etc/adminhtml/di.xml    |  2 +-
 app/code/Magento/Indexer/etc/di.xml              |  2 +-
 app/code/Magento/Sales/etc/webapi_rest/di.xml    |  2 +-
 app/code/Magento/Sales/etc/webapi_soap/di.xml    |  2 +-
 app/code/Magento/SalesRule/etc/di.xml            |  2 +-
 app/code/Magento/Theme/etc/di.xml                |  2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index fddc01ac4c189..c04cfb2dce00a 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -78,7 +78,7 @@
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
         <plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />
     </type>
-    <virtualType name="\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory" type="\Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
+    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory" type="Magento\Catalog\Model\ResourceModel\Product\CollectionFactory">
         <arguments>
             <argument name="instanceName" xsi:type="string">\Magento\Catalog\Ui\DataProvider\Product\ProductCollection</argument>
         </arguments>
diff --git a/app/code/Magento/CheckoutAgreements/etc/di.xml b/app/code/Magento/CheckoutAgreements/etc/di.xml
index 081e3daa781ff..a8ff8f5941f96 100644
--- a/app/code/Magento/CheckoutAgreements/etc/di.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/di.xml
@@ -23,7 +23,7 @@
     <type name="Magento\Checkout\Api\GuestPaymentInformationManagementInterface">
         <plugin name="validate-guest-agreements" type="Magento\CheckoutAgreements\Model\Checkout\Plugin\GuestValidation"/>
     </type>
-    <type name="\Magento\CheckoutAgreements\Model\CheckoutAgreementsList">
+    <type name="Magento\CheckoutAgreements\Model\CheckoutAgreementsList">
         <arguments>
             <argument name="collectionProcessor" xsi:type="object">Magento\CheckoutAgreements\Model\Api\SearchCriteria\CollectionProcessor</argument>
         </arguments>
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 6a42e4b3c9fe2..7e219bb2f918f 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -68,7 +68,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy">
         <arguments>
             <argument name="productFieldMappers" xsi:type="array">
                 <item name="elasticsearch" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper</item>
@@ -287,7 +287,7 @@
             <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
         <arguments>
             <argument name="items" xsi:type="array">
                 <item name="notEav" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\NotEavAttribute</item>
@@ -317,7 +317,7 @@
             <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
         </arguments>
     </virtualType>
-    <type name="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
         <arguments>
             <argument name="items" xsi:type="array">
                 <item name="integer" xsi:type="object">\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType</item>
@@ -327,7 +327,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\CompositeResolver">
         <arguments>
             <argument name="items" xsi:type="array">
                 <item name="keyword" xsi:type="object">\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType</item>
@@ -368,12 +368,12 @@
             <argument name="indexTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter</argument>
         </arguments>
     </virtualType>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\KeywordType">
         <arguments>
             <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Resolver\IntegerType">
         <arguments>
             <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
         </arguments>
@@ -393,13 +393,13 @@
             <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
         </arguments>
     </virtualType>
-    <type name="\Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper">
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper">
         <arguments>
             <argument name="fieldProvider" xsi:type="object">elasticsearch5FieldProvider</argument>
             <argument name="fieldNameResolver" xsi:type="object">elasticsearch5FieldNameResolver</argument>
         </arguments>
     </type>
-    <type name="\Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper">
+    <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\ProductFieldMapper">
         <arguments>
             <argument name="attributeAdapterProvider" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider</argument>
             <argument name="fieldProvider" xsi:type="object">Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface</argument>
diff --git a/app/code/Magento/ImportExport/etc/adminhtml/di.xml b/app/code/Magento/ImportExport/etc/adminhtml/di.xml
index 03c24c7b2bf69..8f7955e679cc2 100644
--- a/app/code/Magento/ImportExport/etc/adminhtml/di.xml
+++ b/app/code/Magento/ImportExport/etc/adminhtml/di.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="\Magento\ImportExport\Controller\Adminhtml\Import\Start">
+    <type name="Magento\ImportExport\Controller\Adminhtml\Import\Start">
         <arguments>
             <argument name="exceptionMessageFactory" xsi:type="object">Magento\Framework\Message\ExceptionMessageLookupFactory</argument>
         </arguments>
diff --git a/app/code/Magento/Indexer/etc/di.xml b/app/code/Magento/Indexer/etc/di.xml
index c7603191e8606..76e7e7a46224b 100644
--- a/app/code/Magento/Indexer/etc/di.xml
+++ b/app/code/Magento/Indexer/etc/di.xml
@@ -42,7 +42,7 @@
         <plugin name="page-cache-indexer-reindex-clean-cache"
                 type="Magento\Indexer\Model\Processor\CleanCache" sortOrder="10"/>
     </type>
-    <type name="\Magento\Indexer\Model\ProcessManager">
+    <type name="Magento\Indexer\Model\ProcessManager">
         <arguments>
             <argument name="threadsCount" xsi:type="init_parameter">Magento\Indexer\Model\ProcessManager::THREADS_COUNT</argument>
         </arguments>
diff --git a/app/code/Magento/Sales/etc/webapi_rest/di.xml b/app/code/Magento/Sales/etc/webapi_rest/di.xml
index 6435445e0ef93..f2cbd14eb8042 100644
--- a/app/code/Magento/Sales/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_rest/di.xml
@@ -18,7 +18,7 @@
     <type name="Magento\Framework\Reflection\DataObjectProcessor">
         <arguments>
             <argument name="processors" xsi:type="array">
-                <item name="\Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
+                <item name="Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
index 6435445e0ef93..f2cbd14eb8042 100644
--- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -18,7 +18,7 @@
     <type name="Magento\Framework\Reflection\DataObjectProcessor">
         <arguments>
             <argument name="processors" xsi:type="array">
-                <item name="\Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
+                <item name="Magento\Sales\Model\Order\Item" xsi:type="object">Magento\Sales\Model\Order\Webapi\ChangeOutputArray\Proxy</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml
index a8c350457a5a6..27c9a41503b22 100644
--- a/app/code/Magento/SalesRule/etc/di.xml
+++ b/app/code/Magento/SalesRule/etc/di.xml
@@ -179,7 +179,7 @@
         </arguments>
     </type>
 
-    <type name="\Magento\Quote\Model\Cart\CartTotalRepository">
+    <type name="Magento\Quote\Model\Cart\CartTotalRepository">
         <plugin name="coupon_label_plugin" type="Magento\SalesRule\Plugin\CartTotalRepository" />
     </type>
 </config>
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index 148267feeaad0..62f51e74b6007 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -273,7 +273,7 @@
     <type name="Magento\Config\App\Config\Source\DumpConfigSourceAggregated">
         <plugin name="designConfigTheme" type="Magento\Theme\Model\Design\Config\Plugin\Dump" sortOrder="50"/>
     </type>
-    <type name="\Magento\Theme\Model\Design\Config\Plugin\Dump">
+    <type name="Magento\Theme\Model\Design\Config\Plugin\Dump">
         <arguments>
             <argument name="themeList" xsi:type="object">Magento\Theme\Model\ResourceModel\Theme\Collection</argument>
         </arguments>

From 2cfae176b7a1c22cc3f3436c6f1aa021f7a8890d Mon Sep 17 00:00:00 2001
From: "al.kravchuk" <al.kravchuk@ism-ukraine.com>
Date: Sun, 20 Jan 2019 14:53:24 +0200
Subject: [PATCH 743/932] magento/magento2#?: Mark not used product controller,
 which have dependency on deprecated block.

---
 .../Adminhtml/Downloadable/Product/Edit/Form.php           | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
index 1ef72f1deeccd..fe430566d63ce 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
@@ -6,6 +6,13 @@
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
+/**
+ * Class Form
+ *
+ * @deprecated since downloadable information rendering moved to UI components.
+ * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
+ * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
+ */
 class Form extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
 {
     /**

From a1db46b66b3fd1ecae85fa9a97288d244782ce45 Mon Sep 17 00:00:00 2001
From: Yashwant 2jcommerce <yashwant@2jcommerce.in>
Date: Mon, 21 Jan 2019 13:21:34 +0530
Subject: [PATCH 744/932] checkout-page-shipping-title::Shipping method title
 overlapping on edit icon in mobile view on Checkout page

---
 .../module/checkout/_sidebar-shipping-information.less    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_sidebar-shipping-information.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_sidebar-shipping-information.less
index b54c0a264a03a..0f2a7abcbaa18 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_sidebar-shipping-information.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_sidebar-shipping-information.less
@@ -67,3 +67,11 @@
         }
     }
 }
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+    .opc-block-shipping-information {
+        .shipping-information-title {
+            font-size: 2.3rem;
+        }
+    }
+}

From d48060e82e286e69137ba784a61d262914d19765 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 21 Jan 2019 10:53:21 +0200
Subject: [PATCH 745/932] MAGETWO-97488: Refreshing checkout page deletes
 shipping address on guest checkout

---
 .../view/frontend/web/js/model/place-order.js | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
index c3c5b9d68cec0..c07878fcaea92 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
@@ -9,9 +9,10 @@ define(
     [
         'mage/storage',
         'Magento_Checkout/js/model/error-processor',
-        'Magento_Checkout/js/model/full-screen-loader'
+        'Magento_Checkout/js/model/full-screen-loader',
+        'Magento_Customer/js/customer-data'
     ],
-    function (storage, errorProcessor, fullScreenLoader) {
+    function (storage, errorProcessor, fullScreenLoader, customerData) {
         'use strict';
 
         return function (serviceUrl, payload, messageContainer) {
@@ -23,6 +24,23 @@ define(
                 function (response) {
                     errorProcessor.process(response, messageContainer);
                 }
+            ).success(
+                function (response) {
+                    var clearData = {
+                        'selectedShippingAddress': null,
+                        'shippingAddressFromData': null,
+                        'newCustomerShippingAddress': null,
+                        'selectedShippingRate': null,
+                        'selectedPaymentMethod': null,
+                        'selectedBillingAddress': null,
+                        'billingAddressFromData': null,
+                        'newCustomerBillingAddress': null
+                    };
+
+                    if (response.responseType !== 'error') {
+                        customerData.set('checkout-data', clearData);
+                    }
+                }
             ).always(
                 function () {
                     fullScreenLoader.stopLoader();

From d55f47d0d34031ab602702ec0b2fc518d5cc0b9c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 21 Jan 2019 12:36:10 +0200
Subject: [PATCH 746/932] ENGCOM-3891: Static test fix.

---
 .../Magento/Ui/Component/MassAction/Filter.php     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
index 75acb50adeac8..c512c82d694bc 100644
--- a/app/code/Magento/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
@@ -7,14 +7,16 @@
 namespace Magento\Ui\Component\MassAction;
 
 use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
+ * Filter component.
+ *
  * @api
  * @since 100.0.2
  */
@@ -99,10 +101,10 @@ public function getCollection(AbstractDb $collection)
                 throw new LocalizedException(__('An item needs to be selected. Select and try again.'));
             }
         }
-        
+
         $filterIds = $this->getFilterIds();
-        if(is_array($selected)){
-            $filterIds = array_unique(array_merge($this->getFilterIds(), $selected));
+        if (\is_array($selected)) {
+            $filterIds = array_unique(array_merge($filterIds, $selected));
         }
         $collection->addFieldToFilter(
             $collection->getIdFieldName(),

From d4443444bd64ef237f4bf48b08e365b999a715fb Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Mon, 21 Jan 2019 13:20:25 +0200
Subject: [PATCH 747/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Magento/CatalogImportExport/Model/Import/Product.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 5a051a425608e..159ee13a381b0 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2569,7 +2569,12 @@ public function validateRow(array $rowData, $rowNum)
             $newFromTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_FROM_DATE], false));
             $newToTimestamp = strtotime($this->dateTime->formatDate($rowData[self::COL_NEW_TO_DATE], false));
             if ($newFromTimestamp > $newToTimestamp) {
-                $this->skipRow($rowNum, ValidatorInterface::ERROR_NEW_TO_DATE, $errorLevel, $rowData[self::COL_NEW_TO_DATE]);
+                $this->skipRow(
+                    $rowNum,
+                    ValidatorInterface::ERROR_NEW_TO_DATE,
+                    $errorLevel,
+                    $rowData[self::COL_NEW_TO_DATE]
+                );
             }
         }
 

From 38baa57e355a44ce84229604e256ec5bd62c3355 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 21 Jan 2019 13:26:10 +0200
Subject: [PATCH 748/932] Fix static tests.

---
 .../View/Items/Renderer/DefaultRenderer.php   |  7 +-
 .../Block/Adminhtml/Rss/Order/Grid/Link.php   |  7 ++
 .../Sales/Block/Order/Email/Invoice/Items.php |  7 +-
 .../Block/Order/Email/Shipment/Items.php      |  7 +-
 .../Sales/Block/Order/Info/Buttons/Rss.php    |  7 ++
 .../Sales/Block/Order/PrintShipment.php       |  8 +++
 .../Adminhtml/Order/Create/Index.php          |  3 +
 .../Sales/Model/Order/Creditmemo/Item.php     | 72 ++++++++++---------
 .../Model/Order/Creditmemo/ItemCreation.php   |  8 +--
 .../Model/ResourceModel/Order/Collection.php  |  1 +
 10 files changed, 79 insertions(+), 48 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
index e8feb202c13a4..d19fc4992f046 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
@@ -94,6 +94,7 @@ public function getFieldIdPrefix()
      * Indicate that block can display container
      *
      * @return bool
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function canDisplayContainer()
     {
@@ -259,9 +260,11 @@ public function displayPriceInclTax(\Magento\Framework\DataObject $item)
     }
 
     /**
+     * Retrieve rendered column html content
+     *
      * @param \Magento\Framework\DataObject|Item $item
      * @param string $column
-     * @param null $field
+     * @param string $field
      * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @since 100.1.0
@@ -301,6 +304,8 @@ public function getColumnHtml(\Magento\Framework\DataObject $item, $column, $fie
     }
 
     /**
+     * Get columns data.
+     *
      * @return array
      * @since 100.1.0
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
index 89b63c9f00503..802ed1dc60f30 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
@@ -7,6 +7,7 @@
 
 /**
  * Class Link
+ *
  * @package Magento\Sales\Block\Adminhtml\Rss\Order\Grid
  */
 class Link extends \Magento\Framework\View\Element\Template
@@ -36,6 +37,8 @@ public function __construct(
     }
 
     /**
+     * Get url for link.
+     *
      * @return string
      */
     public function getLink()
@@ -44,6 +47,8 @@ public function getLink()
     }
 
     /**
+     * Get translatable label for link.
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getLabel()
@@ -62,6 +67,8 @@ public function isRssAllowed()
     }
 
     /**
+     * Get link type param.
+     *
      * @return array
      */
     protected function getLinkParams()
diff --git a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
index 4aab58921cb56..bc7756816d32a 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
@@ -4,14 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Sales Order Email Invoice items
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Sales\Block\Order\Email\Invoice;
 
 /**
+ * Sales Order Email Invoice items
+ *
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
index 92ea6a80c8a1a..a4c9a7b80a00d 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
@@ -4,14 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Sales Order Email Shipment items
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Sales\Block\Order\Email\Shipment;
 
 /**
+ * Sales Order Email Shipment items
+ *
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
index fc424db01e87e..626dcf2a5a474 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
@@ -46,6 +46,8 @@ public function __construct(
     }
 
     /**
+     * Get link url.
+     *
      * @return string
      */
     public function getLink()
@@ -54,6 +56,8 @@ public function getLink()
     }
 
     /**
+     * Get translatable label for url.
+     *
      * @return \Magento\Framework\Phrase
      */
     public function getLabel()
@@ -91,7 +95,10 @@ protected function getUrlKey($order)
     }
 
     /**
+     * Get type, secure and query params for link.
+     *
      * @return array
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function getLinkParams()
     {
diff --git a/app/code/Magento/Sales/Block/Order/PrintShipment.php b/app/code/Magento/Sales/Block/Order/PrintShipment.php
index 94ebf6f409250..0006a38f0f1ce 100644
--- a/app/code/Magento/Sales/Block/Order/PrintShipment.php
+++ b/app/code/Magento/Sales/Block/Order/PrintShipment.php
@@ -53,6 +53,8 @@ public function __construct(
     }
 
     /**
+     * Preparing global layout.
+     *
      * @return void
      */
     protected function _prepareLayout()
@@ -63,6 +65,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Get payment info child block html.
+     *
      * @return string
      */
     public function getPaymentInfoHtml()
@@ -71,6 +75,8 @@ public function getPaymentInfoHtml()
     }
 
     /**
+     * Retrieve current order from registry.
+     *
      * @return \Magento\Sales\Model\Order|null
      */
     public function getOrder()
@@ -104,6 +110,8 @@ public function getItems()
     }
 
     /**
+     * Prepare item before output.
+     *
      * @param AbstractBlock $renderer
      * @return $this
      */
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
index e3e06fdbfc9b4..603aa2586b051 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Index.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
+/**
+ * Order create index page controller.
+ */
 class Index extends \Magento\Sales\Controller\Adminhtml\Order\Create implements HttpGetActionInterface
 {
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
index b8f8179d39674..35244b2661383 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
@@ -10,6 +10,8 @@
 use Magento\Sales\Model\AbstractModel;
 
 /**
+ * Creditmemo item model.
+ *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
@@ -189,6 +191,8 @@ public function register()
     }
 
     /**
+     * Calculate qty for creditmemo item.
+     *
      * @return int|float
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -212,6 +216,8 @@ private function processQty()
     }
 
     /**
+     * Cancel creaditmemeo item.
+     *
      * @return $this
      */
     public function cancel()
@@ -608,7 +614,7 @@ public function getWeeeTaxRowDisposition()
     //@codeCoverageIgnoreStart
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setParentId($id)
     {
@@ -616,7 +622,7 @@ public function setParentId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBasePrice($price)
     {
@@ -624,7 +630,7 @@ public function setBasePrice($price)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTaxAmount($amount)
     {
@@ -632,7 +638,7 @@ public function setTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseRowTotal($amount)
     {
@@ -640,7 +646,7 @@ public function setBaseRowTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountAmount($amount)
     {
@@ -648,7 +654,7 @@ public function setDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRowTotal($amount)
     {
@@ -656,7 +662,7 @@ public function setRowTotal($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountAmount($amount)
     {
@@ -664,7 +670,7 @@ public function setBaseDiscountAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPriceInclTax($amount)
     {
@@ -672,7 +678,7 @@ public function setPriceInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseTaxAmount($amount)
     {
@@ -680,7 +686,7 @@ public function setBaseTaxAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBasePriceInclTax($amount)
     {
@@ -688,7 +694,7 @@ public function setBasePriceInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseCost($baseCost)
     {
@@ -696,7 +702,7 @@ public function setBaseCost($baseCost)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPrice($price)
     {
@@ -704,7 +710,7 @@ public function setPrice($price)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseRowTotalInclTax($amount)
     {
@@ -712,7 +718,7 @@ public function setBaseRowTotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRowTotalInclTax($amount)
     {
@@ -720,7 +726,7 @@ public function setRowTotalInclTax($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setProductId($id)
     {
@@ -728,7 +734,7 @@ public function setProductId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderItemId($id)
     {
@@ -736,7 +742,7 @@ public function setOrderItemId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAdditionalData($additionalData)
     {
@@ -744,7 +750,7 @@ public function setAdditionalData($additionalData)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDescription($description)
     {
@@ -752,7 +758,7 @@ public function setDescription($description)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSku($sku)
     {
@@ -760,7 +766,7 @@ public function setSku($sku)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setName($name)
     {
@@ -768,7 +774,7 @@ public function setName($name)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setDiscountTaxCompensationAmount($amount)
     {
@@ -776,7 +782,7 @@ public function setDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseDiscountTaxCompensationAmount($amount)
     {
@@ -784,7 +790,7 @@ public function setBaseDiscountTaxCompensationAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxDisposition($weeeTaxDisposition)
     {
@@ -792,7 +798,7 @@ public function setWeeeTaxDisposition($weeeTaxDisposition)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
     {
@@ -800,7 +806,7 @@ public function setWeeeTaxRowDisposition($weeeTaxRowDisposition)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
     {
@@ -808,7 +814,7 @@ public function setBaseWeeeTaxDisposition($baseWeeeTaxDisposition)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
     {
@@ -816,7 +822,7 @@ public function setBaseWeeeTaxRowDisposition($baseWeeeTaxRowDisposition)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxApplied($weeeTaxApplied)
     {
@@ -824,7 +830,7 @@ public function setWeeeTaxApplied($weeeTaxApplied)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseWeeeTaxAppliedAmount($amount)
     {
@@ -832,7 +838,7 @@ public function setBaseWeeeTaxAppliedAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseWeeeTaxAppliedRowAmnt($amnt)
     {
@@ -840,7 +846,7 @@ public function setBaseWeeeTaxAppliedRowAmnt($amnt)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxAppliedAmount($amount)
     {
@@ -848,7 +854,7 @@ public function setWeeeTaxAppliedAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setWeeeTaxAppliedRowAmount($amount)
     {
@@ -856,7 +862,7 @@ public function setWeeeTaxAppliedRowAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface|null
      */
@@ -866,7 +872,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Sales\Api\Data\CreditmemoItemExtensionInterface $extensionAttributes
      * @return $this
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php
index d6da44c5cb5b9..3fd3eaaa11a7f 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/ItemCreation.php
@@ -28,7 +28,7 @@ class ItemCreation implements CreditmemoItemCreationInterface
     private $extensionAttributes;
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getOrderItemId()
     {
@@ -36,7 +36,7 @@ public function getOrderItemId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setOrderItemId($orderItemId)
     {
@@ -45,7 +45,7 @@ public function setOrderItemId($orderItemId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getQty()
     {
@@ -53,7 +53,7 @@ public function getQty()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQty($qty)
     {
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
index 2c4d33ac0db3f..6ad8ebc3bb89d 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Collection.php
@@ -138,6 +138,7 @@ protected function _getAllIdsSelect($limit = null, $offset = null)
 
     /**
      * Join table sales_order_address to select for billing and shipping order addresses.
+     *
      * Create correlation map
      *
      * @return $this

From 927b1b42922f5523ab146808768bafd7ce7b02a4 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Mon, 21 Jan 2019 15:00:49 +0300
Subject: [PATCH 749/932] MC-10934: Tests failures
 CreationScheduledUpdateForStagingDashboardTest and
 StorefrontPurchaseProductWithCustomOptions

- Fix MFTF tests.
---
 .../Test/StorefrontPurchaseProductWithCustomOptionsTest.xml     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index d96399738c80a..951afa2ddb68b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -17,8 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-61717"/>
             <group value="Catalog"/>
-            <!-- skip due to MAGETWO-97424 -->
-            <group value="skip"/>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>

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 750/932] 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

From c310cd739f1a24a73fd808f74089334a77053f51 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 21 Jan 2019 14:15:53 +0200
Subject: [PATCH 751/932] ENGCOM-3899: Static test fix.

---
 .../Magento/luma/Magento_Catalog/web/css/source/_module.less   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index e097aa26c98d3..9b310787069b0 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -981,7 +981,8 @@
                 &.main {
                     flex-basis: inherit;
                 }
-        }   }
+            }
+        }
     }
 }
 

From e1707be3de70a88305a85c71e6cc3d97ae672055 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 21 Jan 2019 14:23:13 +0200
Subject: [PATCH 752/932] Fix static tests.

---
 .../Data/ProductRender/PriceInfoInterface.php |  7 +++++
 .../Api/Data/ProductRenderInterface.php       |  5 ++++
 .../Product/Frontend/Product/Watermark.php    | 14 +++++++---
 .../Controller/Adminhtml/Category/Move.php    |  3 ++
 .../Catalog/Controller/Index/Index.php        |  7 ++++-
 .../Magento/Catalog/Helper/Product/View.php   |  2 ++
 .../Indexer/Product/Category/Action/Rows.php  |  2 ++
 .../ProductRepository/TransactionWrapper.php  |  9 ++++++
 .../Model/Product/Option/Type/Date.php        |  1 +
 .../Model/Product/Website/ReadHandler.php     |  5 ++++
 .../Catalog/Model/ProductRender/Image.php     | 28 ++++++++++++++++++-
 .../Catalog/Model/ProductRenderList.php       |  2 +-
 .../ResourceModel/AbstractCollection.php      |  9 +++++-
 .../Product/Indexer/Eav/AbstractEav.php       |  9 +++---
 .../Indexer/Price/Query/BaseFinalPrice.php    |  8 ++++--
 .../Indexer/TemporaryTableStrategy.php        |  5 ++--
 .../Product/Link/DeleteHandler.php            |  2 ++
 .../Magento/Catalog/Model/Rss/Category.php    |  5 ++--
 .../Magento/Catalog/Model/Template/Filter.php |  2 ++
 .../Plugin/Model/ResourceModel/Config.php     |  7 +++++
 .../Modifier/Eav/CompositeConfigProcessor.php |  5 +++-
 .../Product/Listing/DataProvider.php          |  2 +-
 22 files changed, 117 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
index d12f54c8cdc41..9768b3c08c8ab 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
@@ -8,6 +8,7 @@
 
 /**
  * Price interface.
+ *
  * @api
  * @since 101.1.0
  */
@@ -23,6 +24,7 @@ public function getFinalPrice();
 
     /**
      * Set the final price: usually it calculated as minimal price of the product
+     *
      * Can be different depends on type of product
      *
      * @param float $finalPrice
@@ -33,6 +35,7 @@ public function setFinalPrice($finalPrice);
 
     /**
      * Retrieve max price of a product
+     *
      * E.g. for product with custom options is price with the most expensive custom option
      *
      * @return float
@@ -51,6 +54,7 @@ public function setMaxPrice($maxPrice);
 
     /**
      * Set max regular price
+     *
      * Max regular price is the same, as maximum price, except of excluding calculating special price and catalog rules
      * in it
      *
@@ -105,6 +109,8 @@ public function setSpecialPrice($specialPrice);
     public function getSpecialPrice();
 
     /**
+     * Retrieve minimal price
+     *
      * @return float
      * @since 101.1.0
      */
@@ -129,6 +135,7 @@ public function getRegularPrice();
 
     /**
      * Regular price - is price of product without discounts and special price with taxes and fixed product tax
+     *
      * Usually this price is corresponding to price in admin panel of product
      *
      * @param float $regularPrice
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
index dddf046596b50..166a1aba76b61 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
@@ -55,6 +55,7 @@ public function setAddToCompareButton(ButtonInterface $compareButton);
 
     /**
      * Provide information needed for render prices and adjustments for different product types on front
+     *
      * Prices are represented in raw format and in current currency
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface
@@ -73,6 +74,7 @@ public function setPriceInfo(PriceInfoInterface $priceInfo);
 
     /**
      * Provide enough information, that needed to render image on front
+     *
      * Images can be separated by image codes
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\ImageInterface[]
@@ -167,6 +169,7 @@ public function getIsSalable();
 
     /**
      * Set information about product saleability (Stock, other conditions)
+     *
      * Is used to provide information to frontend JS renders
      * You can add plugin, in order to hide product on product page or product list on front
      *
@@ -178,6 +181,7 @@ public function setIsSalable($isSalable);
 
     /**
      * Provide information about current store id or requested store id
+     *
      * Product should be assigned to provided store id
      * This setting affect store scope attributes
      *
@@ -197,6 +201,7 @@ public function setStoreId($storeId);
 
     /**
      * Provide current or desired currency code to product
+     *
      * This setting affect formatted prices*
      *
      * @return string
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
index c4cd35cdf29c5..7f80aece60ee0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
@@ -4,15 +4,15 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Catalog\Block\Adminhtml\Product\Frontend\Product;
+
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
 /**
  * Fieldset config form element renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Catalog\Block\Adminhtml\Product\Frontend\Product;
-
-use Magento\Framework\Data\Form\Element\AbstractElement;
-
 class Watermark extends \Magento\Backend\Block\AbstractBlock implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
@@ -60,6 +60,8 @@ public function __construct(
     }
 
     /**
+     * Render form element as HTML
+     *
      * @param AbstractElement $element
      * @return string
      */
@@ -124,6 +126,8 @@ public function render(AbstractElement $element)
     }
 
     /**
+     * Get header html for render
+     *
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
@@ -147,6 +151,8 @@ protected function _getHeaderHtml($element)
     }
 
     /**
+     * Get footer html for render
+     *
      * @param AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
index 858850e45db7f..082101ff07826 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Move.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 
+/**
+ * Move category admin controller
+ */
 class Move extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpPostActionInterface
 {
     /**
diff --git a/app/code/Magento/Catalog/Controller/Index/Index.php b/app/code/Magento/Catalog/Controller/Index/Index.php
index b89f495b9edb2..bd00c97204996 100644
--- a/app/code/Magento/Catalog/Controller/Index/Index.php
+++ b/app/code/Magento/Catalog/Controller/Index/Index.php
@@ -5,7 +5,12 @@
  */
 namespace Magento\Catalog\Controller\Index;
 
-class Index extends \Magento\Framework\App\Action\Action
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Catalog index page controller.
+ */
+class Index extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
 {
     /**
      * Index action
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 87e93e3f20e5b..74f40a18971d5 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -10,7 +10,9 @@
 
 /**
  * Catalog category helper
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class View extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
index eb58ed39b81b5..cb708695255d4 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
@@ -17,6 +17,8 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
+ * Category rows indexer.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractAction
diff --git a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
index 0f442c6bbffc9..f51b2e4f90a64 100644
--- a/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
+++ b/app/code/Magento/Catalog/Model/Plugin/ProductRepository/TransactionWrapper.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Catalog\Model\Plugin\ProductRepository;
 
+/**
+ * Transaction wrapper for product repository CRUD.
+ */
 class TransactionWrapper
 {
     /**
@@ -24,6 +27,8 @@ public function __construct(
     }
 
     /**
+     * Transaction wrapper for save action.
+     *
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
      * @param \Closure $proceed
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
@@ -51,6 +56,8 @@ public function aroundSave(
     }
 
     /**
+     * Transaction wrapper for delete action.
+     *
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
      * @param \Closure $proceed
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
@@ -76,6 +83,8 @@ public function aroundDelete(
     }
 
     /**
+     * Transaction wrapper for delete by id action.
+     *
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $subject
      * @param \Closure $proceed
      * @param string $productSku
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
index 33c37238e5bdf..2b4739ebeb736 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
@@ -12,6 +12,7 @@
  * Catalog product option date type
  *
  * @author     Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Date extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
index 5ecabd8d43529..8acb4a6593a4c 100644
--- a/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Website/ReadHandler.php
@@ -9,6 +9,9 @@
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link as ProductWebsiteLink;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
+/**
+ * Add websites ids to product extension attributes.
+ */
 class ReadHandler implements ExtensionInterface
 {
     /**
@@ -27,6 +30,8 @@ public function __construct(
     }
 
     /**
+     * Add website ids to product extension attributes, if no set.
+     *
      * @param ProductInterface $product
      * @param array $arguments
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Catalog/Model/ProductRender/Image.php b/app/code/Magento/Catalog/Model/ProductRender/Image.php
index 09416d38773fc..5e024938d37ea 100644
--- a/app/code/Magento/Catalog/Model/ProductRender/Image.php
+++ b/app/code/Magento/Catalog/Model/ProductRender/Image.php
@@ -9,12 +9,14 @@
 use Magento\Catalog\Api\Data\ProductRender\ImageInterface;
 
 /**
- * @inheritdoc
+ * Product image renderer model.
  */
 class Image extends \Magento\Framework\Model\AbstractExtensibleModel implements
     ImageInterface
 {
     /**
+     * Set url to image.
+     *
      * @param string $url
      * @return void
      */
@@ -34,6 +36,8 @@ public function getUrl()
     }
 
     /**
+     * Retrieve image code.
+     *
      * @return string
      */
     public function getCode()
@@ -42,6 +46,8 @@ public function getCode()
     }
 
     /**
+     * Set image code.
+     *
      * @param string $code
      * @return void
      */
@@ -51,6 +57,8 @@ public function setCode($code)
     }
 
     /**
+     * Set image height.
+     *
      * @param string $height
      * @return void
      */
@@ -60,6 +68,8 @@ public function setHeight($height)
     }
 
     /**
+     * Retrieve image height.
+     *
      * @return float
      */
     public function getHeight()
@@ -68,6 +78,8 @@ public function getHeight()
     }
 
     /**
+     * Retrieve image width.
+     *
      * @return float
      */
     public function getWidth()
@@ -76,6 +88,8 @@ public function getWidth()
     }
 
     /**
+     * Set image width.
+     *
      * @param string $width
      * @return void
      */
@@ -85,6 +99,8 @@ public function setWidth($width)
     }
 
     /**
+     * Retrieve image label.
+     *
      * @return string
      */
     public function getLabel()
@@ -93,6 +109,8 @@ public function getLabel()
     }
 
     /**
+     * Set image label.
+     *
      * @param string $label
      * @return void
      */
@@ -102,6 +120,8 @@ public function setLabel($label)
     }
 
     /**
+     * Retrieve image width after image resize.
+     *
      * @return float
      */
     public function getResizedWidth()
@@ -110,6 +130,8 @@ public function getResizedWidth()
     }
 
     /**
+     * Set image width after image resize.
+     *
      * @param string $width
      * @return void
      */
@@ -119,6 +141,8 @@ public function setResizedWidth($width)
     }
 
     /**
+     * Set image height after image resize.
+     *
      * @param string $height
      * @return void
      */
@@ -128,6 +152,8 @@ public function setResizedHeight($height)
     }
 
     /**
+     * Retrieve image height after image resize.
+     *
      * @return float
      */
     public function getResizedHeight()
diff --git a/app/code/Magento/Catalog/Model/ProductRenderList.php b/app/code/Magento/Catalog/Model/ProductRenderList.php
index 230fe66681e82..d1f60c098630e 100644
--- a/app/code/Magento/Catalog/Model/ProductRenderList.php
+++ b/app/code/Magento/Catalog/Model/ProductRenderList.php
@@ -17,8 +17,8 @@
 
 /**
  * Provide product render information (this information should be enough for rendering product on front)
- * for one or few products
  *
+ * Render information provided for one or few products
  */
 class ProductRenderList implements ProductRenderListInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
index 07acd5ceb5f29..2896849b76cce 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractCollection.php
@@ -7,6 +7,7 @@
 
 /**
  * Flat abstract collection
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractCollection extends \Magento\Framework\Model\ResourceModel\Db\VersionControl\Collection
@@ -34,7 +35,7 @@ public function setSelectCountSql(\Magento\Framework\DB\Select $countSelect)
     }
 
     /**
-     * get select count sql
+     * Get select count sql
      *
      * @return \Magento\Framework\DB\Select
      */
@@ -69,6 +70,7 @@ protected function _attributeToField($attribute)
 
     /**
      * Add attribute to select result set.
+     *
      * Backward compatibility with EAV collection
      *
      * @param string $attribute
@@ -82,6 +84,7 @@ public function addAttributeToSelect($attribute)
 
     /**
      * Specify collection select filter by attribute value
+     *
      * Backward compatibility with EAV collection
      *
      * @param string|\Magento\Eav\Model\Entity\Attribute $attribute
@@ -96,6 +99,7 @@ public function addAttributeToFilter($attribute, $condition = null)
 
     /**
      * Specify collection select order by attribute value
+     *
      * Backward compatibility with EAV collection
      *
      * @param string $attribute
@@ -110,6 +114,7 @@ public function addAttributeToSort($attribute, $dir = 'asc')
 
     /**
      * Set collection page start and records to show
+     *
      * Backward compatibility with EAV collection
      *
      * @param int $pageNum
@@ -124,6 +129,7 @@ public function setPage($pageNum, $pageSize)
 
     /**
      * Create all ids retrieving select with limitation
+     *
      * Backward compatibility with EAV collection
      *
      * @param int $limit
@@ -144,6 +150,7 @@ protected function _getAllIdsSelect($limit = null, $offset = null)
 
     /**
      * Retrieve all ids for collection
+     *
      * Backward compatibility with EAV collection
      *
      * @param int $limit
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
index a28e7c04421b5..e024f0d30f1dc 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
@@ -24,12 +24,11 @@ abstract class AbstractEav extends \Magento\Catalog\Model\ResourceModel\Product\
     protected $_eventManager = null;
 
     /**
-     * AbstractEav constructor.
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param null $connectionName
+     * @param string $connectionName
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -69,7 +68,6 @@ public function reindexAll()
     /**
      * Rebuild index data by entities
      *
-     *
      * @param int|array $processIds
      * @return $this
      * @throws \Exception
@@ -87,8 +85,8 @@ public function reindexEntities($processIds)
 
     /**
      * Rebuild index data by attribute id
-     * If attribute is not indexable remove data by attribute
      *
+     * If attribute is not indexable remove data by attribute
      *
      * @param int $attributeId
      * @param bool $isIndexable
@@ -244,7 +242,8 @@ protected function _prepareRelationIndex($parentIds = null)
 
     /**
      * Retrieve condition for retrieve indexable attribute select
-     * the catalog/eav_attribute table must have alias is ca
+     *
+     * The catalog/eav_attribute table must have alias is ca
      *
      * @return string
      */
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
index a82ca93d1805e..95fecc832fa26 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/Query/BaseFinalPrice.php
@@ -16,6 +16,7 @@
 
 /**
  * Prepare base select for Product Price index limited by specified dimensions: website and customer group
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BaseFinalPrice
@@ -66,7 +67,6 @@ class BaseFinalPrice
     private $metadataPool;
 
     /**
-     * BaseFinalPrice constructor.
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param JoinAttributeProcessor $joinAttributeProcessor
      * @param \Magento\Framework\Module\Manager $moduleManager
@@ -91,6 +91,8 @@ public function __construct(
     }
 
     /**
+     * Build query for base final price.
+     *
      * @param Dimension[] $dimensions
      * @param string $productType
      * @param array $entityIds
@@ -287,7 +289,7 @@ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
     /**
      * Get tier price expression for table
      *
-     * @param $tableAlias
+     * @param string $tableAlias
      * @param \Zend_Db_Expr $priceExpression
      * @return \Zend_Db_Expr
      */
@@ -307,7 +309,7 @@ private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $pric
     /**
      * Get connection
      *
-     * return \Magento\Framework\DB\Adapter\AdapterInterface
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
      * @throws \DomainException
      */
     private function getConnection(): \Magento\Framework\DB\Adapter\AdapterInterface
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
index dab8dc5f866be..89daab2885970 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/TemporaryTableStrategy.php
@@ -66,9 +66,10 @@ public function getTableName($tablePrefix)
     }
 
     /**
-     * Create temporary index table based on memory table
+     * Create temporary index table based on memory table{@inheritdoc}
      *
-     * {@inheritdoc}
+     * @param string $tablePrefix
+     * @return string
      */
     public function prepareTableName($tablePrefix)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
index 5d6ce590b89c4..a554ff2641dfe 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
@@ -60,6 +60,8 @@ public function __construct(
     }
 
     /**
+     * Delete linked product.
+     *
      * @param string $entityType
      * @param object $entity
      * @return void
diff --git a/app/code/Magento/Catalog/Model/Rss/Category.php b/app/code/Magento/Catalog/Model/Rss/Category.php
index 25a638fabcefa..653d86b177a52 100644
--- a/app/code/Magento/Catalog/Model/Rss/Category.php
+++ b/app/code/Magento/Catalog/Model/Rss/Category.php
@@ -6,8 +6,7 @@
 namespace Magento\Catalog\Model\Rss;
 
 /**
- * Class Category
- * @package Magento\Catalog\Model\Rss
+ * Rss Category model.
  */
 class Category
 {
@@ -42,6 +41,8 @@ public function __construct(
     }
 
     /**
+     * Get products for given category.
+     *
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index 53d8b68fe7070..8cd61415b958a 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -76,6 +76,7 @@ public function setUseAbsoluteLinks($flag)
 
     /**
      * Setter whether SID is allowed in store directive
+     *
      * Doesn't set anything intentionally, since SID is not allowed in any kind of emails
      *
      * @param bool $flag
@@ -132,6 +133,7 @@ public function mediaDirective($construction)
 
     /**
      * Retrieve store URL directive
+     *
      * Support url and direct_url properties
      *
      * @param array $construction
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
index d4af2f02005c2..b942f5570f57d 100644
--- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Config.php
@@ -8,6 +8,9 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\SerializerInterface;
 
+/**
+ * Config cache plugin.
+ */
 class Config
 {
     /**#@+
@@ -46,6 +49,8 @@ public function __construct(
     }
 
     /**
+     * Cache attribute used in listing.
+     *
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
      * @param \Closure $proceed
      * @return array
@@ -73,6 +78,8 @@ public function aroundGetAttributesUsedInListing(
     }
 
     /**
+     * Cache attributes used for sorting.
+     *
      * @param \Magento\Catalog\Model\ResourceModel\Config $config
      * @param \Closure $proceed
      * @return array
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
index 22ac3bf0fa2b5..fed94193225f8 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/CompositeConfigProcessor.php
@@ -10,6 +10,9 @@
 
 use Psr\Log\LoggerInterface as Logger;
 
+/**
+ * Process config for Wysiwyg.
+ */
 class CompositeConfigProcessor implements WysiwygConfigDataProcessorInterface
 {
     /**
@@ -34,7 +37,7 @@ public function __construct(Logger $logger, array $eavWysiwygDataProcessors)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute)
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
index be98fff96f088..4de0b94d06801 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
@@ -59,7 +59,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getData()
     {

From d0e5afc870b2b82c138da67993553a35a25e9801 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 21 Jan 2019 15:10:56 +0200
Subject: [PATCH 753/932] Fix static tests.

---
 .../Framework/View/Element/UiComponent/Context.php        | 4 ++--
 .../View/Test/Unit/Element/UiComponent/ContextTest.php    | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
index 3e4de596ff084..fbb84712b2afd 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
@@ -110,9 +110,9 @@ class Context implements ContextInterface
      * @param UrlInterface $urlBuilder
      * @param Processor $processor
      * @param UiComponentFactory $uiComponentFactory
-     * @param AuthorizationInterface $authorization
      * @param DataProviderInterface|null $dataProvider
-     * @param string|null $namespace
+     * @param string $namespace
+     * @param AuthorizationInterface|null $authorization
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
index 8f5dacc8159b5..75c7fc248541c 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
@@ -11,7 +11,11 @@
 
 use Magento\Framework\View\Element\UiComponent\Context;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\Element\UiComponent\Control\ActionPoolInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ContextTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -20,7 +24,7 @@ class ContextTest extends \PHPUnit\Framework\TestCase
     protected $context;
 
     /**
-     * @var \Magento\Framework\View\Element\UiComponent\Control\ActionPoolInterface
+     * @var ActionPoolInterface
      */
     private $actionPool;
 
@@ -43,7 +47,7 @@ protected function setUp()
             $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Control\ActionPoolFactory::class)
                 ->disableOriginalConstructor()
                 ->getMock();
-        $this->actionPool = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Control\ActionPoolInterface::class)
+        $this->actionPool = $this->getMockBuilder(ActionPoolInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $actionPoolFactory->method('create')->willReturn($this->actionPool);

From d1cb6934d72123c40a83e9fce99d6ce246ca826c Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Mon, 21 Jan 2019 16:14:53 +0300
Subject: [PATCH 754/932] MC-10934: Test failure
 StorefrontPurchaseProductWithCustomOptions

- Fix mftf test.
---
 .../Test/StorefrontPurchaseProductWithCustomOptionsTest.xml     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index d96399738c80a..951afa2ddb68b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -17,8 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-61717"/>
             <group value="Catalog"/>
-            <!-- skip due to MAGETWO-97424 -->
-            <group value="skip"/>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>

From d4de6ccde302a834e5757c8493533e13463af532 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 21 Jan 2019 15:42:56 +0200
Subject: [PATCH 755/932] Fix static tests.

---
 .../Magento/Sales/Model/Order/Payment.php     | 138 ++++++++++--------
 1 file changed, 81 insertions(+), 57 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 760124a496309..fc39755c94ee0 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -300,6 +300,8 @@ public function canCapture()
     }
 
     /**
+     * Check refund availability
+     *
      * @return bool
      */
     public function canRefund()
@@ -308,6 +310,8 @@ public function canRefund()
     }
 
     /**
+     * Check partial refund availability for invoice
+     *
      * @return bool
      */
     public function canRefundPartialPerInvoice()
@@ -316,6 +320,8 @@ public function canRefundPartialPerInvoice()
     }
 
     /**
+     * Check partial capture availability
+     *
      * @return bool
      */
     public function canCapturePartial()
@@ -325,6 +331,7 @@ public function canCapturePartial()
 
     /**
      * Authorize or authorize and capture payment on gateway, if applicable
+     *
      * This method is supposed to be called only when order is placed
      *
      * @return $this
@@ -540,7 +547,8 @@ public function cancelInvoice($invoice)
 
     /**
      * Create new invoice with maximum qty for invoice for each item
-     * register this invoice and capture
+     *
+     * Register this invoice and capture
      *
      * @return Invoice
      */
@@ -850,6 +858,7 @@ public function cancelCreditmemo($creditmemo)
 
     /**
      * Order cancellation hook for payment method instance
+     *
      * Adds void transaction if needed
      *
      * @return $this
@@ -885,6 +894,8 @@ public function canReviewPayment()
     }
 
     /**
+     * Check fetch transaction info availability
+     *
      * @return bool
      */
     public function canFetchTransactionInfo()
@@ -1192,6 +1203,11 @@ public function addTransaction($type, $salesDocument = null, $failSafe = false)
     }
 
     /**
+     * Add message to the specified transaction.
+     *
+     * @param Transaction|null $transaction
+     * @param string $message
+     * @return void
      */
     public function addTransactionCommentsToOrder($transaction, $message)
     {
@@ -1228,6 +1244,7 @@ public function importTransactionInfo(Transaction $transactionTo)
 
     /**
      * Totals updater utility method
+     *
      * Updates self totals by keys in data array('key' => $delta)
      *
      * @param array $data
@@ -1262,6 +1279,7 @@ protected function _appendTransactionToMessage($transaction, $message)
 
     /**
      * Prepend a "prepared_message" that may be set to the payment instance before, to the specified message
+     *
      * Prepends value to the specified string or to the comment of specified order status history item instance
      *
      * @param string|\Magento\Sales\Model\Order\Status\History $messagePrependTo
@@ -1304,6 +1322,7 @@ public function formatAmount($amount, $asFloat = false)
 
     /**
      * Format price with currency sign
+     *
      * @param float $amount
      * @return string
      */
@@ -1314,6 +1333,7 @@ public function formatPrice($amount)
 
     /**
      * Lookup an authorization transaction using parent transaction id, if set
+     *
      * @return Transaction|false
      */
     public function getAuthorizationTransaction()
@@ -1385,8 +1405,8 @@ public function resetTransactionAdditionalInfo()
     /**
      * Prepare credit memo
      *
-     * @param $amount
-     * @param $baseGrandTotal
+     * @param float $amount
+     * @param float $baseGrandTotal
      * @param false|Invoice $invoice
      * @return mixed
      */
@@ -1455,6 +1475,8 @@ protected function _getInvoiceForTransactionId($transactionId)
     }
 
     /**
+     * Get order state resolver instance.
+     *
      * @deprecated 100.2.0
      * @return OrderStateResolverInterface
      */
@@ -1993,7 +2015,7 @@ public function getShippingRefunded()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setParentId($id)
     {
@@ -2001,7 +2023,7 @@ public function setParentId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingCaptured($baseShippingCaptured)
     {
@@ -2009,7 +2031,7 @@ public function setBaseShippingCaptured($baseShippingCaptured)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingCaptured($shippingCaptured)
     {
@@ -2017,7 +2039,7 @@ public function setShippingCaptured($shippingCaptured)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAmountRefunded($amountRefunded)
     {
@@ -2025,7 +2047,7 @@ public function setAmountRefunded($amountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAmountPaid($baseAmountPaid)
     {
@@ -2033,7 +2055,7 @@ public function setBaseAmountPaid($baseAmountPaid)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAmountCanceled($amountCanceled)
     {
@@ -2041,7 +2063,7 @@ public function setAmountCanceled($amountCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAmountAuthorized($baseAmountAuthorized)
     {
@@ -2049,7 +2071,7 @@ public function setBaseAmountAuthorized($baseAmountAuthorized)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAmountPaidOnline($baseAmountPaidOnline)
     {
@@ -2057,7 +2079,7 @@ public function setBaseAmountPaidOnline($baseAmountPaidOnline)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAmountRefundedOnline($baseAmountRefundedOnline)
     {
@@ -2065,7 +2087,7 @@ public function setBaseAmountRefundedOnline($baseAmountRefundedOnline)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingAmount($amount)
     {
@@ -2073,7 +2095,7 @@ public function setBaseShippingAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingAmount($amount)
     {
@@ -2081,7 +2103,7 @@ public function setShippingAmount($amount)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAmountPaid($amountPaid)
     {
@@ -2089,7 +2111,7 @@ public function setAmountPaid($amountPaid)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAmountAuthorized($amountAuthorized)
     {
@@ -2097,7 +2119,7 @@ public function setAmountAuthorized($amountAuthorized)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAmountOrdered($baseAmountOrdered)
     {
@@ -2105,7 +2127,7 @@ public function setBaseAmountOrdered($baseAmountOrdered)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseShippingRefunded($baseShippingRefunded)
     {
@@ -2113,7 +2135,7 @@ public function setBaseShippingRefunded($baseShippingRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setShippingRefunded($shippingRefunded)
     {
@@ -2121,7 +2143,7 @@ public function setShippingRefunded($shippingRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAmountRefunded($baseAmountRefunded)
     {
@@ -2129,7 +2151,7 @@ public function setBaseAmountRefunded($baseAmountRefunded)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAmountOrdered($amountOrdered)
     {
@@ -2137,7 +2159,7 @@ public function setAmountOrdered($amountOrdered)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setBaseAmountCanceled($baseAmountCanceled)
     {
@@ -2145,7 +2167,7 @@ public function setBaseAmountCanceled($baseAmountCanceled)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setQuotePaymentId($id)
     {
@@ -2153,7 +2175,7 @@ public function setQuotePaymentId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAdditionalData($additionalData)
     {
@@ -2161,7 +2183,7 @@ public function setAdditionalData($additionalData)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcExpMonth($ccExpMonth)
     {
@@ -2169,7 +2191,7 @@ public function setCcExpMonth($ccExpMonth)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @deprecated 100.1.0 unused
      */
     public function setCcSsStartYear($ccSsStartYear)
@@ -2178,7 +2200,7 @@ public function setCcSsStartYear($ccSsStartYear)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEcheckBankName($echeckBankName)
     {
@@ -2186,7 +2208,7 @@ public function setEcheckBankName($echeckBankName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setMethod($method)
     {
@@ -2194,7 +2216,7 @@ public function setMethod($method)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcDebugRequestBody($ccDebugRequestBody)
     {
@@ -2202,7 +2224,7 @@ public function setCcDebugRequestBody($ccDebugRequestBody)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcSecureVerify($ccSecureVerify)
     {
@@ -2210,7 +2232,7 @@ public function setCcSecureVerify($ccSecureVerify)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setProtectionEligibility($protectionEligibility)
     {
@@ -2218,7 +2240,7 @@ public function setProtectionEligibility($protectionEligibility)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcApproval($ccApproval)
     {
@@ -2226,7 +2248,7 @@ public function setCcApproval($ccApproval)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcLast4($ccLast4)
     {
@@ -2234,7 +2256,7 @@ public function setCcLast4($ccLast4)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcStatusDescription($description)
     {
@@ -2242,7 +2264,7 @@ public function setCcStatusDescription($description)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEcheckType($echeckType)
     {
@@ -2250,7 +2272,7 @@ public function setEcheckType($echeckType)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcDebugResponseSerialized($ccDebugResponseSerialized)
     {
@@ -2258,7 +2280,7 @@ public function setCcDebugResponseSerialized($ccDebugResponseSerialized)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @deprecated 100.1.0 unused
      */
     public function setCcSsStartMonth($ccSsStartMonth)
@@ -2267,7 +2289,7 @@ public function setCcSsStartMonth($ccSsStartMonth)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEcheckAccountType($echeckAccountType)
     {
@@ -2275,7 +2297,7 @@ public function setEcheckAccountType($echeckAccountType)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLastTransId($id)
     {
@@ -2283,7 +2305,7 @@ public function setLastTransId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcCidStatus($ccCidStatus)
     {
@@ -2291,7 +2313,7 @@ public function setCcCidStatus($ccCidStatus)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcOwner($ccOwner)
     {
@@ -2299,7 +2321,7 @@ public function setCcOwner($ccOwner)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcType($ccType)
     {
@@ -2307,7 +2329,7 @@ public function setCcType($ccType)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPoNumber($poNumber)
     {
@@ -2315,7 +2337,7 @@ public function setPoNumber($poNumber)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcExpYear($ccExpYear)
     {
@@ -2323,7 +2345,7 @@ public function setCcExpYear($ccExpYear)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcStatus($ccStatus)
     {
@@ -2331,7 +2353,7 @@ public function setCcStatus($ccStatus)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEcheckRoutingNumber($echeckRoutingNumber)
     {
@@ -2339,7 +2361,7 @@ public function setEcheckRoutingNumber($echeckRoutingNumber)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAccountStatus($accountStatus)
     {
@@ -2347,7 +2369,7 @@ public function setAccountStatus($accountStatus)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAnetTransMethod($anetTransMethod)
     {
@@ -2355,7 +2377,7 @@ public function setAnetTransMethod($anetTransMethod)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcDebugResponseBody($ccDebugResponseBody)
     {
@@ -2363,7 +2385,7 @@ public function setCcDebugResponseBody($ccDebugResponseBody)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @deprecated 100.1.0 unused
      */
     public function setCcSsIssue($ccSsIssue)
@@ -2372,7 +2394,7 @@ public function setCcSsIssue($ccSsIssue)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEcheckAccountName($echeckAccountName)
     {
@@ -2380,7 +2402,7 @@ public function setEcheckAccountName($echeckAccountName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcAvsStatus($ccAvsStatus)
     {
@@ -2388,7 +2410,7 @@ public function setCcAvsStatus($ccAvsStatus)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcNumberEnc($ccNumberEnc)
     {
@@ -2396,7 +2418,7 @@ public function setCcNumberEnc($ccNumberEnc)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCcTransId($id)
     {
@@ -2404,7 +2426,7 @@ public function setCcTransId($id)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setAddressStatus($addressStatus)
     {
@@ -2412,7 +2434,7 @@ public function setAddressStatus($addressStatus)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Sales\Api\Data\OrderPaymentExtensionInterface|null
      */
@@ -2422,7 +2444,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Sales\Api\Data\OrderPaymentExtensionInterface $extensionAttributes
      * @return $this
@@ -2506,6 +2528,7 @@ public function getShouldCloseParentTransaction()
 
     /**
      * Set payment parent transaction id and current transaction id if it not set
+     *
      * @param Transaction $transaction
      * @return void
      */
@@ -2527,6 +2550,7 @@ private function setTransactionIdsForRefund(Transaction $transaction)
 
     /**
      * Collects order invoices totals by provided keys.
+     *
      * Returns result as {key: amount}.
      *
      * @param Order $order

From 07ad94445cac5977e2aafcb6f589f4db9bebdcb5 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 21 Jan 2019 16:40:43 +0200
Subject: [PATCH 756/932] ENGCOM-3901: Static test fix.

---
 .../luma/Magento_Checkout/web/css/source/module/_cart.less    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 807658769a29e..2b32c754308f9 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -694,8 +694,8 @@
                     position: static;
                 }
             }
-            &.discount{
-                width:auto;
+            &.discount {
+                width: auto;
             }
         }
     }

From a53a63e4631cf87570dd6fcef8045a67d5bc7c36 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Mon, 21 Jan 2019 16:04:06 +0100
Subject: [PATCH 757/932] API-functional tests added

---
 .../Magento/GraphQl/Quote/GetCartTest.php     | 171 ++++++++++++++++++
 .../Magento/Checkout/_files/active_quote.php  |   8 +
 2 files changed, 179 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
new file mode 100644
index 0000000000000..2cd100fc0f758
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
@@ -0,0 +1,171 @@
+<?php /** @noinspection SpellCheckingInspection */
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for getting cart information
+ */
+class GetCartTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->create(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->create(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     */
+    public function testGetOwnCartForRegisteredCustomer()
+    {
+        $reservedOrderId = 'test_order_item_with_items';
+        $this->quoteResource->load(
+            $this->quote,
+            $reservedOrderId,
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareGetCartQuery($maskedQuoteId);
+
+        $response = $this->sendRequestWithToken($query);
+
+        self::assertArrayHasKey('Cart', $response);
+        self::assertNotEmpty($response['Cart']['items']);
+        self::assertNotEmpty($response['Cart']['addresses']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_items_saved.php
+     */
+    public function testGetCartFromAnotherCustomer()
+    {
+        $reservedOrderId = 'test_order_item_with_items';
+        $this->quoteResource->load(
+            $this->quote,
+            $reservedOrderId,
+            'reserved_order_id'
+        );
+
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareGetCartQuery($maskedQuoteId);
+
+        self::expectExceptionMessage("The current user cannot perform operations on cart \"$maskedQuoteId\"");
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testGetCartForGuest()
+    {
+        $reservedOrderId = 'test_order_1';
+        $this->quoteResource->load(
+            $this->quote,
+            $reservedOrderId,
+            'reserved_order_id'
+        );
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $query = $this->prepareGetCartQuery($maskedQuoteId);
+
+        $response = $this->graphQlQuery($query);
+
+        self::assertArrayHasKey('Cart', $response);
+    }
+
+    public function testGetNonExistentCart()
+    {
+        $maskedQuoteId = 'non_existent_masked_id';
+        $query = $this->prepareGetCartQuery($maskedQuoteId);
+
+        self::expectExceptionMessage("Could not find a cart with ID \"$maskedQuoteId\"");
+
+        $this->graphQlQuery($query);
+    }
+
+    /**
+     * Generates query for setting the specified shipping method on cart
+     *
+     * @param string $maskedQuoteId
+     * @return string
+     */
+    private function prepareGetCartQuery(
+        string $maskedQuoteId
+    ) : string {
+        return <<<QUERY
+{
+  Cart(cart_id: "$maskedQuoteId") {
+    applied_coupon {
+    	  code
+    }
+    items {
+      id
+    }
+    addresses {
+      firstname,
+      lastname,
+      address_type
+    }
+  }
+}
+
+QUERY;
+    }
+
+    /**
+     * Sends a GraphQL request with using a bearer token
+     *
+     * @param string $query
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function sendRequestWithToken(string $query): array
+    {
+
+        $customerToken = $this->customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+
+        return $this->graphQlQuery($query, [], '', $headerMap);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php
index 2d948ebeb0128..6b569f37a1a9f 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php
@@ -9,3 +9,11 @@
     ->setIsMultiShipping(false)
     ->setReservedOrderId('test_order_1')
     ->save();
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+    ->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
\ No newline at end of file

From eb60f47f8a5686676aa47ec9b85878d0c3d4c84c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 21 Jan 2019 17:06:06 +0200
Subject: [PATCH 758/932] ENGCOM-3771: Static test fix.

---
 .../Magento/CatalogInventory/Model/StockManagement.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
index 28ec2977358b1..5d7d099dc01a0 100644
--- a/app/code/Magento/CatalogInventory/Model/StockManagement.php
+++ b/app/code/Magento/CatalogInventory/Model/StockManagement.php
@@ -85,6 +85,7 @@ public function __construct(
 
     /**
      * Subtract product qtys from stock.
+     *
      * Return array of items that require full save.
      *
      * @param string[] $items
@@ -141,10 +142,7 @@ public function registerProductsSale($items, $websiteId = null)
     }
 
     /**
-     * @param string[] $items
-     * @param int|null $websiteId
-     *
-     * @return array|bool
+     * @inheritdoc
      */
     public function revertProductsSale($items, $websiteId = null)
     {
@@ -206,6 +204,8 @@ protected function getProductType($productId)
     }
 
     /**
+     * Get stock resource.
+     *
      * @return ResourceStock
      */
     protected function getResource()

From 5c5cf876d7d8f9a50753e4bfb74e53425fcb17c3 Mon Sep 17 00:00:00 2001
From: Sergey Shvets <sshvets@magento.com>
Date: Mon, 21 Jan 2019 17:18:00 +0200
Subject: [PATCH 759/932] MAGETWO-97345: [Magento Cloud] Import doesn't work
 with skip error entries

---
 .../Magento/CatalogImportExport/Model/Import/Product.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 159ee13a381b0..45748022779db 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -3106,14 +3106,14 @@ private function retrieveProductBySku($sku)
      *
      * @param int $rowNum
      * @param string $errorCode Error code or simply column name
-     * @param string $errorLevel
-     * @param string $colName OPTIONAL Column name.
+     * @param string $errorLevel error level
+     * @param string|null $colName optional column name
      * @return $this
      */
     private function skipRow(
         $rowNum,
         string $errorCode,
-        $errorLevel = ProcessingError::ERROR_LEVEL_NOT_CRITICAL,
+        string $errorLevel = ProcessingError::ERROR_LEVEL_NOT_CRITICAL,
         $colName = null
     ): self {
         $this->addRowError($errorCode, $rowNum, $colName, null, $errorLevel);

From f7b40b26b7b8cd37067d55182276b6c6a7f18205 Mon Sep 17 00:00:00 2001
From: Vasilii <v.burlacu@atwix.com>
Date: Tue, 22 Jan 2019 11:25:32 +0200
Subject: [PATCH 760/932] magento/graphql-ce#317 - [ThemeGraphql] Getting
 values from StoreConfig is not possible

---
 .../Magento/ThemeGraphQl/etc/graphql/di.xml   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 app/code/Magento/ThemeGraphQl/etc/graphql/di.xml

diff --git a/app/code/Magento/ThemeGraphQl/etc/graphql/di.xml b/app/code/Magento/ThemeGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..9f55e522bf5a1
--- /dev/null
+++ b/app/code/Magento/ThemeGraphQl/etc/graphql/di.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
+        <arguments>
+            <argument name="extendedConfigData" xsi:type="array">
+                <item name="head_shortcut_icon" xsi:type="string">design/head/shortcut_icon</item>
+                <item name="default_title" xsi:type="string">design/head/default_title</item>
+                <item name="title_prefix" xsi:type="string">design/head/title_prefix</item>
+                <item name="title_suffix" xsi:type="string">design/head/title_suffix</item>
+                <item name="default_description" xsi:type="string">design/head/default_description</item>
+                <item name="default_keywords" xsi:type="string">design/head/default_keywords</item>
+                <item name="head_includes" xsi:type="string">design/head/includes</item>
+                <item name="demonotice" xsi:type="string">design/head/demonotice</item>
+                <item name="header_logo_src" xsi:type="string">design/header/logo_src</item>
+                <item name="logo_width" xsi:type="string">design/header/logo_width</item>
+                <item name="logo_height" xsi:type="string">design/header/logo_height</item>
+                <item name="logo_alt" xsi:type="string">design/header/logo_alt</item>
+                <item name="welcome" xsi:type="string">design/header/welcome</item>
+                <item name="absolute_footer" xsi:type="string">design/footer/absolute_footer</item>
+                <item name="copyright" xsi:type="string">design/footer/copyright</item>
+            </argument>
+        </arguments>
+    </type>
+</config>

From 6829ce8e572c61ee38566eb16f9d3b1381f704b2 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 22 Jan 2019 11:35:33 +0200
Subject: [PATCH 761/932] Fix static test.

---
 app/code/Magento/Swatches/Model/ResourceModel/Swatch.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
index 313ad809beb61..9ad62265be21f 100644
--- a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
+++ b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
@@ -7,8 +7,9 @@
 namespace Magento\Swatches\Model\ResourceModel;
 
 /**
- * @codeCoverageIgnore
  * Swatch Resource Model
+ *
+ * @codeCoverageIgnore
  * @api
  * @since 100.0.2
  */
@@ -25,8 +26,10 @@ protected function _construct()
     }
 
     /**
-     * @param string $defaultValue
+     * Update default swatch option value.
+     *
      * @param integer $id
+     * @param string $defaultValue
      * @return void
      */
     public function saveDefaultSwatchOption($id, $defaultValue)

From 0689a17f50c1df4e73ff44f4c871dc7907800094 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 22 Jan 2019 14:00:54 +0200
Subject: [PATCH 762/932] Fix static test.

---
 .../Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
index f3852d7292339..67a0dc469163b 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -18,6 +18,8 @@
 use Magento\Sales\Model\Service\InvoiceService;
 
 /**
+ * Save invoice controller.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Save extends \Magento\Backend\App\Action implements HttpPostActionInterface
@@ -103,6 +105,7 @@ protected function _prepareShipment($invoice)
 
     /**
      * Save invoice
+     *
      * We can save only new invoice. Existing invoices are not editable
      *
      * @return \Magento\Framework\Controller\ResultInterface

From 86685289a45c89fba908c3c620a03387bb02a260 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 22 Jan 2019 14:18:14 +0200
Subject: [PATCH 763/932] Fix static tests.

---
 .../Observer/AfterImportDataObserver.php              | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index cdee3aaaa331e..9aaa384776855 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -200,6 +200,7 @@ public function __construct(
 
     /**
      * Action after data import.
+     *
      * Save new url rewrites and remove old if exist.
      *
      * @param Observer $observer
@@ -268,6 +269,8 @@ protected function _populateForUrlGeneration($rowData)
     }
 
     /**
+     * Add store id to product data.
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param array $rowData
      * @return void
@@ -437,6 +440,8 @@ protected function currentUrlRewritesRegenerate()
     }
 
     /**
+     * Generate url-rewrite for outogenerated url-rewirte.
+     *
      * @param UrlRewrite $url
      * @param Category $category
      * @return array
@@ -471,6 +476,8 @@ protected function generateForAutogenerated($url, $category)
     }
 
     /**
+     * Generate url-rewrite for custom url-rewirte.
+     *
      * @param UrlRewrite $url
      * @param Category $category
      * @return array
@@ -504,6 +511,8 @@ protected function generateForCustom($url, $category)
     }
 
     /**
+     * Retrieve category from url metadata.
+     *
      * @param UrlRewrite $url
      * @return Category|null|bool
      */
@@ -518,6 +527,8 @@ protected function retrieveCategoryFromMetadata($url)
     }
 
     /**
+     * Check, category suited for url-rewrite generation.
+     *
      * @param \Magento\Catalog\Model\Category $category
      * @param int $storeId
      * @return bool

From c33a84d6d10e04aaa94d0c8e83d07a92fc484cbb Mon Sep 17 00:00:00 2001
From: Parag Chavare <parag@2jcommerce.in>
Date: Tue, 22 Jan 2019 17:49:41 +0530
Subject: [PATCH 764/932] 
 Fixed-Product-page-tabbing-content-misalignment-in-mobile-view :: Product
 Page tabbing Content Misaligned in mobile view

---
 .../Magento/blank/web/css/source/_sections.less     |  8 ++++++++
 .../Magento/luma/web/css/source/_sections.less      | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_sections.less b/app/design/frontend/Magento/blank/web/css/source/_sections.less
index f0a3518c92a8b..25f8c71f22dd5 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_sections.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_sections.less
@@ -34,5 +34,13 @@
         .data.item {
             display: block;
         }
+      .item.title {
+        >.switch{
+          padding: 1px 15px 1px;
+        }
+      }
+      >.item.content{
+        padding: 10px 15px 30px;
+      }
     }
 }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_sections.less b/app/design/frontend/Magento/luma/web/css/source/_sections.less
index 73665fd22da23..38b936c83cb95 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_sections.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_sections.less
@@ -75,3 +75,16 @@
         }
     }
 }
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+  .product.data.items{
+    .item.title {
+      >.switch{
+        padding: 1px 15px 1px;
+      }
+    }
+    >.item.content{
+      padding: 10px 15px 30px;
+    }
+  }
+}

From 25014404ff371490a8f2ccc88cc1afca20749cf0 Mon Sep 17 00:00:00 2001
From: Iurii Ivashchenko <iivashchenko@magento.com>
Date: Tue, 22 Jan 2019 14:55:01 +0200
Subject: [PATCH 765/932] MAGETWO-95935: Allow Validation of customer address
 attributes to include spaces

- suppress phpmd warning
---
 app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index 50393b7d3ff9a..a20c146d68d92 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -15,6 +15,8 @@
 
 /**
  * Fields attribute merger.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AttributeMerger
 {

From 38d1473cdfb625d0e4f1f982f428bcbe7d6aac8e Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Tue, 22 Jan 2019 16:07:31 +0200
Subject: [PATCH 766/932] Fix static test.

---
 app/code/Magento/Theme/Model/PageLayout/Config/Builder.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 3306e5e32eb57..13b8aa23073ce 100644
--- a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -57,6 +57,8 @@ public function getPageLayoutsConfig()
     }
 
     /**
+     * Retrieve configuration files.
+     *
      * @return array
      */
     protected function getConfigFiles()

From a5c929a7cfd3df5418feb6baa000787a22ce3f75 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 22 Jan 2019 08:40:37 -0600
Subject: [PATCH 767/932] MC-6287: Button customization

- add button configuration default values
---
 app/code/Magento/Paypal/etc/config.xml | 30 ++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/config.xml b/app/code/Magento/Paypal/etc/config.xml
index 413470a1745f8..60b817d10e976 100644
--- a/app/code/Magento/Paypal/etc/config.xml
+++ b/app/code/Magento/Paypal/etc/config.xml
@@ -10,6 +10,30 @@
         <paypal>
             <style>
                 <logo></logo>
+                <checkout_page_button_customize>0</checkout_page_button_customize>
+                <checkout_page_button_label>paypal</checkout_page_button_label>
+                <checkout_page_button_layout>vertical</checkout_page_button_layout>
+                <checkout_page_button_size>responsive</checkout_page_button_size>
+                <checkout_page_button_shape>rect</checkout_page_button_shape>
+                <checkout_page_button_color>gold</checkout_page_button_color>
+                <product_page_button_customize>0</product_page_button_customize>
+                <product_page_button_label>paypal</product_page_button_label>
+                <product_page_button_layout>vertical</product_page_button_layout>
+                <product_page_button_size>responsive</product_page_button_size>
+                <product_page_button_shape>rect</product_page_button_shape>
+                <product_page_button_color>gold</product_page_button_color>
+                <cart_page_button_customize>0</cart_page_button_customize>
+                <cart_page_button_label>paypal</cart_page_button_label>
+                <cart_page_button_layout>vertical</cart_page_button_layout>
+                <cart_page_button_size>responsive</cart_page_button_size>
+                <cart_page_button_shape>rect</cart_page_button_shape>
+                <cart_page_button_color>gold</cart_page_button_color>
+                <mini_cart_page_button_customize>0</mini_cart_page_button_customize>
+                <mini_cart_page_button_label>paypal</mini_cart_page_button_label>
+                <mini_cart_page_button_layout>vertical</mini_cart_page_button_layout>
+                <mini_cart_page_button_size>responsive</mini_cart_page_button_size>
+                <mini_cart_page_button_shape>rect</mini_cart_page_button_shape>
+                <mini_cart_page_button_color>gold</mini_cart_page_button_color>
             </style>
             <wpp>
                 <api_password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
@@ -44,12 +68,6 @@
                 <child_authorization_number>1</child_authorization_number>
                 <verify_peer>1</verify_peer>
                 <skip_order_review_step>1</skip_order_review_step>
-                <checkout_page_button_customize>0</checkout_page_button_customize>
-                <checkout_page_button_label>paypal</checkout_page_button_label>
-                <checkout_page_button_layout>vertical</checkout_page_button_layout>
-                <checkout_page_button_size>responsive</checkout_page_button_size>
-                <checkout_page_button_shape>rect</checkout_page_button_shape>
-                <checkout_page_button_color>gold</checkout_page_button_color>
             </paypal_express>
             <paypal_express_bml>
                 <model>Magento\Paypal\Model\Bml</model>

From 512591378c7201c173b5750d95a5971c038c86f1 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Tue, 22 Jan 2019 09:32:13 -0600
Subject: [PATCH 768/932] MC-6295: Update ShipmentValidationRequest

- address review comments
---
 app/code/Magento/Dhl/Model/Carrier.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index accdd3902529f..eda7aee826487 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1434,8 +1434,8 @@ protected function _doRequest()
         $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
 
         $nodeMetaData = $nodeRequest->addChild('MetaData');
-        $nodeMetaData->addChild('SoftwareName', $this->productMetadata->getName());
-        $nodeMetaData->addChild('SoftwareVersion', $this->productMetadata->getVersion());
+        $nodeMetaData->addChild('SoftwareName', $this->buildSoftwareName());
+        $nodeMetaData->addChild('SoftwareVersion', $this->buildSoftwareVersion());
 
         $originRegion = $this->getCountryParams(
             $this->_scopeConfig->getValue(

From 13ab5eaa2c5229f87952ac2ce90e00ea718f6e3b Mon Sep 17 00:00:00 2001
From: Devagouda Patil <depatil@Devagoudas-MacBook-Pro.local>
Date: Tue, 22 Jan 2019 10:45:47 -0600
Subject: [PATCH 769/932] MC-5593: [Modularity] Braintree module MFTF contain
 wide used sections and action groups - removed duplicate entry of reports
 element

---
 app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
index 30c3c4bbca3b3..278a738b60f0f 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml
@@ -19,7 +19,6 @@
         <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
         <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
         <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
-        <element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
         <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
         <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
     </section>

From ad74fba18416c519c42898c8195d876b7ca05073 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Tue, 22 Jan 2019 11:25:04 -0600
Subject: [PATCH 770/932] MC-4245: Upgrade DHL schema to the latest

- fixed static test failures
---
 app/code/Magento/Dhl/Model/Carrier.php                      | 1 +
 app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php        | 1 -
 .../Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php | 2 +-
 .../Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml | 6 ++++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index eda7aee826487..685831138831c 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1609,6 +1609,7 @@ protected function _doRequest()
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
     {
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 0eb95b14d9727..ac458024fb65c 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -101,7 +101,6 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
      */
     private $productMetadataMock;
 
-
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php
index e623b5944ce7c..ddd7b2e4f97c5 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/dhl_quote_response_rates.php
@@ -28,4 +28,4 @@
         'cost' => 35.26,
         'method' => 'P'
     ]
-];
\ No newline at end of file
+];
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
index 896d631f01d50..e93753368f834 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
 <req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                      xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.2.xsd" schemaVersion="6.2">
     <Request xmlns="">

From 3320d6687ac5b2e666d98b5039270624b082f12c Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Tue, 22 Jan 2019 11:55:43 -0600
Subject: [PATCH 771/932] magento-engcom/magento2ce#2476: Fixed code style
 issue

---
 app/code/Magento/Wishlist/Controller/Index/Update.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index 332edbedc6ef4..b56aa4b5b3c8d 100755
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -6,10 +6,14 @@
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Controller\ResultFactory;
 
-class Update extends \Magento\Wishlist\Controller\AbstractIndex
+/**
+ * Class Update
+ */
+class Update extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Wishlist\Controller\WishlistProviderInterface

From 2640e04b1f7b4af259e66034395cb91a43aee792 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Tue, 22 Jan 2019 12:05:32 -0600
Subject: [PATCH 772/932] MC-5545: RSS feed works only from cache

---
 .../Catalog/Block/Adminhtml/Rss/NotifyStock.php     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
index eb6da28d268f7..c296a5aa0dbbd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/NotifyStock.php
@@ -9,6 +9,7 @@
 
 /**
  * Class NotifyStock
+ *
  * @package Magento\Catalog\Block\Adminhtml\Rss
  */
 class NotifyStock extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
@@ -41,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -50,7 +51,7 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRssData()
     {
@@ -73,7 +74,7 @@ public function getRssData()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCacheLifetime()
     {
@@ -81,7 +82,7 @@ public function getCacheLifetime()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isAllowed()
     {
@@ -89,7 +90,7 @@ public function isAllowed()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFeeds()
     {
@@ -97,7 +98,7 @@ public function getFeeds()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isAuthRequired()
     {

From b3c194f9319c0e9eea089bde7ce8a2307d5c9bcd Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 22 Jan 2019 15:09:05 -0600
Subject: [PATCH 773/932] GraphQl-93: Implement support for variables in query

-- Fixes after CR
---
 .../GraphQl/VariablesSupportQueryTest.php     | 72 +++++++++----------
 .../Magento/Framework/GraphQl/Config.php      | 13 +---
 .../Framework/GraphQl/ConfigInterface.php     |  8 ++-
 .../GraphQl/Schema/Type/TypeRegistry.php      |  1 -
 4 files changed, 39 insertions(+), 55 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
index 138547ecdbc38..20af9984cff8d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
@@ -14,11 +14,6 @@
 
 class VariablesSupportQueryTest extends GraphQlAbstract
 {
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
     /**
      * @var ProductRepositoryInterface
      */
@@ -26,65 +21,62 @@ class VariablesSupportQueryTest extends GraphQlAbstract
 
     protected function setUp()
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
     }
 
     /**
-     * Tests that Introspection is disabled when not in developer mode
-     *
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @magentoApiDataFixture Magento/Catalog/_files/products_list.php
      */
     public function testQueryObjectVariablesSupport()
     {
-        $productSku = 'simple';
+        $productSku = 'simple-249';
+        $minPrice = 153;
 
         $query
             = <<<'QUERY'
-query GetProductsQuery($page: Int, $filterInput: ProductFilterInput){
+query GetProductsQuery($pageSize: Int, $filterInput: ProductFilterInput, $priceSort: SortEnum) {
   products(
-    pageSize: 10
-    currentPage: $page
+    pageSize: $pageSize
     filter: $filterInput
-    sort: {}
+    sort: {price: $priceSort}
   ) {
     items {
-    	name
+      sku
+      price {
+        minimalPrice {
+          amount {
+            value
+            currency
+          }          
+        }
+      }
     }
   }
 }
 QUERY;
+
         $variables = [
-            'page' => 1,
+            'pageSize' => 1,
+            'priceSort' => 'ASC',
             'filterInput' => [
-                'sku' => [
-                    'like' => '%simple%'
-                ]
-            ]
+                'min_price' => [
+                    'gt' => 150,
+                ],
+            ],
         ];
 
         $response = $this->graphQlQuery($query, $variables);
         /** @var \Magento\Catalog\Model\Product $product */
         $product = $this->productRepository->get($productSku, false, null, true);
 
-        $this->assertArrayHasKey('products', $response);
-        $this->assertArrayHasKey('items', $response['products']);
-        $this->assertEquals(1, count($response['products']['items']));
-        $this->assertArrayHasKey(0, $response['products']['items']);
-        $this->assertFields($product, $response['products']['items'][0]);
-    }
-
-    /**
-     * @param ProductInterface $product
-     * @param array $actualResponse
-     */
-    private function assertFields($product, $actualResponse)
-    {
-        $assertionMap = [
-            ['response_field' => 'name', 'expected_value' => $product->getName()],
-        ];
-
-        $this->assertResponseFields($actualResponse, $assertionMap);
+        self::assertArrayHasKey('products', $response);
+        self::assertArrayHasKey('items', $response['products']);
+        self::assertEquals(1, count($response['products']['items']));
+        self::assertArrayHasKey(0, $response['products']['items']);
+        self::assertEquals($product->getSku(), $response['products']['items'][0]['sku']);
+        self::assertEquals(
+            $minPrice,
+            $response['products']['items'][0]['price']['minimalPrice']['amount']['value']
+        );
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Config.php b/lib/internal/Magento/Framework/GraphQl/Config.php
index 3873044007b4e..9be4f0c97948d 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config.php
@@ -48,12 +48,7 @@ public function __construct(
     }
 
     /**
-     * Get a data object with data pertaining to a GraphQL type's structural makeup.
-     *
-     * @param string $configElementName
-     * @return ConfigElementInterface
-     * @throws \LogicException
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @inheritdoc
      */
     public function getConfigElement(string $configElementName) : ConfigElementInterface
     {
@@ -81,11 +76,7 @@ public function getConfigElement(string $configElementName) : ConfigElementInter
     }
 
     /**
-     * Return all type names declared in a GraphQL schema's configuration and their type.
-     *
-     * Format is ['name' => 'example value', 'type' = 'example value']
-     *
-     * @return array $types
+     * @inheritdoc
      */
     public function getDeclaredTypes() : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php b/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php
index c2670967f1db5..f7d6cf49e180c 100644
--- a/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/GraphQl/ConfigInterface.php
@@ -25,9 +25,11 @@ interface ConfigInterface
     public function getConfigElement(string $configElementName) : ConfigElementInterface;
 
     /**
-     * Return all type names from a GraphQL schema's configuration.
+     * Return all type names declared in a GraphQL schema's configuration and their type.
      *
-     * @return string[]
+     * Format is ['name' => 'example value', 'type' = 'example value']
+     *
+     * @return array $types
      */
-    public function getDeclaredTypeNames() : array;
+    public function getDeclaredTypes() : array;
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
index 634975426cf80..cde8b6b3e446b 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php
@@ -9,7 +9,6 @@
 
 use Magento\Framework\GraphQl\ConfigInterface;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Schema\Type\InputTypeInterface;
 use Magento\Framework\GraphQl\Schema\TypeInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;

From 2e74cc1fc69558b0b7964d361c1ff0ebe0aafa0a Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 22 Jan 2019 17:22:26 -0600
Subject: [PATCH 774/932] GraphQl-93: Implement support for variables in query

-- Builds fixes
---
 .../GraphQl/VariablesSupportQueryTest.php     |  5 +-
 .../Magento/Framework/GraphQl/Config.php      |  2 +-
 .../GraphQl/Config/Element/FieldsFactory.php  | 62 +++++++++++++++++++
 .../GraphQl/Config/Element/InputFactory.php   | 32 +++-------
 .../GraphQl/Config/Element/TypeFactory.php    | 32 +++-------
 .../Framework/GraphQl/Query/Fields.php        |  8 +--
 .../GraphQl/Schema/SchemaGenerator.php        |  4 +-
 .../GraphQl/Schema/Type/Input/InputMapper.php |  3 +
 .../Output/ElementMapper/Formatter/Fields.php |  2 +-
 9 files changed, 89 insertions(+), 61 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Config/Element/FieldsFactory.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
index 20af9984cff8d..7448b165fc234 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/VariablesSupportQueryTest.php
@@ -7,9 +7,8 @@
 
 namespace Magento\GraphQl;
 
-use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\TestFramework\ObjectManager;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 
 class VariablesSupportQueryTest extends GraphQlAbstract
@@ -21,7 +20,7 @@ class VariablesSupportQueryTest extends GraphQlAbstract
 
     protected function setUp()
     {
-        $this->productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/GraphQl/Config.php b/lib/internal/Magento/Framework/GraphQl/Config.php
index 9be4f0c97948d..ec22b742b1d6c 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config.php
@@ -62,7 +62,7 @@ public function getConfigElement(string $configElementName) : ConfigElementInter
         $fieldsInQuery = $this->queryFields->getFieldsUsedInQuery();
         if (isset($data['fields'])) {
             if (!empty($fieldsInQuery)) {
-                foreach ($data['fields'] as $fieldName => $fieldConfig) {
+                foreach (array_keys($data['fields']) as $fieldName) {
                     if (!isset($fieldsInQuery[$fieldName])) {
                         unset($data['fields'][$fieldName]);
                     }
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldsFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldsFactory.php
new file mode 100644
index 0000000000000..ca6b67eac3d83
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/FieldsFactory.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+/**
+ * Fields object factory
+ */
+class FieldsFactory
+{
+    /**
+     * @var ArgumentFactory
+     */
+    private $argumentFactory;
+
+    /**
+     * @var FieldFactory
+     */
+    private $fieldFactory;
+
+    /**
+     * @param ArgumentFactory $argumentFactory
+     * @param FieldFactory $fieldFactory
+     */
+    public function __construct(
+        ArgumentFactory $argumentFactory,
+        FieldFactory $fieldFactory
+    ) {
+        $this->argumentFactory = $argumentFactory;
+        $this->fieldFactory = $fieldFactory;
+    }
+
+    /**
+     * Create a fields object from a configured array with optional arguments.
+     *
+     * Field data must contain name and type. Other values are optional and include required, itemType, description,
+     * and resolver. Arguments array must be in the format of [$argumentData['name'] => $argumentData].
+     *
+     * @param array $fieldsData
+     * @return Field[]
+     */
+    public function createFromConfigData(
+        array $fieldsData
+    ) : array {
+        $fields = [];
+        foreach ($fieldsData as $fieldData) {
+            $arguments = [];
+            foreach ($fieldData['arguments'] as $argumentData) {
+                $arguments[$argumentData['name']] = $this->argumentFactory->createFromConfigData($argumentData);
+            }
+            $fields[$fieldData['name']] = $this->fieldFactory->createFromConfigData(
+                $fieldData,
+                $arguments
+            );
+        }
+        return $fields;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
index 3d6e6a56781e0..0e7ccb831a5a4 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/InputFactory.php
@@ -22,28 +22,20 @@ class InputFactory implements ConfigElementFactoryInterface
     private $objectManager;
 
     /**
-     * @var ArgumentFactory
+     * @var FieldsFactory
      */
-    private $argumentFactory;
-
-    /**
-     * @var FieldFactory
-     */
-    private $fieldFactory;
+    private $fieldsFactory;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @param ArgumentFactory $argumentFactory
-     * @param FieldFactory $fieldFactory
+     * @param FieldsFactory $fieldsFactory
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ArgumentFactory $argumentFactory,
-        FieldFactory $fieldFactory
+        FieldsFactory $fieldsFactory
     ) {
         $this->objectManager = $objectManager;
-        $this->argumentFactory = $argumentFactory;
-        $this->fieldFactory = $fieldFactory;
+        $this->fieldsFactory = $fieldsFactory;
     }
 
     /**
@@ -54,18 +46,8 @@ public function __construct(
      */
     public function createFromConfigData(array $data): ConfigElementInterface
     {
-        $fields = [];
-        $data['fields'] = isset($data['fields']) ? $data['fields'] : [];
-        foreach ($data['fields'] as $field) {
-            $arguments = [];
-            foreach ($field['arguments'] as $argument) {
-                $arguments[$argument['name']] = $this->argumentFactory->createFromConfigData($argument);
-            }
-            $fields[$field['name']] = $this->fieldFactory->createFromConfigData(
-                $field,
-                $arguments
-            );
-        }
+        $fields = isset($data['fields']) ? $this->fieldsFactory->createFromConfigData($data['fields']) : [];
+
         return $this->create(
             $data,
             $fields
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
index f17d99be9bd65..5dd477a050890 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/TypeFactory.php
@@ -22,28 +22,20 @@ class TypeFactory implements ConfigElementFactoryInterface
     private $objectManager;
 
     /**
-     * @var ArgumentFactory
+     * @var FieldsFactory
      */
-    private $argumentFactory;
-
-    /**
-     * @var FieldFactory
-     */
-    private $fieldFactory;
+    private $fieldsFactory;
 
     /**
      * @param ObjectManagerInterface $objectManager
-     * @param ArgumentFactory $argumentFactory
-     * @param FieldFactory $fieldFactory
+     * @param FieldsFactory $fieldsFactory
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        ArgumentFactory $argumentFactory,
-        FieldFactory $fieldFactory
+        FieldsFactory $fieldsFactory
     ) {
         $this->objectManager = $objectManager;
-        $this->argumentFactory = $argumentFactory;
-        $this->fieldFactory = $fieldFactory;
+        $this->fieldsFactory = $fieldsFactory;
     }
 
     /**
@@ -54,18 +46,8 @@ public function __construct(
      */
     public function createFromConfigData(array $data): ConfigElementInterface
     {
-        $fields = [];
-        $data['fields'] = isset($data['fields']) ? $data['fields'] : [];
-        foreach ($data['fields'] as $field) {
-            $arguments = [];
-            foreach ($field['arguments'] as $argument) {
-                $arguments[$argument['name']] = $this->argumentFactory->createFromConfigData($argument);
-            }
-            $fields[$field['name']] = $this->fieldFactory->createFromConfigData(
-                $field,
-                $arguments
-            );
-        }
+        $fields = isset($data['fields']) ? $this->fieldsFactory->createFromConfigData($data['fields']) : [];
+
         return $this->create(
             $data,
             $fields
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
index 32f4e264f5eda..ae1d8d68d5bc7 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
@@ -44,7 +44,7 @@ public function setQuery($query, array $variables = null)
                 ]
             );
             if (isset($variables)) {
-                $queryFields = array_merge($queryFields, $this->extracttVariables($variables));
+                $queryFields = array_merge($queryFields, $this->extractVariables($variables));
             }
         } catch (\Exception $e) {
             // If a syntax error is encountered do not collect fields
@@ -75,12 +75,12 @@ public function getFieldsUsedInQuery()
      *
      * @return string[]
      */
-    private function extracttVariables(array $variables): array
+    private function extractVariables(array $variables): array
     {
         $fields = [];
-        foreach ($variables as $key => $value){
+        foreach ($variables as $key => $value) {
             if (is_array($value)){
-                $fields = array_merge($fields, $this->extracttVariables($value));
+                $fields = array_merge($fields, $this->extractVariables($value));
             }
             $fields[$key] = $key;
         }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
index ef78bea476f49..250b80defa6dd 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php
@@ -48,7 +48,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function generate() : Schema
     {
@@ -61,7 +61,7 @@ public function generate() : Schema
                 },
                 'types' => function () {
                     $typesImplementors = [];
-                    foreach ($this->config->getDeclaredTypeNames() as $type) {
+                    foreach ($this->config->getDeclaredTypes() as $type) {
                         $typesImplementors [] = $this->typeRegistry->get($type['name']);
                     }
                     return $typesImplementors;
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
index 95ab1635e968b..d1f48dada2cbd 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Input/InputMapper.php
@@ -13,6 +13,9 @@
 use Magento\Framework\GraphQl\Schema\Type\ScalarTypes;
 use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
 
+/**
+ * Prepare argument's metadata for GraphQL schema generation
+ */
 class InputMapper
 {
     /**
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
index 9c61211f84bde..034a5702090d9 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
@@ -79,7 +79,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function format(TypeInterface $configElement, OutputTypeInterface $outputType): array
     {

From 547b80b9ba59a127744a6b2e58f7b2efbdff2720 Mon Sep 17 00:00:00 2001
From: Ranee 2Jcommerce <ranee@2jcommerce.in>
Date: Wed, 23 Jan 2019 11:23:42 +0530
Subject: [PATCH 775/932] tooltip-dropdown-pointer :: Tooltip dropdown pointer
 not proper on tablet

---
 .../css/source/module/checkout/_tooltip.less  | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
index bf264a98f33b8..e42d8eb7a8dd7 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
@@ -147,3 +147,30 @@
         }
     }
 }
+
+//
+//  Tablet
+//  _____________________________________________
+@media only screen and (max-width: @screen__m) {
+    .field-tooltip .field-tooltip-content {
+        right: -10px;
+        top: 40px;
+        left: auto;
+    }
+    .field-tooltip .field-tooltip-content::before, .field-tooltip .field-tooltip-content::after {
+        border: 10px solid transparent;
+        height: 0;
+        width: 0;
+        margin-top: -21px;
+        right: 10px;
+        left: auto;
+        top: 0;
+    }
+    .field-tooltip .field-tooltip-content::before {
+        border-bottom-color: #666;
+    }
+    .field-tooltip .field-tooltip-content::after {
+        border-bottom-color: #f4f4f4;
+        top: 1px;
+    }
+}
\ No newline at end of file

From 86d38f6ee7c695fb258c3f510d260ebafe0c0751 Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Tue, 22 Jan 2019 15:18:04 +0000
Subject: [PATCH 776/932] MAGETWO-96847: [2.3.x] Special price does not work
 when "default config" scope timezone does not match "website" scope timezone

- Fix tests
---
 .../Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php  | 9 ++-------
 app/code/Magento/Catalog/Model/Product/Type/Price.php    | 1 +
 .../Mftf/Section/StorefrontProductInfoMainSection.xml    | 1 +
 .../Test/Unit/Model/Product/Type/Grouped/PriceTest.php   | 6 +++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
index f38dfc5538cf3..3e60e057fe62b 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Bundle\Test\Unit\Pricing\Price;
 
 use \Magento\Bundle\Pricing\Price\SpecialPrice;
+use Magento\Store\Api\Data\WebsiteInterface;
 
 class SpecialPriceTest extends \PHPUnit\Framework\TestCase
 {
@@ -77,12 +78,6 @@ public function testGetValue($regularPrice, $specialPrice, $isScopeDateInInterva
             ->method('getSpecialPrice')
             ->will($this->returnValue($specialPrice));
 
-        $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->saleable->expects($this->once())
-            ->method('getStore')
-            ->will($this->returnValue($store));
         $this->saleable->expects($this->once())
             ->method('getSpecialFromDate')
             ->will($this->returnValue($specialFromDate));
@@ -92,7 +87,7 @@ public function testGetValue($regularPrice, $specialPrice, $isScopeDateInInterva
 
         $this->localeDate->expects($this->once())
             ->method('isScopeDateInInterval')
-            ->with($store, $specialFromDate, $specialToDate)
+            ->with(WebsiteInterface::ADMIN_CODE, $specialFromDate, $specialToDate)
             ->will($this->returnValue($isScopeDateInInterval));
 
         $this->priceCurrencyMock->expects($this->never())
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index f9cf1522e3f70..b30624b79dd51 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -18,6 +18,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Price
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index b93a70559fc4a..5fa2262faba96 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -28,6 +28,7 @@
         <element name="productOptionAreaInput" type="textarea" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//textarea" parameterized="true"/>
         <element name="productOptionFile" type="file" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'OptionFile')]/../div[@class='control']//input[@type='file']" parameterized="true"/>
         <element name="productOptionSelect" type="select" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{var1}}')]/../div[@class='control']//select" parameterized="true"/>
+        <element name="specialPriceValue" type="text" selector="//span[@class='special-price']//span[@class='price']"/>
 
 
         <!-- The parameter is the nth custom option that you want to get -->
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
index f02849c244cb3..176c29add4837 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Product/Type/Grouped/PriceTest.php
@@ -64,7 +64,7 @@ public function testGetFinalPrice(
         $expectedFinalPrice
     ) {
         $rawFinalPrice = 10;
-        $rawPriceCheckStep = 6;
+        $rawPriceCheckStep = 5;
 
         $this->productMock->expects(
             $this->any()
@@ -155,7 +155,7 @@ public function getFinalPriceDataProvider()
             'custom_option_null' => [
                 'associatedProducts' => [],
                 'options' => [[], []],
-                'expectedPriceCall' => 6, /* product call number to check final price formed correctly */
+                'expectedPriceCall' => 5, /* product call number to check final price formed correctly */
                 'expectedFinalPrice' => 10, /* 10(product price) + 2(options count) * 5(qty) * 5(option price) */
             ],
             'custom_option_exist' => [
@@ -165,7 +165,7 @@ public function getFinalPriceDataProvider()
                     ['associated_product_2', $optionMock],
                     ['associated_product_3', $optionMock],
                 ],
-                'expectedPriceCall' => 16, /* product call number to check final price formed correctly */
+                'expectedPriceCall' => 15, /* product call number to check final price formed correctly */
                 'expectedFinalPrice' => 35, /* 10(product price) + 2(options count) * 5(qty) * 5(option price) */
             ]
         ];

From 6f10b643f4e8413a2837e851addac265d6ffca1c Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 23 Jan 2019 12:13:18 +0200
Subject: [PATCH 777/932] Fixing the styling issue on customizable options

---
 .../web/css/source/module/main/_collapsible-blocks.less    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index e8e2746717e6a..1e98fd79ab573 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -162,9 +162,12 @@
     &.collapsible-block-wrapper-last {
         border-bottom: 0;
     }
+
     .admin__dynamic-rows.admin__control-collapsible {   
-        .admin__collapsible-block-wrapper {
-            border-bottom: none;
+        td {
+            &.admin__collapsible-block-wrapper {
+                border-bottom: none;
+            }
         }
     }
 }

From 34e5c6dfe6358fb72b56415dce34464a47c28269 Mon Sep 17 00:00:00 2001
From: Parag Chavare <parag@2jcommerce.in>
Date: Wed, 23 Jan 2019 16:08:54 +0530
Subject: [PATCH 778/932] recent-order-product-title-misaligned

---
 .../Magento/blank/Magento_Catalog/web/css/source/_module.less    | 1 +
 .../Magento/luma/Magento_Catalog/web/css/source/_module.less     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
index 08a9b61977922..33fafc2339916 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -489,6 +489,7 @@
         .product-items-names {
             .product-item {
                 margin-bottom: @indent__s;
+              display: flex;
             }
 
             .product-item-name {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index 501a1d2918d6a..3905f6d4fcb29 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -564,6 +564,7 @@
         .product-items-names {
             .product-item {
                 margin-bottom: @indent__s;
+              display: flex;
             }
 
             .product-item-name {

From 67220e92412946891644ab4277c90baa00435f3b Mon Sep 17 00:00:00 2001
From: Denys Saltanahmedov <d.saltanakhmedov@atwix.com>
Date: Wed, 23 Jan 2019 13:44:27 +0200
Subject: [PATCH 779/932] Fixing swatch style issue on product attribute form
 #20513

---
 .../Magento/Swatches/view/adminhtml/web/css/swatches.css    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 1383634ef424c..ef635c48e3466 100644
--- a/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
+++ b/app/code/Magento/Swatches/view/adminhtml/web/css/swatches.css
@@ -150,7 +150,11 @@
 }
 
 .col-swatch-min-width {
-    min-width: 30px;
+    min-width: 65px;
+}
+
+.data-table .col-swatch-min-width input[type="text"] {
+    padding: inherit;
 }
 
 .swatches-visual-col.unavailable:after {

From 99f7f4ad3576f84dbffbf6fe35dc9487ef7a2270 Mon Sep 17 00:00:00 2001
From: Parag Chavare <parag@2jcommerce.in>
Date: Wed, 23 Jan 2019 17:55:52 +0530
Subject: [PATCH 780/932] bundle-product-radio-button-misalign

---
 .../Magento/luma/Magento_Bundle/web/css/source/_module.less      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
index 43ae23bab7895..99c8aa1ad2bae 100644
--- a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
@@ -58,6 +58,7 @@
             .field.choice {
                 input {
                     float: left;
+                    margin-top: 4px;
                 }
 
                 .label {

From cf1461de0e41a2c0a81fbd37a9630d60e8b91e0b Mon Sep 17 00:00:00 2001
From: Lewis Voncken <lewis@experius.nl>
Date: Wed, 23 Jan 2019 16:13:07 +0100
Subject: [PATCH 781/932] [TASK] Removed typo

---
 app/code/Magento/GroupedImportExport/etc/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/GroupedImportExport/etc/di.xml b/app/code/Magento/GroupedImportExport/etc/di.xml
index 38030b3ec94eb..25fd3b5697514 100644
--- a/app/code/Magento/GroupedImportExport/etc/di.xml
+++ b/app/code/Magento/GroupedImportExport/etc/di.xml
@@ -9,7 +9,7 @@
     <type name="Magento\CatalogImportExport\Model\Export\RowCustomizer\Composite">
         <arguments>
             <argument name="customizers" xsi:type="array">
-                <item name="gropedProduct" xsi:type="string">Magento\GroupedImportExport\Model\Export\RowCustomizer</item>
+                <item name="groupedProduct" xsi:type="string">Magento\GroupedImportExport\Model\Export\RowCustomizer</item>
             </argument>
         </arguments>
     </type>

From fe207b7b6dcf83a0768913c43eafc7ec3ee67fcf Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 23 Jan 2019 10:11:44 -0600
Subject: [PATCH 782/932] MC-11006: Build stabilization

---
 .../Controller/Express/GetTokenData.php       | 37 +++++++++++------
 .../Controller/Express/OnAuthorization.php    | 36 ++++++++++------
 app/code/Magento/Paypal/Model/Config.php      |  1 +
 .../Magento/Paypal/Model/Express/Checkout.php |  2 +
 .../Paypal/Model/ExpressConfigProvider.php    |  7 ++--
 .../System/Config/Source/ButtonStyles.php     | 25 +++--------
 .../Config/Source/DisableFundingOptions.php   |  8 ++--
 .../Patch/Data/UpdatePaypalCreditOption.php   | 37 +++++++++--------
 .../etc/adminhtml/system/express_checkout.xml |  2 +-
 .../Reader/_files/expected/config.xml         | 41 ++++++++++---------
 lib/web/mage/validation.js                    |  1 +
 11 files changed, 109 insertions(+), 88 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
index 2f8b5011d356c..f07251fb7b14a 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -13,6 +13,18 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Paypal\Model\Express\Checkout;
 use Magento\Paypal\Model\Config;
+use Magento\Framework\App\Action\Context;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Sales\Model\OrderFactory;
+use Magento\Paypal\Model\Express\Checkout\Factory as CheckoutFactory;
+use Magento\Framework\Session\Generic as PayPalSession;
+use Magento\Framework\Url\Helper\Data as UrlHelper;
+use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Customer\Model\ResourceModel\CustomerRepository;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\GuestCartRepositoryInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Retrieve paypal token
@@ -74,20 +86,21 @@ class GetTokenData extends AbstractExpress implements HttpGetActionInterface
      * @param \Magento\Customer\Model\ResourceModel\CustomerRepository $customerRepository
      * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
      * @param \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Sales\Model\OrderFactory $orderFactory,
-        \Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory,
-        \Magento\Framework\Session\Generic $paypalSession,
-        \Magento\Framework\Url\Helper\Data $urlHelper,
-        \Magento\Customer\Model\Url $customerUrl,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Customer\Model\ResourceModel\CustomerRepository $customerRepository,
-        \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
-        \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
+        Context $context,
+        CustomerSession $customerSession,
+        CheckoutSession $checkoutSession,
+        OrderFactory $orderFactory,
+        CheckoutFactory $checkoutFactory,
+        PayPalSession $paypalSession,
+        UrlHelper $urlHelper,
+        CustomerUrl $customerUrl,
+        LoggerInterface $logger,
+        CustomerRepository $customerRepository,
+        CartRepositoryInterface $cartRepository,
+        GuestCartRepositoryInterface $guestCartRepository
     ) {
         parent::__construct(
             $context,
diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index fd8985c1792a7..b46e8049c8fa3 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -12,6 +12,18 @@
 use Magento\Paypal\Model\Config as PayPalConfig;
 use Magento\Paypal\Model\Express\Checkout as PayPalCheckout;
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
+use Magento\Framework\App\Action\Context;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Sales\Model\OrderFactory;
+use Magento\Paypal\Model\Express\Checkout\Factory as CheckoutFactory;
+use Magento\Framework\Session\Generic as PayPalSession;
+use Magento\Framework\Url\Helper\Data as UrlHelper;
+use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Checkout\Api\AgreementsValidatorInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Quote\Api\GuestCartRepositoryInterface;
 
 /**
  * Processes data after returning from PayPal
@@ -67,18 +79,18 @@ class OnAuthorization extends AbstractExpress implements HttpPostActionInterface
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Sales\Model\OrderFactory $orderFactory,
-        \Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory,
-        \Magento\Framework\Session\Generic $paypalSession,
-        \Magento\Framework\Url\Helper\Data $urlHelper,
-        \Magento\Customer\Model\Url $customerUrl,
-        \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator,
-        \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
-        \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
+        Context $context,
+        CustomerSession $customerSession,
+        CheckoutSession $checkoutSession,
+        OrderFactory $orderFactory,
+        CheckoutFactory $checkoutFactory,
+        PayPalSession $paypalSession,
+        UrlHelper $urlHelper,
+        CustomerUrl $customerUrl,
+        AgreementsValidatorInterface $agreementValidator,
+        CartRepositoryInterface $cartRepository,
+        UrlInterface $urlBuilder,
+        GuestCartRepositoryInterface $guestCartRepository
     ) {
         parent::__construct(
             $context,
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index f1a4979e0b1a0..4d70b2551bbf4 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1635,6 +1635,7 @@ protected function _mapWpukFieldset($fieldName)
      *
      * @param string $fieldName
      * @return string|null
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _mapGenericStyleFieldset($fieldName)
     {
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index 28200d6eb212a..b98d88b0e7d90 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -21,6 +21,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Checkout
 {
@@ -617,6 +618,7 @@ public function canSkipOrderReviewStep()
      * @param string|null $payerIdentifier
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function returnFromPaypal($token, string $payerIdentifier = null)
     {
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index b1f5b6df9f9cc..5628701dc0112 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -67,7 +67,7 @@ class ExpressConfigProvider implements ConfigProviderInterface
     protected $urlBuilder;
 
     /**
-     *
+     * @var SmartButtonConfig
      */
     private $smartButtonConfig;
 
@@ -89,7 +89,7 @@ public function __construct(
         PaypalHelper $paypalHelper,
         PaymentHelper $paymentHelper,
         UrlInterface $urlBuilder,
-        SmartButtonConfig $smartButtonConfig = null
+        SmartButtonConfig $smartButtonConfig
     ) {
         $this->localeResolver = $localeResolver;
         $this->config = $configFactory->create();
@@ -97,12 +97,11 @@ public function __construct(
         $this->paypalHelper = $paypalHelper;
         $this->paymentHelper = $paymentHelper;
         $this->urlBuilder = $urlBuilder;
+        $this->smartButtonConfig = $smartButtonConfig;
 
         foreach ($this->methodCodes as $code) {
             $this->methods[$code] = $this->paymentHelper->getMethodInstance($code);
         }
-
-        $this->smartButtonConfig = $smartButtonConfig ?: ObjectManager::getInstance()->get(SmartButtonConfig::class);
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
index e427421ba26cb..726bf03257933 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
@@ -91,19 +91,9 @@ public function getLabel(): array
      */
     public function getBrInstallmentPeriod(): array
     {
-        return [
-            2 => 2,
-            3 => 3,
-            4 => 4,
-            5 => 5,
-            6 => 6,
-            7 => 7,
-            8 => 8,
-            9 => 9,
-            10 => 10,
-            11 => 11,
-            12 => 12
-        ];
+        $numbers = range(2,12);
+
+        return array_combine($numbers, $numbers);
     }
 
     /**
@@ -113,11 +103,8 @@ public function getBrInstallmentPeriod(): array
      */
     public function getMxInstallmentPeriod(): array
     {
-        return [
-            3 => 3,
-            6 => 6,
-            9 => 9,
-            12 => 12
-        ];
+        $numbers = range(3,12,3);
+
+        return array_combine($numbers, $numbers);
     }
 }
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
index b2f70f6be7e69..4f4a81e36a2c0 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Paypal\Model\System\Config\Source;
 
+use Magento\Paypal\Model\Express\Checkout;
+
 /**
  * Get disable funding options
  */
@@ -19,15 +21,15 @@ public function toOptionArray(): array
     {
         return [
             [
-                'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CREDIT,
+                'value' => Checkout::PAYPAL_FUNDING_CREDIT,
                 'label' => __('PayPal Credit')
             ],
             [
-                'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CARD,
+                'value' => Checkout::PAYPAL_FUNDING_CARD,
                 'label' => __('PayPal Guest Checkout Credit Card Icons')
             ],
             [
-                'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_ELV,
+                'value' => Checkout::PAYPAL_FUNDING_ELV,
                 'label' => __('Elektronisches Lastschriftverfahren - German ELV')
             ]
         ];
diff --git a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
index ce7e59bbd8e5e..737780762cf66 100644
--- a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
+++ b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
@@ -38,27 +38,30 @@ public function apply()
     {
         $this->moduleDataSetup->getConnection()->startSetup();
         $connection = $this->moduleDataSetup->getConnection();
-        $select = $connection->select()->from(
-            $this->moduleDataSetup->getTable('core_config_data'),
-            ['scope', 'scope_id', 'value']
-        )->where(
-            'path = ?',
-            'payment/paypal_express_bml/active'
-        );
+        $select = $connection->select()
+            ->from(
+                $this->moduleDataSetup->getTable('core_config_data'),
+                ['scope', 'scope_id', 'value']
+            )->where(
+                'path = ?',
+                'payment/paypal_express_bml/active'
+            );
         foreach ($connection->fetchAll($select) as $pair) {
             if (!$pair['value']) {
-                $this->moduleDataSetup->getConnection()->insert(
-                    $this->moduleDataSetup->getTable('core_config_data'),
-                    [
-                        'scope' => $pair['scope'],
-                        'scope_id' => $pair['scope_id'],
-                        'path' => 'payment/paypal_express/disable_funding_options',
-                        'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CREDIT
-                    ]
-                );
+                $this->moduleDataSetup->getConnection()
+                    ->insert(
+                        $this->moduleDataSetup->getTable('core_config_data'),
+                        [
+                            'scope' => $pair['scope'],
+                            'scope_id' => $pair['scope_id'],
+                            'path' => 'payment/paypal_express/disable_funding_options',
+                            'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CREDIT
+                        ]
+                    );
             }
         }
-        $this->moduleDataSetup->getConnection()->endSetup();
+        $this->moduleDataSetup->getConnection()
+            ->endSetup();
     }
 
     /**
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index d74e4adb2220c..060f62b86b062 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -650,7 +650,7 @@
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
-                    <group id="checkout_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
+                    <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
                         <label>PayPal Button - Checkout Page</label>
                         <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                             <label>Customize Button</label>
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index 778929f06c816..f87c768d739f4 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -1225,14 +1225,15 @@
                                 <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                                     <label>Customize Button</label>
                                     <comment><![CDATA[Customize the display of the PayPal button in the Checkout.]]></comment>
-                                    <config_path>payment/paypal_express/checkout_page_button_customize</config_path>
+                                    <config_path>paypal/style/checkout_page_button_customize</config_path>
                                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                                     <attribute type="shared">1</attribute>
                                 </field>
-                                <field id="checkout_page_button_label" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                                <field id="checkout_page_button_label" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                                     <label>Label</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_label</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Label::getCheckoutLabel</source_model>
+                                    <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
+                                    <config_path>paypal/style/checkout_page_button_label</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                     </depends>
@@ -1240,8 +1241,8 @@
                                 </field>
                                 <field id="checkout_page_button_mx_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                                     <label>Mexico Installment Period</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_mx_installment_period</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutMxInstallmentPeriod</source_model>
+                                    <config_path>paypal/style/checkout_page_button_mx_installment_period</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getMxInstallmentPeriod</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                         <field id="checkout_page_button_label">installment</field>
@@ -1250,8 +1251,8 @@
                                 </field>
                                 <field id="checkout_page_button_br_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                                     <label>Brazil Installment Period</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_br_installment_period</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutBrInstallmentPeriod</source_model>
+                                    <config_path>paypal/style/checkout_page_button_br_installment_period</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getBrInstallmentPeriod</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                         <field id="checkout_page_button_label">installment</field>
@@ -1260,8 +1261,8 @@
                                 </field>
                                 <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
                                     <label>Layout</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_layout</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Layout::getCheckoutLayout</source_model>
+                                    <config_path>paypal/style/checkout_page_button_layout</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLayout</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                         <field id="checkout_page_button_label" negative="1">credit</field>
@@ -1270,8 +1271,8 @@
                                 </field>
                                 <field id="checkout_page_button_size" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
                                     <label>Size</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Size::getCheckoutSize</source_model>
+                                    <config_path>paypal/style/checkout_page_button_size</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getSize</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                     </depends>
@@ -1279,8 +1280,8 @@
                                 </field>
                                 <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
                                     <label>Shape</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_shape</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Shape::getCheckoutShape</source_model>
+                                    <config_path>paypal/style/checkout_page_button_shape</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getShape</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                     </depends>
@@ -1288,8 +1289,8 @@
                                 </field>
                                 <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
                                     <label>Color</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_color</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Color::getCheckoutColor</source_model>
+                                    <config_path>paypal/style/checkout_page_button_color</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getColor</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                         <field id="checkout_page_button_label" negative="1">credit</field>
@@ -1297,17 +1298,17 @@
                                     <attribute type="shared">1</attribute>
                                 </field>
                             </group>
-                            <group id="features" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                            <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                                 <label>Features</label>
                                 <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                                     <label>Disable Funding Options</label>
                                     <comment>
                                         <![CDATA[PayPal will automatically display each enabled funding option to eligible buyers.
-                                For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is
+                                For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is
                                 offered and the currency offered by the merchant is USD.]]>
                                     </comment>
-                                    <config_path>payment/paypal_express/disable_funding_options</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\DisableFundingOptions</source_model>
+                                    <config_path>paypal/style/disable_funding_options</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\DisableFundingOptions</source_model>
                                     <attribute type="shared">1</attribute>
                                 </field>
                             </group>
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index b180f8791cd4f..dfa35473176b9 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1816,6 +1816,7 @@
                 valid = false;
                 errors[element.get(0).name] = this.messages[className];
                 validator.invalid[element.get(0).name] = true;
+
                 if (!validateConfig.hideError) {
                     validator.showErrors(errors);
                 }

From 6bac940657d1a8b428f85f7ae2e09f40bd97379a Mon Sep 17 00:00:00 2001
From: Oksana_Kremen <Oksana_Kremen@epam.com>
Date: Wed, 23 Jan 2019 18:41:26 +0200
Subject: [PATCH 783/932] MAGETWO-96406: [2.3.x] Swatch Attribute is not
 displayed in the Widget CMS

- Fixes for static tests and automation test
---
 .../view/frontend/layout/catalog_widget_product_list.xml        | 2 +-
 .../Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml     | 1 -
 app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml       | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml b/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
index 9a6d704ecce9b..db44d8b62dc1a 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
+++ b/app/code/Magento/CatalogWidget/view/frontend/layout/catalog_widget_product_list.xml
@@ -10,7 +10,7 @@
 
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <block class="Magento\Framework\View\Element\RendererList" name="category.product.type.widget.details.renderers" alias="details.renderers">
+        <block class="Magento\Framework\View\Element\RendererList" name="category.product.type.widget.details.renderers">
             <block class="Magento\Framework\View\Element\Template" name="category.product.type.details.renderers.default" as="default"/>
         </block>
     </body>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
index 7c8694a247dee..a4b88c544de88 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CreateNewPageWithWidgetActionGroup.xml
@@ -30,7 +30,6 @@
         <click selector="{{WidgetSection.RuleParam}}" stepKey="clickToAddRuleParam"/>
         <click selector="{{WidgetSection.Chooser}}" stepKey="clickToSelectFromList"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <click selector="{{WidgetSection.RuleParamListExpander('1')}}" stepKey="expandRootCategory"/>
         <click selector="{{WidgetSection.PreCreateCategory(category)}}" stepKey="selectPreCategory" />
         <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickToSaveInsertedWidget"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index 101e694d75f55..c7ea85e441bb9 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -101,7 +101,6 @@
         <element name="RuleParamSelect" type="select" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//select" parameterized="true"/>
         <element name="RuleParamInput" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//input" parameterized="true"/>
         <element name="RuleParamLabel" type="input" selector="//ul[contains(@class,'rule-param-children')]/li[{{arg1}}]//*[contains(@class,'rule-param')][{{arg2}}]//a" parameterized="true"/>
-        <element name="RuleParamListExpander" selector="//div[@class='rule-chooser']//ul[contains(@class,'x-tree-root')]//li[{{arg3}}]//img[contains(@class,'x-tree-elbow-end-plus')]" parameterized="true"/>
         <element name="Chooser" type="button" selector="//img[@title='Open Chooser']"/>
         <element name="PageSize" type="input" selector="input[name='parameters[page_size]']"/>
         <element name="ProductAttribute" type="multiselect" selector="select[name='parameters[show_attributes][]']" />

From 4e0435269dbe8589ad7cc871b831ce0b1268e828 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <korshenk@adobe.com>
Date: Wed, 23 Jan 2019 11:52:25 -0600
Subject: [PATCH 784/932] Update ActionDeleteTest.php

Updated format to pass code style tests
---
 .../Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
index a50e7b6aee42d..2cb35c7b85ddc 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/ActionDeleteTest.php
@@ -13,7 +13,7 @@
 class ActionDeleteTest extends AbstractElementTest
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getModelName()
     {
@@ -21,7 +21,7 @@ protected function getModelName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function testGetComponentName()
     {

From 2f39cf0fcb1d2b54c1bab3d1f545cb1fcf727108 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <korshenk@adobe.com>
Date: Wed, 23 Jan 2019 11:52:46 -0600
Subject: [PATCH 785/932] Update CheckboxSetTest.php

Updated format to pass code style tests
---
 .../Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
index bef5c184ee38b..3f00fa6c7ff34 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/CheckboxSetTest.php
@@ -15,7 +15,7 @@
 class CheckboxSetTest extends AbstractElementTest
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getModelName()
     {
@@ -23,7 +23,7 @@ protected function getModelName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function testGetComponentName()
     {

From 8f934c21dc1e57f14f166dcf28ba985fda94db26 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <korshenk@adobe.com>
Date: Wed, 23 Jan 2019 11:53:09 -0600
Subject: [PATCH 786/932] Update MultiSelectTest.php

Updated format to pass code style tests
---
 .../Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
index bc8eae46fd53f..f37ca38a8d9bc 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/MultiSelectTest.php
@@ -15,7 +15,7 @@
 class MultiSelectTest extends AbstractElementTest
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getModelName()
     {
@@ -23,7 +23,7 @@ protected function getModelName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function testGetComponentName()
     {

From e381abfc2478183f2ce8ec13f263f66179b753e1 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <korshenk@adobe.com>
Date: Wed, 23 Jan 2019 11:53:31 -0600
Subject: [PATCH 787/932] Update RadioSetTest.php

Updated format to pass code style tests
---
 .../Ui/Test/Unit/Component/Form/Element/RadioSetTest.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
index d0a252b6c68c7..67150e3c8fd3c 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/RadioSetTest.php
@@ -15,7 +15,7 @@
 class RadioSetTest extends AbstractElementTest
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getModelName()
     {
@@ -23,7 +23,7 @@ protected function getModelName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function testGetComponentName()
     {

From f6407d0f2ec011a2154cf4ec69b971c42f58d322 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <korshenk@adobe.com>
Date: Wed, 23 Jan 2019 11:55:19 -0600
Subject: [PATCH 788/932] Update SelectTest.php

Updated format to pass code style tests
---
 .../Ui/Test/Unit/Component/Form/Element/SelectTest.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
index 1ba5714f7ba3f..d4677192cc084 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/SelectTest.php
@@ -15,7 +15,7 @@
 class SelectTest extends AbstractElementTest
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getModelName()
     {
@@ -23,7 +23,7 @@ protected function getModelName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function testGetComponentName()
     {

From bd60b6ba5925d6a452a02504c19b827e93088f90 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <korshenk@adobe.com>
Date: Wed, 23 Jan 2019 11:55:53 -0600
Subject: [PATCH 789/932] Update WysiwygTest.php

Updated format to pass code style tests
---
 .../Ui/Test/Unit/Component/Form/Element/WysiwygTest.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
index 0bfa5a93d3640..4bfd952a6c566 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
@@ -85,7 +85,7 @@ protected function getModel()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getModelName()
     {
@@ -93,7 +93,7 @@ protected function getModelName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function testGetComponentName()
     {

From 0126afd0007eded3c85932df45da0a9ef2271c6d Mon Sep 17 00:00:00 2001
From: sathakur <sathakur@adobe.com>
Date: Wed, 23 Jan 2019 12:35:56 -0600
Subject: [PATCH 790/932] MC-4389: Convert UpdateVirtualProductEntityTest to
 MFTF

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    | 74 ++++++++++++++++++-
 .../Catalog/Test/Mftf/Data/TierPriceData.xml  |  2 +
 .../Section/StorefrontCategoryMainSection.xml |  1 +
 ...tOfStockVisibleInCategoryAndSearchTest.xml | 44 +++++------
 ...iceOutOfStockVisibleInCategoryOnlyTest.xml | 52 ++++++-------
 ...PriceOutOfStockVisibleInSearchOnlyTest.xml | 52 ++++++-------
 6 files changed, 150 insertions(+), 75 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index fce23a656cfa8..47dff6cb17c85 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -574,7 +574,7 @@
         <data key="urlKey" unique="suffix">virtual-product</data>
         <data key="type_id">virtual</data>
     </entity>
-    <entity name="updateRegularPriceVirtualProductOutOfStock" type="product">
+    <entity name="updateVirtualProductRegularPrice99OutOfStock" type="product">
         <data key="name" unique="suffix">VirtualProduct</data>
         <data key="sku" unique="suffix">virtual_sku</data>
         <data key="price">99.99</data>
@@ -624,4 +624,76 @@
         <data key="filename">magento3</data>
         <data key="file_extension">jpg</data>
     </entity>
+    <entity name="updateVirtualProductRegularPrice" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">99.99</data>
+        <data key="productTaxClass">None</data>
+        <data key="quantity">999</data>
+        <data key="status">In Stock</data>
+        <data key="storefrontStatus">IN STOCK</data>
+        <data key="visibility">Catalog</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="updateVirtualProductRegularPrice5OutOfStock" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">5.00</data>
+        <data key="productTaxClass">None</data>
+        <data key="status">Out of Stock</data>
+        <data key="storefrontStatus">OUT OF STOCK</data>
+        <data key="visibility">Catalog</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="updateVirtualProductSpecialPrice" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">120.00</data>
+        <data key="productTaxClass">Taxable Goods</data>
+        <data key="quantity">999</data>
+        <data key="status">In Stock</data>
+        <data key="storefrontStatus">IN STOCK</data>
+        <data key="visibility">Catalog, Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="special_price">45.00</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="updateVirtualProductSpecialPriceOutOfStock" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">99.99</data>
+        <data key="productTaxClass">None</data>
+        <data key="status">Out of Stock</data>
+        <data key="storefrontStatus">OUT OF STOCK</data>
+        <data key="visibility">Catalog, Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="special_price">45.00</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="updateVirtualProductTierPriceInStock" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">145.00</data>
+        <data key="productTaxClass">Taxable Goods</data>
+        <data key="quantity">999</data>
+        <data key="status">In Stock</data>
+        <data key="storefrontStatus">IN STOCK</data>
+        <data key="visibility">Catalog, Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
+    <entity name="updateVirtualTierPriceOutOfStock" type="product">
+        <data key="name" unique="suffix">VirtualProduct</data>
+        <data key="sku" unique="suffix">virtual_sku</data>
+        <data key="price">185.00</data>
+        <data key="productTaxClass">None</data>
+        <data key="quantity">999</data>
+        <data key="status">Out of Stock</data>
+        <data key="storefrontStatus">OUT OF STOCK</data>
+        <data key="visibility">Catalog, Search</data>
+        <data key="urlKey" unique="suffix">virtual-product</data>
+        <data key="type_id">virtual</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
index cedcbe8cd3fec..7fd0c65a2f753 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
@@ -21,6 +21,8 @@
         <data key="code">second_store_view</data>
     </entity>
     <entity name="tierPriceOnVirtualProduct" type="data">
+        <data key="website">All Websites [USD]</data>
+        <data key="customer_group">ALL GROUPS</data>
         <data key="price">90.00</data>
         <data key="qty">2</data>
     </entity>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index 03566be55ad2f..845b7070e46cd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -29,5 +29,6 @@
         <element name="categoryImage" type="text" selector=".category-image"/>
         <element name="emptyProductMessage" type="block" selector=".message.info.empty>div"/>
         <element name="lineProductName" type="text" selector=".products.list.items.product-items li:nth-of-type({{line}}) .product-item-link" timeout="30" parameterized="true"/>
+        <element name="asLowAs" type="input" selector="//*[@class='price-box price-final_price']/a/span[@class='price-container price-final_price tax weee']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 9af8365388531..a2a4f65860254 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -44,14 +44,14 @@
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
         <!-- Update virtual product with regular price(out of stock) -->
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.name}}" stepKey="fillProductName"/>
-        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.sku}}" stepKey="fillProductSku"/>
-        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.price}}" stepKey="fillProductPrice"/>
-        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
-        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="fillProductPrice"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.status}}" stepKey="selectStockStatusInStock"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
@@ -63,37 +63,37 @@
         <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
         <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
 
         <!-- Verify customer see updated virtual product with regular price(out of stock) in the product form page -->
-        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.name}}" stepKey="seeProductName"/>
-        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.sku}}" stepKey="seeProductSku"/>
-        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.price}}" stepKey="seeProductPrice"/>
-        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.status}}" stepKey="seeProductStockStatus"/>
-        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.status}}" stepKey="seeProductStockStatus"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="seeUrlKey"/>
 
         <!--Verify customer see updated virtual product with regular price(out of stock) on product storefront page -->
-        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPriceOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice5OutOfStock.urlKey)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
-            <expectedResult type="string">{{updateVirtualProductRegularPriceOutOfStock.storefrontStatus}}</expectedResult>
+            <expectedResult type="string">{{updateVirtualProductRegularPrice5OutOfStock.storefrontStatus}}</expectedResult>
             <actualResult type="variable">productStockAvailableStatus</actualResult>
         </assertEquals>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
         <assertEquals stepKey="assertOldPriceTextOnProductPage">
-            <expectedResult type="string">${{updateVirtualProductRegularPriceOutOfStock.price}}</expectedResult>
+            <expectedResult type="string">${{updateVirtualProductRegularPrice5OutOfStock.price}}</expectedResult>
             <actualResult type="variable">productPriceAmount</actualResult>
         </assertEquals>
     </test>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
index a1c1bbdf2708a..e64022b311614 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -44,20 +44,20 @@
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
         <!-- Update virtual product with regular price(out of stock) -->
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="fillProductName"/>
-        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="fillProductSku"/>
-        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.price}}" stepKey="fillProductPrice"/>
-        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="fillProductPrice"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.status}}" stepKey="selectStockStatusInStock"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
@@ -69,18 +69,18 @@
         <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
         <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
 
         <!-- Verify we see updated virtual product with regular price(from the above step) in the product form page -->
-        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="seeProductName"/>
-        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="seeProductSku"/>
-        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.price}}" stepKey="seeProductPrice"/>
-        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.status}}" stepKey="seeProductStockStatus"/>
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.status}}" stepKey="seeProductStockStatus"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDownToVerify"/>
         <grabMultiple selector="{{AdminProductFormSection.selectMultipleCategories}}" stepKey="selectedCategories" />
         <assertEquals stepKey="assertSelectedCategories">
@@ -88,40 +88,40 @@
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
-        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="seeUrlKey"/>
 
         <!--Verify customer don't see updated virtual product link(from above step) on category page -->
         <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="dontseeVirtualProductNameOnCategoryPage"/>
+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="dontseeVirtualProductNameOnCategoryPage"/>
 
         <!--Verify customer see updated virtual product (from above step) on product storefront page -->
-        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductWithRegularPriceOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice5OutOfStock.urlKey)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
-            <expectedResult type="string">{{updateVirtualProductWithRegularPriceOutOfStock.storefrontStatus}}</expectedResult>
+            <expectedResult type="string">{{updateVirtualProductRegularPrice5OutOfStock.storefrontStatus}}</expectedResult>
             <actualResult type="variable">productStockAvailableStatus</actualResult>
         </assertEquals>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
         <assertEquals stepKey="assertOldPriceTextOnProductPage">
-            <expectedResult type="string">${{updateVirtualProductWithRegularPriceOutOfStock.price}}</expectedResult>
+            <expectedResult type="string">${{updateVirtualProductRegularPrice5OutOfStock.price}}</expectedResult>
             <actualResult type="variable">productPriceAmount</actualResult>
         </assertEquals>
 
         <!--Verify customer don't see updated virtual product link(from above step) on magento storefront page and is searchable by sku -->
-        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductWithRegularPriceOutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice5OutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.sku}}" stepKey="fillVirtualProductName"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="fillVirtualProductName"/>
         <waitForPageLoad stepKey="waitForSearchTextBox"/>
         <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
         <waitForPageLoad stepKey="waitForSearch"/>
-        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductWithRegularPriceOutOfStock.name}}" stepKey="dontSeeVirtualProductName"/>
+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="dontSeeVirtualProductName"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
index cc9ce1beaed37..aa3184994daff 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
@@ -42,14 +42,14 @@
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
         <!-- Update virtual product with regular price(out of stock) -->
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="fillProductName"/>
-        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="fillProductSku"/>
-        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.price}}" stepKey="fillProductPrice"/>
-        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
-        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.status}}" stepKey="selectStockStatusInStock"/>
-        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.visibility}}" stepKey="selectVisibility"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="fillProductName"/>
+        <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="fillProductSku"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.price}}" stepKey="fillProductPrice"/>
+        <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.productTaxClass}}" stepKey="selectProductStockClass"/>
+        <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.status}}" stepKey="selectStockStatusInStock"/>
+        <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
-        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
+        <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
@@ -61,52 +61,52 @@
         <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
-        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="fillVirtualProductSku"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyUpdatedVirtualProductVisibleInGrid"/>
         <waitForPageLoad stepKey="waitUntilVirtualProductPageIsOpened"/>
 
         <!-- Verify customer see updated virtual product with regular price in the product form page -->
-        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="seeProductName"/>
-        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="seeProductSku"/>
-        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.price}}" stepKey="seeProductPrice"/>
-        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
-        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.status}}" stepKey="seeProductStockStatus"/>
-        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.visibility}}" stepKey="seeVisibility"/>
+        <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="seeProductName"/>
+        <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="seeProductSku"/>
+        <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.price}}" stepKey="seeProductPrice"/>
+        <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.productTaxClass}}" stepKey="seeProductTaxClass"/>
+        <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.status}}" stepKey="seeProductStockStatus"/>
+        <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
-        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.urlKey}}" stepKey="seeUrlKey"/>
+        <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.urlKey}}" stepKey="seeUrlKey"/>
 
         <!--Verify customer see updated virtual product on storefront page by url key -->
-        <amOnPage url="{{StorefrontProductPage.url(updateRegularPriceVirtualProductOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice99OutOfStock.urlKey)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
-        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
-            <expectedResult type="string">{{updateRegularPriceVirtualProductOutOfStock.storefrontStatus}}</expectedResult>
+            <expectedResult type="string">{{updateVirtualProductRegularPrice99OutOfStock.storefrontStatus}}</expectedResult>
             <actualResult type="variable">productStockAvailableStatus</actualResult>
         </assertEquals>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
         <assertEquals stepKey="assertOldPriceTextOnProductPage">
-            <expectedResult type="string">${{updateRegularPriceVirtualProductOutOfStock.price}}</expectedResult>
+            <expectedResult type="string">${{updateVirtualProductRegularPrice99OutOfStock.price}}</expectedResult>
             <actualResult type="variable">productPriceAmount</actualResult>
         </assertEquals>
 
         <!--Verify customer don't see updated virtual product link on magento storefront page -->
-        <amOnPage url="{{StorefrontProductPage.url(updateRegularPriceVirtualProductOutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
+        <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductRegularPrice99OutOfStock.urlKey)}}" stepKey="goToMagentoStorefrontPage"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
-        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.sku}}" stepKey="fillVirtualProductName"/>
+        <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="fillVirtualProductName"/>
         <waitForPageLoad stepKey="waitForSearchTextBox"/>
         <click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
         <waitForPageLoad stepKey="waitForSearch"/>
-        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="dontSeeVirtualProductLinkOnStorefrontPage"/>
+        <dontSee selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="dontSeeVirtualProductLinkOnStorefrontPage"/>
 
         <!--Verify customer don't see updated virtual product link on category page -->
         <amOnPage url="{{StorefrontCategoryPage.url($$initialCategoryEntity.name$$)}}" stepKey="openCategoryPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateRegularPriceVirtualProductOutOfStock.name}}" stepKey="dontSeeVirtualProductLinkOnCategoryPage"/>
+        <dontSee selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="dontSeeVirtualProductLinkOnCategoryPage"/>
     </test>
 </tests>

From 6184b5171ffbd9b6391e20d0d26d6bc6c834c46d Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 23 Jan 2019 13:28:23 -0600
Subject: [PATCH 791/932] GraphQl-93: Implement support for variables in query

-- Builds fixes
---
 lib/internal/Magento/Framework/GraphQl/Query/Fields.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
index ae1d8d68d5bc7..a34c0a9d42187 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Fields.php
@@ -79,7 +79,7 @@ private function extractVariables(array $variables): array
     {
         $fields = [];
         foreach ($variables as $key => $value) {
-            if (is_array($value)){
+            if (is_array($value)) {
                 $fields = array_merge($fields, $this->extractVariables($value));
             }
             $fields[$key] = $key;

From c6cb7c35a0c1efc24ffda69b716b39b733701ef1 Mon Sep 17 00:00:00 2001
From: John S <john00ivy@gmail.com>
Date: Wed, 23 Jan 2019 11:17:45 -0600
Subject: [PATCH 792/932] MC-4377: Convert UpdateTopCategoryEntityTest to MFTF

- Correcting the data references for some actions so they use the "createData" entity instead of the "data" entity that is used in the "createData" action.
---
 ...UpdateTopCategoryUrlWithNoRedirectTest.xml | 18 +++++++++++----
 ...inUpdateTopCategoryUrlWithRedirectTest.xml | 23 +++++++++++++------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
index c0362f461bd03..4dea6663e61bf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
@@ -17,9 +17,8 @@
             <group value="Catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
+
         <before>
-            <!-- Login as admin -->
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
             <!-- Create three level nested category -->
             <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
             <createData entity="Two_nested_categories" stepKey="createTwoLevelNestedCategories">
@@ -28,21 +27,28 @@
             <createData entity="Three_nested_categories" stepKey="createThreeLevelNestedCategories">
                 <requiredEntity createDataKey="createTwoLevelNestedCategories"/>
             </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
         </before>
         <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+
             <deleteData createDataKey="createThreeLevelNestedCategories" stepKey="deleteThreeNestedCategories"/>
             <deleteData createDataKey="createTwoLevelNestedCategories" stepKey="deleteTwoLevelNestedCategory"/>
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
-            <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!-- Open Category page -->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
+
         <!-- Open 3rd Level category -->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <waitForPageLoad stepKey="waitForCategoryToLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createThreeLevelNestedCategories.name$$)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
+
         <!--Update category UrlKey and uncheck permanent redirect for old URL -->
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
@@ -53,11 +59,14 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+
         <!-- Get Category Id -->
         <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+
         <!-- Open Url Rewrite Page -->
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
         <waitForPageLoad stepKey="waitForUrlRewritePage"/>
+
         <!-- Verify third level category's  Redirect Path, Target Path and Redirect Type after the URL Update -->
         <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
         <waitForPageLoad stepKey="waitForPageToLoad0"/>
@@ -66,7 +75,8 @@
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
         <see stepKey="seeTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
         <see stepKey="seeTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}"/>
-        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{Two_nested_categories.name_lwr}}2/updatedurl.html" stepKey="seeTheRedirectPath"/>
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updatedurl.html" stepKey="seeTheRedirectPath"/>
+
         <!-- Verify third level category's old URL path doesn't show redirect path-->
         <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton1"/>
         <waitForPageLoad stepKey="waitForPageToLoad3"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
index 8388e8ab1f7ea..a33c5bd384adc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
@@ -17,6 +17,7 @@
             <group value="Catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
+
         <before>
             <!-- Login as admin -->
             <actionGroup ref="LoginAsAdmin" stepKey="login"/>
@@ -35,14 +36,17 @@
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!-- Open Category page -->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
+
         <!-- Open 3rd Level category -->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <waitForPageLoad stepKey="waitForCategoryToLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createThreeLevelNestedCategories.name$$)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
+
         <!--Update category UrlKey and check permanent redirect for old URL -->
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
@@ -53,28 +57,33 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+
         <!-- Get Category ID -->
         <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#"/>
+
         <!-- Open Url Rewrite Page -->
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
         <waitForPageLoad stepKey="waitForUrlRewritePage"/>
+
         <!-- Verify third level category's Redirect Path, Target Path and Redirect Type after the URL update -->
         <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="updateredirecturl" stepKey="fillUpdatedURLInRedirectPathFilter"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
         <waitForPageLoad stepKey="waitForPageToLoad3"/>
-        <see stepKey="seeTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
-        <see stepKey="seeTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}"/>
-        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{Two_nested_categories.name_lwr}}2/updateredirecturl.html" stepKey="seeTheRedirectPath"/>
+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" stepKey="seeTheRedirectType"/>
+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}" stepKey="seeTheTargetPath"/>
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updateredirecturl.html" stepKey="seeTheRedirectPath"/>
+
         <!-- Verify third level category's Redirect path, Target Path and Redirect type for old URL -->
         <click selector="{{AdminUrlRewriteIndexSection.resetButton}}" stepKey="clickOnResetButton1"/>
         <waitForPageLoad stepKey="waitForPageToLoad4"/>
-        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{Three_nested_categories.name_lwr}}" stepKey="fillOldUrlInRedirectPathFilter"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$$createThreeLevelNestedCategories.name$$" stepKey="fillOldUrlInRedirectPathFilter"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
         <waitForPageLoad stepKey="waitForPageToLoad5"/>
-        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{Two_nested_categories.name_lwr}}2/{{Three_nested_categories.name_lwr}}2.html" stepKey="seeTheRedirectPathForOldUrl"/>
-        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{Two_nested_categories.name_lwr}}2/updateredirecturl.html" stepKey="seeTheTargetPathForOldUrl"/>
-        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" stepKey="seeTheRedirectTypeForOldUrl" />
+
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/$$createThreeLevelNestedCategories.name$$.html" stepKey="seeTheRedirectPathForOldUrl"/>
+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updateredirecturl.html" stepKey="seeTheTargetPathForOldUrl"/>
+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" stepKey="seeTheRedirectTypeForOldUrl"/>
     </test>
 </tests>
\ No newline at end of file

From 09936bf2220f2dfca014fd8b0073c9469602c24f Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Wed, 23 Jan 2019 13:45:15 -0600
Subject: [PATCH 793/932] MC-11034: Enable Paypal Credit option should be
 disabled/greyed out when a non-US merchant is chosen - Removed Paypal credit
 in Disabled funding options for non US merchants - modified config path in
 UpdatePaypalCreditOption patch

---
 .../Config/Source/DisableFundingOptions.php   | 66 +++++++++++++++++--
 .../Patch/Data/UpdatePaypalCreditOption.php   |  4 +-
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
index 4f4a81e36a2c0..f01af20d2b474 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
@@ -8,22 +8,41 @@
 namespace Magento\Paypal\Model\System\Config\Source;
 
 use Magento\Paypal\Model\Express\Checkout;
+use Magento\Paypal\Model\Config\StructurePlugin;
 
 /**
  * Get disable funding options
  */
-class DisableFundingOptions
+class DisableFundingOptions implements \Magento\Framework\Data\OptionSourceInterface
 {
+    /**
+     * @var \Magento\Paypal\Model\ConfigFactory
+     */
+    protected $_configFactory;
+
+    protected $requestCountry;
+
+    protected $http;
+
+    /**
+     * DisableFundingOptions constructor.
+     * @param \Magento\Paypal\Model\ConfigFactory $configFactory
+     * @param \Magento\Framework\App\Request\Http $http
+     */
+    public function __construct(
+        \Magento\Paypal\Model\ConfigFactory $configFactory,
+        \Magento\Framework\App\Request\Http $http
+    ) {
+        $this->_configFactory = $configFactory;
+        $this->http = $http;
+    }
+
     /**
      * @inheritdoc
      */
     public function toOptionArray(): array
     {
-        return [
-            [
-                'value' => Checkout::PAYPAL_FUNDING_CREDIT,
-                'label' => __('PayPal Credit')
-            ],
+        $defaultFundingOptions = [
             [
                 'value' => Checkout::PAYPAL_FUNDING_CARD,
                 'label' => __('PayPal Guest Checkout Credit Card Icons')
@@ -33,5 +52,40 @@ public function toOptionArray(): array
                 'label' => __('Elektronisches Lastschriftverfahren - German ELV')
             ]
         ];
+        $fundingOptions = $this->addPaypalCreditForUS($defaultFundingOptions);
+        return $fundingOptions;
+    }
+
+    /**
+     * Adds Paypal Credit for US
+     *
+     * @param {array} $fundingOptions
+     * @return array
+     */
+    private function addPaypalCreditForUS($fundingOptions): array
+    {
+        $paypalCredit = [
+            'value' => Checkout::PAYPAL_FUNDING_CREDIT,
+            'label' => __('PayPal Credit')
+        ];
+        if ($this->checkMerchantCountry('US')) {
+            array_unshift($fundingOptions, $paypalCredit);
+        }
+        return $fundingOptions;
+    }
+
+    /**
+     * Checks for chosen Merchant country from the config/url
+     *
+     * @param {string} $country
+     * @return bool
+     */
+    private function checkMerchantCountry($country): bool
+    {
+        $paypalCountry = $this->http->get(StructurePlugin::REQUEST_PARAM_COUNTRY);
+        if ($paypalCountry) {
+            return $paypalCountry === $country;
+        }
+        return $this->_configFactory->create()->getMerchantCountry() === $country;
     }
 }
diff --git a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
index 737780762cf66..935f0e4c8a6ce 100644
--- a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
+++ b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
@@ -49,12 +49,12 @@ public function apply()
         foreach ($connection->fetchAll($select) as $pair) {
             if (!$pair['value']) {
                 $this->moduleDataSetup->getConnection()
-                    ->insert(
+                    ->insertOnDuplicate(
                         $this->moduleDataSetup->getTable('core_config_data'),
                         [
                             'scope' => $pair['scope'],
                             'scope_id' => $pair['scope_id'],
-                            'path' => 'payment/paypal_express/disable_funding_options',
+                            'path' => 'paypal/style/disable_funding_options',
                             'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CREDIT
                         ]
                     );

From 9c51e701bde8f86e9edb9b4bf73bdb82a379806d Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 23 Jan 2019 14:55:30 -0600
Subject: [PATCH 794/932] MC-11006: Build stabilization

---
 app/code/Magento/Paypal/Model/AbstractConfig.php      |  3 +--
 app/code/Magento/Paypal/Model/Express/Checkout.php    |  8 --------
 .../Magento/Paypal/Model/ExpressConfigProvider.php    |  1 -
 .../Model/System/Config/Source/ButtonStyles.php       |  4 ++--
 .../System/Config/Source/DisableFundingOptions.php    |  7 +++----
 .../Setup/Patch/Data/UpdatePaypalCreditOption.php     |  2 +-
 .../Magento/Paypal/Test/Unit/Model/ConfigTest.php     | 11 +++++------
 .../Test/Unit/Model/ExpressConfigProviderTest.php     |  5 ++++-
 8 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index b889bd4c4f1c9..3da7843744b13 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -10,7 +10,6 @@
 use Magento\Payment\Model\MethodInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Paypal\Model\Express\Checkout;
 
 /**
  * Class AbstractConfig
@@ -299,7 +298,7 @@ public function isMethodActive($method)
                     $this->_storeId
                 );
                 $isExpressCreditEnabled = $disabledFunding
-                    ? !!strpos(Checkout::PAYPAL_FUNDING_CREDIT, $disabledFunding)
+                    ? !!strpos('CREDIT', $disabledFunding)
                     : true;
                 $isEnabled = $isExpressCreditEnabled
                 || $this->_scopeConfig->isSetFlag(
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index b98d88b0e7d90..38ba0983514b0 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -50,14 +50,6 @@ class Checkout
      */
     const PAYMENT_INFO_BUTTON = 'button';
 
-    /**
-     * When multiple funding sources are available to the buyer, PayPal automatically determines which additional
-     * buttons are appropriate to display. It is available opt of displaying specific funding sources
-     */
-    const PAYPAL_FUNDING_CREDIT = 'CREDIT';
-    const PAYPAL_FUNDING_CARD = 'CARD';
-    const PAYPAL_FUNDING_ELV = 'ELV';
-
     /**
      * @var \Magento\Quote\Model\Quote
      */
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 5628701dc0112..dc6210bc8a6ba 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -11,7 +11,6 @@
 use Magento\Framework\UrlInterface;
 use Magento\Payment\Helper\Data as PaymentHelper;
 use Magento\Paypal\Helper\Data as PaypalHelper;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class ExpressConfigProvider
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
index 726bf03257933..15db3c5603328 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
@@ -91,7 +91,7 @@ public function getLabel(): array
      */
     public function getBrInstallmentPeriod(): array
     {
-        $numbers = range(2,12);
+        $numbers = range(2, 12);
 
         return array_combine($numbers, $numbers);
     }
@@ -103,7 +103,7 @@ public function getBrInstallmentPeriod(): array
      */
     public function getMxInstallmentPeriod(): array
     {
-        $numbers = range(3,12,3);
+        $numbers = range(3, 12, 3);
 
         return array_combine($numbers, $numbers);
     }
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
index f01af20d2b474..11138e8cc724b 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
@@ -7,7 +7,6 @@
 
 namespace Magento\Paypal\Model\System\Config\Source;
 
-use Magento\Paypal\Model\Express\Checkout;
 use Magento\Paypal\Model\Config\StructurePlugin;
 
 /**
@@ -44,11 +43,11 @@ public function toOptionArray(): array
     {
         $defaultFundingOptions = [
             [
-                'value' => Checkout::PAYPAL_FUNDING_CARD,
+                'value' => 'CARD',
                 'label' => __('PayPal Guest Checkout Credit Card Icons')
             ],
             [
-                'value' => Checkout::PAYPAL_FUNDING_ELV,
+                'value' => 'ELV',
                 'label' => __('Elektronisches Lastschriftverfahren - German ELV')
             ]
         ];
@@ -65,7 +64,7 @@ public function toOptionArray(): array
     private function addPaypalCreditForUS($fundingOptions): array
     {
         $paypalCredit = [
-            'value' => Checkout::PAYPAL_FUNDING_CREDIT,
+            'value' => 'CREDIT',
             'label' => __('PayPal Credit')
         ];
         if ($this->checkMerchantCountry('US')) {
diff --git a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
index 935f0e4c8a6ce..c19714c8faf50 100644
--- a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
+++ b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
@@ -55,7 +55,7 @@ public function apply()
                             'scope' => $pair['scope'],
                             'scope_id' => $pair['scope_id'],
                             'path' => 'paypal/style/disable_funding_options',
-                            'value' => \Magento\Paypal\Model\Express\Checkout::PAYPAL_FUNDING_CREDIT
+                            'value' => 'CREDIT'
                         ]
                     );
             }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
index 2578f21173c32..172fc04f52474 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
@@ -125,22 +125,21 @@ public function testIsMethodAvailableForIsMethodActive($methodName, $expected)
                 ['payment/paypal_express/disable_funding_options', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, []],
             ];
             $this->scopeConfig
-                ->expects($this->any())
                 ->method('getValue')
-                ->will($this->returnValueMap($valueMap));
+                ->willReturnMap($valueMap);
             $this->scopeConfig->expects($this->exactly(1))
                 ->method('isSetFlag')
                 ->withAnyParameters()
-                ->will($this->returnValue(true));
+                ->willReturn(true);
         } else {
-            $this->scopeConfig->expects($this->any())
+            $this->scopeConfig
                 ->method('getValue')
                 ->with('paypal/general/merchant_country')
-                ->will($this->returnValue('US'));
+                ->willReturn('US');
             $this->scopeConfig->expects($this->exactly(2))
                 ->method('isSetFlag')
                 ->withAnyParameters()
-                ->will($this->returnValue(true));
+                ->willReturn(true);
         }
 
         $this->model->setMethod($methodName);
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
index 935b4484a8d20..825adf81e2648 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
@@ -43,13 +43,16 @@ public function testGetConfig()
         /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject $urlBuilderMock */
         $urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
 
+        $smartButtonConfigMock = $this->createMock(\Magento\Paypal\Model\SmartButtonConfig::class);
+
         $configProvider = new ExpressConfigProvider(
             $configFactory,
             $localeResolver,
             $currentCustomer,
             $paypalHelper,
             $paymentHelper,
-            $urlBuilderMock
+            $urlBuilderMock,
+            $smartButtonConfigMock
         );
         $configProvider->getConfig();
     }

From 707956da064c7a6615eae5453d7baa6a498e092b Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Wed, 23 Jan 2019 15:47:32 -0600
Subject: [PATCH 795/932] MQE-1422: Add some whitespace to new tests

- Gave comments some space to breathe
---
 .../AdminCheckPaginationInStorefrontTest.xml     | 13 +++++++++++++
 ...rtualProductFillingRequiredFieldsOnlyTest.xml |  2 +-
 ...VirtualProductOutOfStockWithTierPriceTest.xml |  4 +++-
 ...ithCustomOptionsSuiteAndImportOptionsTest.xml |  6 +++++-
 ...alProductWithTierPriceForGeneralGroupTest.xml |  4 +++-
 ...dminCreateVirtualProductWithTierPriceTest.xml |  4 +++-
 ...reateVirtualProductWithoutManageStockTest.xml |  5 ++++-
 ...dminDeleteRootCategoryAssignedToStoreTest.xml |  3 +++
 .../Mftf/Test/AdminDeleteRootCategoryTest.xml    |  3 +++
 .../Mftf/Test/AdminDeleteRootSubCategoryTest.xml | 12 ++++++++++--
 .../Test/AdminMassProductPriceUpdateTest.xml     |  6 ++++++
 ...MoveAnchoredCategoryToDefaultCategoryTest.xml | 12 ++++++++++++
 .../AdminMoveCategoryAndCheckUrlRewritesTest.xml | 16 ++++++++++++++++
 ...oveCategoryFromParentAnchoredCategoryTest.xml | 14 ++++++++++++++
 ...egoryAndCheckDefaultUrlKeyOnStoreViewTest.xml |  5 +++++
 .../AdminUpdateCategoryAndMakeInactiveTest.xml   |  4 ++++
 .../AdminUpdateCategoryNameWithStoreViewTest.xml |  8 ++++++++
 ...dminUpdateCategoryUrlKeyWithStoreViewTest.xml |  7 +++++++
 ...dateCategoryWithInactiveIncludeInMenuTest.xml |  6 ++++++
 .../Test/AdminUpdateCategoryWithProductsTest.xml |  7 +++++++
 ...AdminUpdateTopCategoryUrlWithRedirectTest.xml |  1 -
 21 files changed, 133 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
index cbe11cc2e9507..c93fe1cfd20a1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
@@ -69,6 +69,7 @@
             <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 0" />
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open Category Page and select created category-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
@@ -76,6 +77,7 @@
         <waitForPageLoad stepKey="waitForPageToLoad0"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoaded2"/>
+
         <!--Select Products-->
         <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
@@ -94,28 +96,34 @@
         <waitForPageLoad stepKey="waitForCategorySaved"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
+
         <!--Open Category Store Front Page-->
         <amOnPage url="{{_defaultCategory.name}}.html" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForProductToLoad"/>
+
         <!--Select 9 items per page and verify number of products displayed in each page -->
         <conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
         <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
         <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="9" stepKey="selectPerPageOption"/>
+
         <!--Verify number of products displayed in First Page -->
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage"/>
+
         <!--Verify number of products displayed in Second Page -->
         <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
         <waitForPageLoad stepKey="waitForPageToLoad4"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage"/>
+
         <!--Verify number of products displayed in third  Page -->
         <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage"/>
+
         <!--Change Pages using Previous Page selector and verify number of products displayed in each page-->
         <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage1"/>
@@ -125,21 +133,25 @@
         <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage2"/>
         <waitForPageLoad stepKey="waitForPageToLoad6"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage1"/>
+
         <!--Select Pages by using page Number and verify number of products displayed-->
         <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage2"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
         <waitForPageLoad stepKey="waitForPageToLoad7"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage2"/>
+
         <!--Select Third Page using page number-->
         <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage3"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('3')}}" stepKey="clickOnThirdPage"/>
         <waitForPageLoad stepKey="waitForPageToLoad8"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage2"/>
+
         <!--Select First Page using page number-->
         <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage4"/>
         <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage"/>
         <waitForPageLoad stepKey="waitForPageToLoad9"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsFirstPage2"/>
+
         <!--Select 15 items per page and verify number of products displayed in each page -->
         <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
         <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="15" stepKey="selectPerPageOption1"/>
@@ -149,6 +161,7 @@
         <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
         <waitForPageLoad stepKey="waitForPageToLoad11"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="5" stepKey="seeNumberOfProductsInSecondPage3"/>
+
         <!--Select 30 items per page  and verify number of products displayed in each page -->
         <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
         <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="30" stepKey="selectPerPageOption2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
index bf300c508f1e2..5e7bc591348fa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
@@ -18,7 +18,6 @@
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
-
         <before>
             <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
@@ -38,6 +37,7 @@
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductWithRequiredFields.price}}" stepKey="fillProductPrice"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForVirtualProductSaved" />
+
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
index 9bc2af256d23a..26ad7a46a73d7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
@@ -18,7 +18,6 @@
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
-
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
@@ -61,6 +60,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
@@ -69,6 +69,7 @@
         <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+
         <!--  Verify customer see product tier price on product page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', tierPriceOnDefault.qty_0)}}" stepKey="firstTierPriceText"/>
         <assertEquals stepKey="assertTierPriceTextOnProductPage1">
@@ -80,6 +81,7 @@
             <expectedResult type="string">Buy {{tierPriceOnDefault.qty_1}} for ${{tierPriceOnDefault.price_1}} each and save 100%</expectedResult>
             <actualResult type="variable">secondTierPriceText</actualResult>
         </assertEquals>
+
         <!--  Verify customer see product out of stock status on product page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index cab0a66dd3b6a..70edb0ce3ea7d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -18,7 +18,6 @@
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
-
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
@@ -47,6 +46,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductCustomImportOptions.urlKey}}" stepKey="fillUrlKey"/>
         <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
+
         <!-- Create virtual product with customizable options dataSet1 -->
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButton"/>
         <waitForPageLoad stepKey="waitForFirstOption"/>
@@ -58,6 +58,7 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_price_type}}" stepKey="selectOptionPriceTypeForFirstDataSet"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_sku}}" stepKey="fillOptionSkuForFirstDataSet"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('0')}}" userInput="{{virtualProductCustomizableOption1.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForFirstDataSet"/>
+
         <!-- Create virtual product with customizable options dataSet2 -->
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForSecondDataSet"/>
         <waitForPageLoad stepKey="waitForSecondDataSetToLoad"/>
@@ -69,6 +70,7 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.optionPriceType('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_price_type}}" stepKey="selectOptionPriceTypeForSecondDataSet"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.optionSku('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_sku}}" stepKey="fillOptionSkuForSecondDataSet"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.maxCharactersInput('1')}}" userInput="{{virtualProductCustomizableOption2.option_0_max_characters}}" stepKey="fillOptionMaxCharactersForSecondDataSet"/>
+
         <!-- Create virtual product with customizable options dataSet3 -->
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForThirdSetOfData"/>
         <waitForPageLoad stepKey="waitForThirdSetOfDataToLoad"/>
@@ -86,6 +88,7 @@
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price}}" stepKey="fillOptionPriceForThirdDataSetSecondRow"/>
         <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_price_type}}" stepKey="selectOptionPriceTypeForThirdDataSetSecondRow"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption3.title,'1')}}" userInput="{{virtualProductCustomizableOption3.option_1_sku}}" stepKey="fillOptionSkuForThirdDataSetSecondRow"/>
+
         <!-- Create virtual product with customizable options dataSet4 -->
         <scrollToTopOfPage stepKey="scrollToAddOptionButton"/>
         <click selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" stepKey="clickAddOptionButtonForFourthDataSet"/>
@@ -107,6 +110,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
index 4fe29c4781505..78247f4943596 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
@@ -18,7 +18,6 @@
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
-
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
@@ -61,6 +60,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
@@ -72,6 +72,7 @@
         <waitForPageLoad stepKey="waitForProductSearch"/>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
+
         <!-- Verify we see created virtual product with tier price for general group(from the above step) in the product form page -->
         <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeProductName"/>
         <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductGeneralGroup.sku}}" stepKey="seeProductSku"/>
@@ -114,6 +115,7 @@
         <waitForPageLoad stepKey="waitForSearch"/>
         <see selector="{{StorefrontQuickSearchResultsSection.productLink}}" userInput="{{virtualProductGeneralGroup.name}}" stepKey="seeVirtualProductName"/>
         <grabTextFrom selector="{{StorefrontQuickSearchResultsSection.asLowAsLabel}}" stepKey="tierPriceTextOnStorefrontPage"/>
+
         <!-- Verify customer see created virtual product with tier price -->
         <assertEquals stepKey="assertTierPriceTextOnCategoryPage">
             <expectedResult type="string">As low as ${{tierPriceOnGeneralGroup.price}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index 3af5919e6bc71..6ef2569945fa6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -18,7 +18,6 @@
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
-
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
@@ -57,6 +56,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
@@ -68,6 +68,7 @@
         <waitForPageLoad stepKey="waitForProductSearch"/>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened" />
+
         <!-- Verify we see created virtual product with tier price(from the above step) in the product form page -->
         <seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeProductName"/>
         <seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductBigQty.sku}}" stepKey="seeProductSku"/>
@@ -111,6 +112,7 @@
         </assertEquals>
         <click selector="{{StorefrontQuickSearchResultsSection.productLink}}" stepKey="openSearchedProduct"/>
         <waitForPageLoad stepKey="waitForProductPageToBeLoaded" />
+
         <!-- Verify customer see product tier price on product page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
         <assertEquals stepKey="assertTierPriceTextOnProductPage">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
index de7f72bdecc1d..cb41b0292d33a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -18,7 +18,6 @@
             <group value="catalog"/>
             <group value="mtf_migrated"/>
         </annotations>
-
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
@@ -55,6 +54,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
@@ -63,18 +63,21 @@
         <waitForPageLoad stepKey="waitForStoreFrontPageToLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductWithoutManageStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductWithoutManageStock.sku}}" stepKey="seeVirtualProductSku"/>
+
         <!-- Verify customer see product special price on the storefront page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
         <assertEquals stepKey="assertSpecialPriceTextOnProductPage">
             <expectedResult type="string">${{virtualProductWithoutManageStock.special_price}}</expectedResult>
             <actualResult type="variable">specialPriceAmount</actualResult>
         </assertEquals>
+
         <!-- Verify customer see product old price on the storefront page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.oldPriceAmount}}" stepKey="oldPriceAmount"/>
         <assertEquals stepKey="assertOldPriceTextOnProductPage">
             <expectedResult type="string">${{virtualProductWithoutManageStock.price}}</expectedResult>
             <actualResult type="variable">oldPriceAmount</actualResult>
         </assertEquals>
+
         <!-- Verify customer see product in stock status on the storefront page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
index 3897769ffbc6a..e4b269dff96ba 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
@@ -28,6 +28,7 @@
             <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
         <waitForPageLoad stepKey="waitForSystemStorePage"/>
         <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
@@ -36,12 +37,14 @@
         <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
         <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
         <see userInput="You saved the store." stepKey="seeSaveMessage"/>
+
         <!--Verify Delete Root Category can not be deleted-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
         <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded1"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name))}}" stepKey="clickRootCategoryInTree"/>
+
         <!--Verify Delete button is not displayed-->
         <dontSeeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="dontSeeDeleteButton"/>
     </test>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml
index ff281b3637336..e7ab14c77945a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml
@@ -24,14 +24,17 @@
         <after>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Verify Created root Category-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <seeElement selector="{{AdminCategoryBasicFieldSection.CategoryNameInput(NewRootCategory.name)}}" stepKey="seeRootCategory"/>
+
         <!--Delete Root Category-->
         <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
+
         <!--Verify Root Category is not listed in backend-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
         <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml
index 79d7041bebdb6..6df571f403ac9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml
@@ -31,6 +31,7 @@
             <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Create a Store-->
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
         <waitForPageLoad stepKey="waitForSystemStorePage"/>
@@ -40,7 +41,8 @@
         <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
         <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
         <see userInput="You saved the store." stepKey="seeSaveMessage"/>
-        <!--Create a Store View/>-->
+
+        <!--Create a Store View-->
         <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="selectCreateStoreView"/>
         <click selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="clickDropDown"/>
         <selectOption userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreViewStatus"/>
@@ -53,25 +55,31 @@
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
         <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
         <see userInput="You saved the store view." stepKey="seeSaveMessage1"/>
-        <!--Go To store front page -->
+
+        <!--Go To store front page-->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
+
         <!--Verify subcategory displayed in store front-->
         <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="selectMainWebsite"/>
         <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}"  stepKey="selectMainWebsite1"/>
         <waitForPageLoad stepKey="waitForCategoryToLoad"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeSubCategoryInStoreFront"/>
+
         <!--Delete SubCategory-->
         <deleteData createDataKey="category" stepKey="deleteCategory"/>
+
         <!--Verify Sub Category is absent in backend -->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForCategoryIndexPageToBeLoaded"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories2"/>
         <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="dontSeeCategoryInTree"/>
+
         <!--Verify Sub Category is not present in Store Front-->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
         <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad2"/>
         <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryInStoreFront"/>
+
         <!--Verify in Category is not in Url Rewrite grid-->
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
         <waitForPageLoad stepKey="waitForUrlRewritePageTopLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
index ea71f2656b922..d7607b4b269e8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -28,18 +28,23 @@
             <deleteData  createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open Product Index Page-->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
         <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+
         <!--Search products using keyword -->
         <actionGroup ref="searchProductGridByKeyword2" stepKey="searchByKeyword">
             <argument name="keyword" value="Testp"/>
         </actionGroup>
+
         <!--Sort Products by ID in descending order-->
         <actionGroup ref="sortProductsByIdDescending" stepKey="sortProductsByIdDescending"/>
+
         <!--Select products-->
         <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct1.sku$$)}}" stepKey="selectFirstProduct"/>
         <checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct2.sku$$)}}" stepKey="selectSecondProduct"/>
+
         <!-- Update product price-->
         <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
         <click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickChangeStatus"/>
@@ -50,6 +55,7 @@
         <click stepKey="clickOnSaveButton" selector="{{AdminEditProductAttributesSection.Save}}"/>
         <waitForPageLoad stepKey="waitForUpdatedProductToSave" />
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="A total of 2 record(s) were updated." stepKey="seeAttributeUpateSuccessMsg"/>
+
         <!--Verify product name, sku and updated price-->
         <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct1.sku$$)}}"/>
         <waitForPageLoad stepKey="waitForFirstProductToLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
index 405b20ef2d929..247711295a555 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
@@ -27,6 +27,7 @@
             <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
@@ -34,6 +35,7 @@
         <waitForPageLoad stepKey="waitForCategoryToLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
+
         <!--Enable Anchor for _defaultCategory Category-->
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
         <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
@@ -41,6 +43,7 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
         <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+
         <!--Enable Anchor for FirstLevelSubCat Category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="addSubCategoryName"/>
@@ -50,6 +53,7 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
         <waitForPageLoad stepKey="waitForSecondCategoryToSave1"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage1"/>
+
         <!--Enable Anchor for SimpleSubCategory Category and add products to the Category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName1"/>
@@ -64,26 +68,31 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory2"/>
         <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
+
         <!--Open Category in store front page-->
         <amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
         <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
+
         <!--<Verify breadcrumbs in store front page-->
         <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
         <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
             <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{FirstLevelSubCat.name}}, {{SimpleSubCategory.name}}]</expectedResult>
             <actualResult type="variable">breadcrumbs</actualResult>
         </assertEquals>
+
         <!--Verify Product displayed in category store front page-->
         <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
         <waitForPageLoad  stepKey="waitForProductToLoad1"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
+
         <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
+
         <!--Move SubCategory under Default Category-->
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
         <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
@@ -92,12 +101,14 @@
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
         <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageLoad1"/>
+
         <!--Verify breadcrumbs in store front page after the move-->
         <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbsAfterMove"/>
         <assertEquals  stepKey="verifyBreadcrumbsInFrontPageAfterMove">
             <expectedResult type="array">['Home',{{SimpleSubCategory.name}}]</expectedResult>
             <actualResult type="variable">breadcrumbsAfterMove</actualResult>
         </assertEquals>
+
         <!--Open Category in store front-->
         <amOnPage url="{{StorefrontCategoryPage.url(SimpleSubCategory.name)}}"  stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
@@ -105,6 +116,7 @@
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
         <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct1"/>
         <waitForPageLoad  stepKey="waitForProductToLoad2"/>
+
         <!--Verify product name on Store Front-->
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductNameAfterMove"/>
     </test>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
index 7e00d21ad4b84..ba6e6a43674c3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
@@ -25,6 +25,7 @@
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open category page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
@@ -32,12 +33,14 @@
         <waitForPageLoad stepKey="waitForCategoryToLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
+
         <!--Create second level category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SubCategory.name}}" stepKey="addSubCategoryName"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
         <waitForPageLoad stepKey="waitForSecondCategoryToSave1"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage1"/>
+
         <!--Create third level category under second level category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName1"/>
@@ -45,42 +48,54 @@
         <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
         <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#" />
+
         <!--Open Url Rewrite Page-->
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
         <waitForPageLoad stepKey="waitForUrlRewritePage"/>
+
         <!--Search third level category Redirect Path, Target Path and Redirect Type-->
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="fillRedirectPathFilter"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
         <waitForPageLoad stepKey="waitForPageToLoad0"/>
+
         <!--Verify Category RedirectType-->
         <see stepKey="verifyTheRedirectType" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
+
         <!--Verify Redirect Path -->
         <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="verifyTheRedirectPath"/>
+
         <!--Verify Category Target Path-->
         <see stepKey="verifyTheTargetPath" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}"/>
+
         <!--Open Category Page -->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
+
         <!--Move the third level category under first level category -->
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="moveCategory"/>
         <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
         <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
         <waitForPageLoad stepKey="waitForPageToLoad3"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
+
         <!--Open Url Rewrite page  -->
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage1"/>
         <waitForPageLoad stepKey="waitForUrlRewritePage1"/>
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" stepKey="fillCategoryUrlKey1"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
         <waitForPageLoad stepKey="waitForPageToLoad4"/>
+
         <!--Verify new Redirect Path after move -->
         <see stepKey="verifyTheRequestPathAfterMove" selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
+
         <!--Verify new Target Path after move -->
         <see stepKey="verifyTheTargetPathAfterMove" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="catalog/category/view/id/{$categoryId}" />
+
         <!--Verify new RedirectType after move -->
         <see stepKey="verifyTheRedirectTypeAfterMove" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="No" />
+
         <!--Verify before move Redirect Path displayed with associated Target Path and Redirect Type-->
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleSubCategory.name_lwr}}" stepKey="fillCategoryUrlKey2"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton2"/>
@@ -88,6 +103,7 @@
         <see stepKey="verifyTheRedirectTypeAfterMove1" selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" />
         <see stepKey="verifyTheRequestPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" />
         <see stepKey="verifyTheTargetPathAfterMove1" selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{SimpleSubCategory.name_lwr}}.html" />
+
         <!--Verify before move Redirect Path directs to the category page-->
         <amOnPage url="{{_defaultCategory.name_lwr}}2/{{SubCategory.name_lwr}}/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
index 27cfac0dd479f..d17078d794b42 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
@@ -30,6 +30,7 @@
             </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open Category page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
@@ -37,14 +38,17 @@
         <waitForPageLoad stepKey="waitForCategoryToLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
+
         <!--Enable Anchor for _defaultCategory category -->
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
         <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
         <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+
         <!--Create a Subcategory under _defaultCategory category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
+
         <!--Add a product to SimpleSubCategory category-->
         <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
@@ -54,49 +58,59 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
         <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+
         <!--Verify category displayed in store front page-->
         <amOnPage url="/$$createDefaultCategory.name$$/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageLoad"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
         <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
+
         <!--Check category breadcrumbs in store  front page-->
         <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
         <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
             <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{SimpleSubCategory.name}}]</expectedResult>
             <actualResult type="variable">breadcrumbs</actualResult>
         </assertEquals>
+
         <!--Verify Product displayed in category store front page-->
         <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
         <waitForPageLoad  stepKey="waitForProductToLoad1"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
+
         <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
+
         <!--Move SubCategory under Default Category-->
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
         <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
         <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
         <waitForPageLoad stepKey="waitForPageToLoad3"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
+
         <!--Open category in store front page-->
         <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageLoad1"/>
+
         <!--Verify breadcrumbs after the move in store front page-->
         <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbsAfterMove"/>
         <assertEquals  stepKey="verifyBreadcrumbsInFrontPageAfterMove">
             <expectedResult type="array">['Home',{{SimpleSubCategory.name}}]</expectedResult>
             <actualResult type="variable">breadcrumbsAfterMove</actualResult>
         </assertEquals>
+
        <!--Open category store front page -->
         <amOnPage url="{{StorefrontCategoryPage.url(SimpleSubCategory.name)}}"  stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+
         <!--Verify Category in store front-->
         <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleSubCategory.name)}}" stepKey="seeCategoryInTitle"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSubCategoryOnStoreNavigationBarAfterMove"/>
         <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct1"/>
         <waitForPageLoad  stepKey="waitForProductToLoad2"/>
+
         <!--Verify product name on Store Front-->
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductNameAfterMove"/>
     </test>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
index 047824b71ce64..4a476684d9af3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
@@ -31,20 +31,24 @@
             <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open Store Page -->
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
         <waitForPageLoad stepKey="waitForSystemStorePage"/>
+
         <!--Create Custom Store -->
         <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
         <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
         <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
         <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
         <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+
         <!--Create Store View-->
         <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
             <argument name="StoreGroup" value="customStore"/>
             <argument name="customStore" value="customStore"/>
         </actionGroup>
+
         <!--Update Category-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
@@ -60,6 +64,7 @@
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
         <waitForPageLoad stepKey="waitForPageToLoad2"/>
         <seeInField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="seeCategoryUrlKey" userInput="2{{SimpleRootSubCategory.name_lwr}}" />
+
         <!--Open Category in Store Front  Page-->
         <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
index 546655142aaee..479249ca678dd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
@@ -25,9 +25,11 @@
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open category page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
+
         <!--Update category and make category inactive-->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
@@ -37,11 +39,13 @@
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
         <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
+
         <!--Verify Inactive Category is store front page-->
         <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
         <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
         <waitForPageLoad time="15" stepKey="wait"/>
+
         <!--Verify Inactive Category in category page -->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoaded1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
index 0155eaa9eb2a7..2cb4a6b6dd436 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
@@ -31,29 +31,35 @@
             <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open store page -->
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
         <waitForPageLoad stepKey="waitForSystemStorePage"/>
+
         <!--Create Custom Store -->
         <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
         <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
         <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
         <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
         <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+
         <!--Create Store View-->
         <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
             <argument name="StoreGroup" value="customStore"/>
             <argument name="customStore" value="customStore"/>
         </actionGroup>
+
         <!--Verify created SubCAtegory is present on Store Front -->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
         <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
+
         <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
+
         <!--Update Category-->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTreeUnderRoot(SimpleRootSubCategory.name)}}" stepKey="clickOnSubcategoryIsUndeRootCategory"/>
@@ -62,10 +68,12 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
         <waitForPageLoad stepKey="waitForCateforyToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+
         <!--Verify the Category is not present in Store Front-->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
         <waitForPageLoad stepKey="waitForPageToLoaded2"/>
         <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="dontSeeCatergoryInStoreFront"/>
+
         <!--Verify the Updated Category is present in Store Front-->
         <amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheUpdatedCategoryInStoreFront"/>
         <waitForPageLoad stepKey="waitForPageToLoaded3"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
index 16116c22fc4bf..e7c4a8a093e19 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
@@ -31,20 +31,24 @@
             <deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open Store Page -->
         <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
         <waitForPageLoad stepKey="waitForSystemStorePage"/>
+
         <!--Create Custom Store -->
         <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
         <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
         <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
         <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
         <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+
         <!--Create Store View-->
         <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
             <argument name="StoreGroup" value="customStore"/>
             <argument name="customStore" value="customStore"/>
         </actionGroup>
+
         <!--Verify Category in Store View-->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
         <waitForPageLoad stepKey="waitForSystemStorePage1"/>
@@ -53,6 +57,7 @@
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForProductToLoad"/>
+
         <!--Update URL Key-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded2"/>
@@ -65,12 +70,14 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
+
         <!--Open Category Store Front Page-->
         <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
         <waitForPageLoad stepKey="waitForSystemStorePage3"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCategoryOnNavigation1"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory2"/>
         <waitForPageLoad stepKey="waitForProductToLoad1"/>
+
         <!--Verify Updated URLKey is present-->
         <seeInCurrentUrl stepKey="verifyUpdatedUrlKey" url="newurlkey.html"/>
     </test>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
index 96945e96f8476..67e5ffb84b650 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
@@ -25,9 +25,11 @@
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
+
         <!--Update Category name,description, urlKey, meta title and disable Include in Menu-->
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
@@ -44,18 +46,22 @@
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForCategorySaved"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+
         <!--Open UrlRewrite Page-->
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
         <waitForPageLoad stepKey="waitForUrlRewritePage"/>
+
         <!--Verify Updated Category UrlKey-->
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleRootSubCategory.urlKey}}" stepKey="fillUpdatedCategoryUrlKey"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <see stepKey="seeCategoryUrlKey" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{SimpleRootSubCategory.urlKey}}.html" />
+
         <!--Verify Updated Category UrlKey directs to category Store Front-->
         <amOnPage url="{{SimpleRootSubCategory.urlKey}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
         <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SimpleRootSubCategory.name)}}" stepKey="seeUpdatedCategoryInStoreFrontPage"/>
+
         <!--Verify Updated fields in Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
         <waitForPageLoad stepKey="waitForPageToLoaded1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
index 155670230e715..1cb01ac11cb8f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
@@ -27,12 +27,14 @@
             <deleteData  createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
+
         <!--Open Category Page-->
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
+
         <!--Update Product Display Setting-->
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
         <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
@@ -42,6 +44,7 @@
         <scrollTo selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" x="0" y="-80" stepKey="scrollToDefaultProductList"/>
         <click selector="{{CategoryDisplaySettingsSection.defaultProductLisCheckBox}}" stepKey="enableTheDefaultProductList"/>
         <selectOption selector="{{CategoryDisplaySettingsSection.defaultProductList}}" userInput="name" stepKey="selectProductName"/>
+
         <!--Add Products in Category-->
         <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
@@ -57,18 +60,22 @@
         <waitForPageLoad stepKey="waitForCategorySaved"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
+
         <!--Verify Category Title-->
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
+
         <!--Verify Category in store front page-->
         <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}" stepKey="seeDefaultProductPage"/>
         <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForProductToLoad"/>
+
         <!--Verify Product in Category-->
         <seeElement stepKey="seeProductsInCategory" selector="{{StorefrontCategoryMainSection.productLink}}"/>
         <click selector="{{StorefrontCategoryMainSection.productLink}}" stepKey="openSearchedProduct"/>
         <waitForPageLoad  stepKey="waitForProductToLoad1"/>
+
         <!--Verify product name and price on Store Front-->
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{defaultSimpleProduct.price}}" stepKey="assertProductPrice"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
index a33c5bd384adc..ee1ed5f97edfa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
@@ -81,7 +81,6 @@
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="$$createThreeLevelNestedCategories.name$$" stepKey="fillOldUrlInRedirectPathFilter"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton1"/>
         <waitForPageLoad stepKey="waitForPageToLoad5"/>
-
         <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/$$createThreeLevelNestedCategories.name$$.html" stepKey="seeTheRedirectPathForOldUrl"/>
         <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updateredirecturl.html" stepKey="seeTheTargetPathForOldUrl"/>
         <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" stepKey="seeTheRedirectTypeForOldUrl"/>

From 49128da64b1aff99746b58c9f31344f40b735236 Mon Sep 17 00:00:00 2001
From: John S <john00ivy@gmail.com>
Date: Wed, 23 Jan 2019 15:51:36 -0600
Subject: [PATCH 796/932] MQE-1421: Updating EndToEnd Tests

- Updating the action group so it uses the correct data type for an argument.
---
 .../Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml  | 8 ++++----
 .../Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml        | 8 ++++----
 .../Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml   | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
index 35e0058440f6e..00d80cc2a94d9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml
@@ -158,13 +158,13 @@
         <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="guestCheckoutFillingShippingSection" />
         <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="guestCheckoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
             <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="{{E2EB2CQuote.subtotal}}"/>
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
             <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingTotal" value="{{E2EB2CQuote.shipping}}"/>
+            <argument name="shippingTotal" value="E2EB2CQuote.shipping"/>
             <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="{{E2EB2CQuote.shippingMethod}}"/>
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
             <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="{{E2EB2CQuote.total}}"/>
+            <argument name="total" value="E2EB2CQuote.total"/>
         </actionGroup>
 
         <!-- Check ship to information in checkout -->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 371826c9e7841..05a6939941f3e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -158,13 +158,13 @@
         <comment userInput="Check order summary in checkout" stepKey="commentCheckOrderSummaryInCheckout" after="checkoutFillingShippingSection" />
         <actionGroup ref="CheckOrderSummaryInCheckoutActionGroup" stepKey="checkoutCheckOrderSummary" after="commentCheckOrderSummaryInCheckout">
             <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="subtotal" value="{{E2EB2CQuote.subtotal}}"/>
+            <argument name="subtotal" value="E2EB2CQuote.subtotal"/>
             <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingTotal" value="{{E2EB2CQuote.shipping}}"/>
+            <argument name="shippingTotal" value="E2EB2CQuote.shipping"/>
             <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="shippingMethod" value="{{E2EB2CQuote.shippingMethod}}"/>
+            <argument name="shippingMethod" value="E2EB2CQuote.shippingMethod"/>
             <!-- @TODO: Change to scalar value after MQE-498 is implemented -->
-            <argument name="total" value="{{E2EB2CQuote.total}}"/>
+            <argument name="total" value="E2EB2CQuote.total"/>
         </actionGroup>
 
         <!-- Check ship to information in checkout -->
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
index a196bbd61d0ac..4228311d3b904 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
@@ -33,7 +33,7 @@
     <actionGroup name="StorefrontCheckCouponAppliedActionGroup">
         <arguments>
             <argument name="rule"/>
-            <argument name="discount" type="string"/>
+            <argument name="discount"/>
         </arguments>
         <waitForElementVisible selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="waitForDiscountTotal"/>
         <see userInput="{{rule.store_labels[1][store_label]}}" selector="{{CheckoutCartSummarySection.discountLabel}}" stepKey="assertDiscountLabel"/>

From ff317650e624c2f132728c7dd58a997bdd829aee Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Wed, 23 Jan 2019 16:05:30 -0600
Subject: [PATCH 797/932] MC-6286: Cart/Minicart Flow

---
 .../Checkout/Block/QuoteShortcutButtons.php   |   3 +-
 .../Magento/Paypal/Block/Bml/Shortcut.php     |  30 ++-
 .../Express/InContext/Minicart/Button.php     |   2 +-
 .../InContext/Minicart/SmartButton.php        | 236 ++++++++++++++++++
 .../Paypal/Model/ExpressConfigProvider.php    |  30 +--
 .../Paypal/Model/SmartButtonConfig.php        |  47 +++-
 .../Observer/AddPaypalShortcutsObserver.php   |   4 +-
 .../AddPaypalShortcutsObserverTest.php        |   7 +-
 app/code/Magento/Paypal/etc/config.xml        |   6 +-
 app/code/Magento/Paypal/etc/frontend/di.xml   |  37 ++-
 .../express/in-context/shortcut/button.phtml  |  22 +-
 .../view/frontend/web/js/in-context/button.js |  52 ++--
 .../express-checkout-smart-buttons.js         |  29 +--
 .../in-context/checkout-express.js            |  35 +--
 14 files changed, 429 insertions(+), 111 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php

diff --git a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
index 6b3774f7e38f8..b7f6a163845e0 100644
--- a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
+++ b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
@@ -45,7 +45,8 @@ protected function _beforeToHtml()
                 'container' => $this,
                 'is_catalog_product' => $this->_isCatalogProduct,
                 'or_position' => $this->_orPosition,
-                'checkout_session' => $this->_checkoutSession
+                'checkout_session' => $this->_checkoutSession,
+                'is_shopping_cart' => true
             ]
         );
         return $this;
diff --git a/app/code/Magento/Paypal/Block/Bml/Shortcut.php b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
index 39e5dbd3cefce..eb37f755ecd4f 100644
--- a/app/code/Magento/Paypal/Block/Bml/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
@@ -8,6 +8,8 @@
 
 use Magento\Catalog\Block as CatalogBlock;
 use Magento\Paypal\Helper\Shortcut\ValidatorInterface;
+use Magento\Paypal\Model\ConfigFactory;
+use Magento\Paypal\Model\Config;
 
 class Shortcut extends \Magento\Framework\View\Element\Template implements CatalogBlock\ShortcutInterface
 {
@@ -67,16 +69,23 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
     private $_shortcutValidator;
 
     /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * Shortcut constructor.
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param ValidatorInterface $shortcutValidator
-     * @param string $paymentMethodCode
-     * @param string $startAction
-     * @param string $alias
-     * @param string $bmlMethodCode
-     * @param string $shortcutTemplate
+     * @param $paymentMethodCode
+     * @param $startAction
+     * @param $alias
+     * @param $bmlMethodCode
+     * @param $shortcutTemplate
      * @param array $data
+     * @param ConfigFactory|null $config
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -89,7 +98,8 @@ public function __construct(
         $alias,
         $bmlMethodCode,
         $shortcutTemplate,
-        array $data = []
+        array $data = [],
+        \Magento\Paypal\Model\ConfigFactory $config = null
     ) {
         $this->_paymentData = $paymentData;
         $this->_mathRandom = $mathRandom;
@@ -100,6 +110,10 @@ public function __construct(
         $this->_alias = $alias;
         $this->setTemplate($shortcutTemplate);
         $this->_bmlMethodCode = $bmlMethodCode;
+        $this->config = $config
+            ? $config
+            : \Magento\Framework\App\ObjectManager::getInstance()->get(ConfigFactory::class)->create();
+        $this->config->setMethod($this->_paymentMethodCode);
         parent::__construct($context, $data);
     }
 
@@ -110,7 +124,9 @@ protected function _beforeToHtml()
     {
         $result = parent::_beforeToHtml();
         $isInCatalog = $this->getIsInCatalogProduct();
-        if (!$this->_shortcutValidator->validate($this->_paymentMethodCode, $isInCatalog)) {
+        if (!$this->_shortcutValidator->validate($this->_paymentMethodCode, $isInCatalog)
+            || (bool)(int)$this->config->getValue('in_context')
+        ) {
             $this->_shouldRender = false;
             return $result;
         }
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
index 79142ecb1bfad..6be1ea6b31b77 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
@@ -9,7 +9,6 @@
 use Magento\Payment\Model\MethodInterface;
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\ConfigFactory;
-use Magento\Paypal\Block\Express\InContext;
 use Magento\Framework\View\Element\Template;
 use Magento\Catalog\Block\ShortcutInterface;
 use Magento\Framework\Locale\ResolverInterface;
@@ -17,6 +16,7 @@
 
 /**
  * Class Button
+ * @deprecated @see \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton
  */
 class Button extends Template implements ShortcutInterface
 {
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
new file mode 100644
index 0000000000000..a9203369501a0
--- /dev/null
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Block\Express\InContext\Minicart;
+
+use Magento\Checkout\Model\Session;
+use Magento\Payment\Model\MethodInterface;
+use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\ConfigFactory;
+use Magento\Framework\View\Element\Template;
+use Magento\Catalog\Block\ShortcutInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Paypal\Model\SmartButtonConfig;
+use Magento\Framework\UrlInterface;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Class Button
+ */
+class SmartButton extends Template implements ShortcutInterface
+{
+    const ALIAS_ELEMENT_INDEX = 'alias';
+
+    /**
+     * @var bool
+     */
+    private $isMiniCart = false;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var MethodInterface
+     */
+    private $payment;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var SmartButtonConfig
+     */
+    private $smartButtonConfig;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var QuoteIdToMaskedQuoteId
+     */
+    private $quoteIdMask;
+
+    /**
+     * @param Context $context
+     * @param ConfigFactory $configFactory
+     * @param Session $session
+     * @param MethodInterface $payment
+     * @param SerializerInterface $serializer
+     * @param SmartButtonConfig $smartButtonConfig
+     * @param UrlInterface $urlBuilder
+     * @param QuoteIdToMaskedQuoteId $quoteIdToMaskedQuoteId
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        ConfigFactory $configFactory,
+        Session $session,
+        MethodInterface $payment,
+        SerializerInterface $serializer,
+        SmartButtonConfig $smartButtonConfig,
+        UrlInterface $urlBuilder,
+        QuoteIdToMaskedQuoteId $quoteIdToMaskedQuoteId,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+
+        $this->config = $configFactory->create();
+        $this->config->setMethod(Config::METHOD_EXPRESS);
+        $this->payment = $payment;
+        $this->session = $session;
+        $this->serializer = $serializer;
+        $this->smartButtonConfig = $smartButtonConfig;
+        $this->urlBuilder = $urlBuilder;
+        $this->quoteIdMask = $quoteIdToMaskedQuoteId;
+    }
+
+    /**
+     * Check `in_context` config value
+     *
+     * @return bool
+     */
+    private function isInContext() : bool
+    {
+        return (bool)(int) $this->config->getValue('in_context');
+    }
+
+    /**
+     * Check `visible_on_cart` config value
+     *
+     * @return bool
+     */
+    private function isVisibleOnCart() : bool
+    {
+        return (bool)(int) $this->config->getValue('visible_on_cart');
+    }
+
+    /**
+     * Check is Paypal In-Context Express Checkout button
+     * should render in cart/mini-cart
+     *
+     * @return bool
+     */
+    protected function shouldRender() : bool
+    {
+        return $this->payment->isAvailable($this->session->getQuote())
+            && $this->isMiniCart
+            && $this->isInContext()
+            && $this->isVisibleOnCart();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _toHtml()
+    {
+        if (!$this->shouldRender()) {
+            return '';
+        }
+
+        return parent::_toHtml();
+    }
+
+    /**
+     * Get shortcut alias
+     *
+     * @return string
+     */
+    public function getAlias()
+    {
+        return $this->getData(self::ALIAS_ELEMENT_INDEX);
+    }
+
+    /**
+     * @param bool $isCatalog
+     * @return $this
+     */
+    public function setIsInCatalogProduct($isCatalog)
+    {
+        $this->isMiniCart = !$isCatalog;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getJsInitParams(): string
+    {
+        $json = "";
+        $quoteId = $this->getQuoteId();
+        if (!empty($quoteId)) {
+            $clientConfig = [
+                'quoteId' => $quoteId,
+                'customerId' => $this->session->getQuote()->getCustomerId(),
+                'button' => 1,
+                'getTokenUrl' => $this->urlBuilder->getUrl(
+                    'paypal/express/getTokenData',
+                    ['_secure' => $this->getRequest()->isSecure()]
+                ),
+                'onAuthorizeUrl' => $this->urlBuilder->getUrl(
+                    'paypal/express/onAuthorization',
+                    ['_secure' => $this->getRequest()->isSecure()]
+                ),
+                'onCancelUrl' => $this->urlBuilder->getUrl(
+                    'paypal/express/cancel',
+                    ['_secure' => $this->getRequest()->isSecure()]
+                )
+            ];
+            $smartButtonsConfig = $this->getIsShoppingCart()
+                ? $this->smartButtonConfig->getConfig('cart')
+                : $this->smartButtonConfig->getConfig('mini_cart');
+            $clientConfig = array_replace_recursive($clientConfig, $smartButtonsConfig);
+            $config = [
+                'Magento_Paypal/js/in-context/button' => [
+                    'clientConfig' => $clientConfig
+                ]
+            ];
+            $json = $this->serializer->serialize($config);
+        }
+
+        return $json;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContainerId()
+    {
+        return $this->getData('button_id');
+    }
+
+    /**
+     * Get quote id from session
+     *
+     * @return string
+     */
+    private function getQuoteId()
+    {
+        $quoteId = (int)$this->session->getQuoteId();
+        if (!$this->session->getQuote()->getCustomerId()) {
+            try {
+                $quoteId = $this->quoteIdMask->execute($quoteId);
+            } catch (NoSuchEntityException $e) {
+                $quoteId = "";
+            }
+        }
+        return (string)$quoteId;
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index b1f5b6df9f9cc..20e7b865e9761 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -67,20 +67,20 @@ class ExpressConfigProvider implements ConfigProviderInterface
     protected $urlBuilder;
 
     /**
-     *
+     * @var SmartButtonConfig
      */
     private $smartButtonConfig;
 
     /**
-     * Constructor
-     *
+     * ExpressConfigProvider constructor.
      * @param ConfigFactory $configFactory
      * @param ResolverInterface $localeResolver
      * @param CurrentCustomer $currentCustomer
      * @param PaypalHelper $paypalHelper
      * @param PaymentHelper $paymentHelper
      * @param UrlInterface $urlBuilder
-     * @param SmartButtonConfig $smartButtonConfig
+     * @param SmartButtonConfig|null $smartButtonConfig
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __construct(
         ConfigFactory $configFactory,
@@ -133,21 +133,17 @@ public function getConfig()
             $config['payment']['paypalExpress']['inContextConfig'] = [
                 'inContextId' => self::IN_CONTEXT_BUTTON_ID,
                 'merchantId' => $this->config->getValue('merchant_id'),
-                'path' => $this->urlBuilder->getUrl('paypal/express/gettoken', ['_secure' => true]),
-                'clientConfig' => [
-                    'environment' => ((int) $this->config->getValue('sandbox_flag') ? 'sandbox' : 'production'),
-                    'locale' => $locale,
-                    'button' => [
-                        self::IN_CONTEXT_BUTTON_ID
-                    ],
-                    'allowedFunding' => [],
-                    'disallowedFunding' => $this->smartButtonConfig->getDisallowedFunding(),
-                    'styles' => $this->smartButtonConfig->getButtonStyles('checkout'),
-                    'getTokenUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData'),
-                    'onAuthorizeUrl' => $this->urlBuilder->getUrl('paypal/express/onAuthorization'),
-                    'onCancelUrl' => $this->urlBuilder->getUrl('paypal/express/cancel')
+            ];
+            $clientConfig = [
+                'button' => [
+                    self::IN_CONTEXT_BUTTON_ID
                 ],
+                'getTokenUrl' => $this->urlBuilder->getUrl('paypal/express/getTokenData'),
+                'onAuthorizeUrl' => $this->urlBuilder->getUrl('paypal/express/onAuthorization'),
+                'onCancelUrl' => $this->urlBuilder->getUrl('paypal/express/cancel')
             ];
+            $clientConfig = array_replace_recursive($clientConfig, $this->smartButtonConfig->getConfig('checkout'));
+            $config['payment']['paypalExpress']['inContextConfig']['clientConfig'] = $clientConfig;
         }
 
         foreach ($this->methodCodes as $code) {
diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index cb16fe97f2a2f..5909c14ad0ad4 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -25,34 +25,69 @@ class SmartButtonConfig
     private $config;
 
     /**
-     * Constructor
-     *
-     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @var array
+     */
+    private $defaultStyles;
+
+    /**
+     * @param ResolverInterface $localeResolver
      * @param ConfigFactory $configFactory
+     * @param array $defaultStyles
      */
     public function __construct(
         ResolverInterface $localeResolver,
-        ConfigFactory $configFactory
+        ConfigFactory $configFactory,
+        $defaultStyles = []
     ) {
         $this->localeResolver = $localeResolver;
         $this->config = $configFactory->create();
+        $this->config->setMethod(Config::METHOD_EXPRESS);
+        $this->defaultStyles = $defaultStyles;
     }
 
+
+    /**
+     * Get smart button config
+     *
+     * @param string $page
+     * @return array
+     */
+    public function getConfig(string $page): array
+    {
+        return [
+            'merchantId' => $this->config->getValue('merchant_id'),
+            'environment' => ((int)$this->config->getValue('sandbox_flag') ? 'sandbox' : 'production'),
+            'locale' => $this->localeResolver->getLocale(),
+            'allowedFunding' => $this->getAllowedFunding(),
+            'disallowedFunding' => $this->getDisallowedFunding(),
+            'styles' => $this->getButtonStyles($page)
+        ];
+
+    }
     /**
      * Returns disallowed funding from configuration
      *
      * @return array
      */
-    public function getDisallowedFunding() : array
+    private function getDisallowedFunding() : array
     {
         $disallowedFunding = $this->config->getValue('disable_funding_options');
         return $disallowedFunding ? explode(',', $disallowedFunding) : [];
     }
 
+    /**
+     * Returns allowed funding
+     *
+     * @return array
+     */
+    private function getAllowedFunding() : array
+    {
+        return [];
+    }
+
     /**
      * Returns button styles based on configuration
      *
-     * @param string $page
      * @return array
      */
     public function getButtonStyles(string $page) : array
diff --git a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
index 58edf68f3475e..74f554020a6b9 100644
--- a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
+++ b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
@@ -50,7 +50,7 @@ public function execute(EventObserver $observer)
         /** @var \Magento\Catalog\Block\ShortcutButtons $shortcutButtons */
         $shortcutButtons = $observer->getEvent()->getContainer();
         $blocks = [
-            \Magento\Paypal\Block\Express\InContext\Minicart\Button::class =>
+            \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton::class =>
                 PaypalConfig::METHOD_WPS_EXPRESS,
             \Magento\Paypal\Block\Express\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
             \Magento\Paypal\Block\Bml\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
@@ -81,6 +81,8 @@ public function execute(EventObserver $observer)
                 $observer->getEvent()->getIsCatalogProduct()
             )->setShowOrPosition(
                 $observer->getEvent()->getOrPosition()
+            )->setIsShoppingCart(
+                (bool) $observer->getEvent()->getIsShoppingCart()
             );
             $shortcutButtons->addShortcut($shortcut);
         }
diff --git a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
index 7cb521073e309..16e474178bb35 100644
--- a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
@@ -9,9 +9,8 @@
 use Magento\Catalog\Block\ShortcutInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Event\Observer;
-use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Layout;
-use Magento\Paypal\Block\Express\InContext\Minicart\Button;
+use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton as Button;
 use Magento\Paypal\Helper\Shortcut\Factory;
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Observer\AddPaypalShortcutsObserver;
@@ -159,7 +158,7 @@ public function dataProviderShortcutsButtons()
         return [
             [
                 'blocks1' => [
-                    \Magento\Paypal\Block\Express\InContext\Minicart\Button::class => [
+                    \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
                         self::PAYMENT_AVAILABLE => true,
                         self::PAYMENT_IS_BML => false,
@@ -198,7 +197,7 @@ public function dataProviderShortcutsButtons()
             ],
             [
                 'blocks2' => [
-                    \Magento\Paypal\Block\Express\InContext\Minicart\Button::class => [
+                    \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
                         self::PAYMENT_AVAILABLE => false,
                         self::PAYMENT_IS_BML => false,
diff --git a/app/code/Magento/Paypal/etc/config.xml b/app/code/Magento/Paypal/etc/config.xml
index 60b817d10e976..1880417af1b48 100644
--- a/app/code/Magento/Paypal/etc/config.xml
+++ b/app/code/Magento/Paypal/etc/config.xml
@@ -17,10 +17,10 @@
                 <checkout_page_button_shape>rect</checkout_page_button_shape>
                 <checkout_page_button_color>gold</checkout_page_button_color>
                 <product_page_button_customize>0</product_page_button_customize>
-                <product_page_button_label>paypal</product_page_button_label>
-                <product_page_button_layout>vertical</product_page_button_layout>
+                <product_page_button_label>buynow</product_page_button_label>
+                <product_page_button_layout>horizontal</product_page_button_layout>
                 <product_page_button_size>responsive</product_page_button_size>
-                <product_page_button_shape>rect</product_page_button_shape>
+                <product_page_button_shape>pill</product_page_button_shape>
                 <product_page_button_color>gold</product_page_button_color>
                 <cart_page_button_customize>0</cart_page_button_customize>
                 <cart_page_button_label>paypal</cart_page_button_label>
diff --git a/app/code/Magento/Paypal/etc/frontend/di.xml b/app/code/Magento/Paypal/etc/frontend/di.xml
index 407c251fc42f4..b75d6f5682be7 100644
--- a/app/code/Magento/Paypal/etc/frontend/di.xml
+++ b/app/code/Magento/Paypal/etc/frontend/di.xml
@@ -86,7 +86,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Paypal\Block\Express\InContext\Minicart\Button">
+    <type name="Magento\Paypal\Block\Express\InContext\Minicart\SmartButton">
         <arguments>
             <argument name="data" xsi:type="array">
                 <item name="template" xsi:type="string">Magento_Paypal::express/in-context/shortcut/button.phtml</item>
@@ -116,4 +116,39 @@
     <type name="Magento\Quote\Model\QuoteRepository\SaveHandler">
         <plugin name="paypal-cartitem" type="Magento\Paypal\Model\Express\QuotePlugin"/>
     </type>
+
+    <type name="Magento\Paypal\Model\SmartButtonConfig">
+        <arguments>
+            <argument name="defaultStyles" xsi:type="array">
+                <item name="checkout" xsi:type="array">
+                    <item name="layout" xsi:type="string">vertical</item>
+                    <item name="size" xsi:type="string">responsive</item>
+                    <item name="color" xsi:type="string">gold</item>
+                    <item name="shape" xsi:type="string">rect</item>
+                    <item name="label" xsi:type="string">paypal</item>
+                </item>
+                <item name="cart" xsi:type="array">
+                    <item name="layout" xsi:type="string">vertical</item>
+                    <item name="size" xsi:type="string">responsive</item>
+                    <item name="color" xsi:type="string">gold</item>
+                    <item name="shape" xsi:type="string">rect</item>
+                    <item name="label" xsi:type="string">paypal</item>
+                </item>
+                <item name="mini_cart" xsi:type="array">
+                    <item name="layout" xsi:type="string">vertical</item>
+                    <item name="size" xsi:type="string">responsive</item>
+                    <item name="color" xsi:type="string">gold</item>
+                    <item name="shape" xsi:type="string">rect</item>
+                    <item name="label" xsi:type="string">paypal</item>
+                </item>
+                <item name="product" xsi:type="array">
+                    <item name="layout" xsi:type="string">horizontal</item>
+                    <item name="size" xsi:type="string">responsive</item>
+                    <item name="color" xsi:type="string">gold</item>
+                    <item name="shape" xsi:type="string">pill</item>
+                    <item name="label" xsi:type="string">buynow</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
index 3725f51f0b8bb..66dddfb0bda95 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
@@ -4,26 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Paypal\Block\Express\InContext\Minicart\Button;
-
 /**
- * @var \Magento\Paypal\Block\Express\InContext\Minicart\Button $block
+ * @var \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton $block
  */
-$config = [
-    'Magento_Paypal/js/in-context/button' => [
-        'id' => $block->escapeHtml($block->getContainerId()),
-        'linkDataAction' => $block->escapeHtml($block->getLinkAction()),
-        'paypalButton' => $block->escapeHtml(Button::PAYPAL_BUTTON_ID),
-        'addToCartSelector' => $block->escapeHtml($block->getAddToCartSelector())
-    ]
-];
-
 ?>
-<div data-mage-init='<?= /* @noEscape */ json_encode($config) ?>'
+<div data-mage-init='<?= /* @noEscape */ $block->getJsInitParams() ?>'
      class="paypal checkout paypal-logo <?= $block->escapeHtml($block->getContainerId()) ?>-container">
-    <a data-action="<?= $block->escapeHtml($block->getLinkAction()) ?>" href="#">
-        <img class="paypal-button-hidden"
-             src="<?= $block->escapeHtml($block->getImageUrl()) ?>"
-             alt="Check out with PayPal" />
-    </a>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
index 39f9b98de9e5c..d6315e7a7dcb5 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
@@ -4,38 +4,62 @@
  */
 define([
     'uiComponent',
-    'jquery'
-], function (Component, $) {
+    'jquery',
+    'Magento_Paypal/js/in-context/express-checkout-smart-buttons',
+    'Magento_Customer/js/customer-data'
+], function (Component, $, checkoutSmartButtons, customerData) {
     'use strict';
 
     return Component.extend({
         /**
          * @returns {Object}
          */
-        initialize: function () {
+        initialize: function (config, element) {
             this._super();
 
-            return this.initEvents();
+            this.prepareClientConfig();
+
+            checkoutSmartButtons(this.prepareClientConfig(), element);
         },
 
         /**
-         * @returns {Object}
+         *  Validates Smart Buttons
          */
-        initEvents: function () {
-            $('a[data-action="' + this.linkDataAction + '"]').off('click.' + this.id)
-                .on('click.' + this.id, this.click.bind(this));
+        validate: function (actions) {
+            this.clientConfig.buttonActions = actions || this.clientConfig.buttonActions;
+            this.clientConfig.buttonActions.enable();
+        },
 
-            return this;
+        /**
+         * Populate client config with all required data
+         *
+         * @return {Object}
+         */
+        prepareClientConfig: function () {
+            this.clientConfig.client = {};
+            this.clientConfig.client[this.clientConfig.environment] = this.clientConfig.merchantId;
+            this.clientConfig.rendererComponent = this;
+            this.clientConfig.formKey = $.mage.cookies.get('form_key');
+            this.clientConfig.commit = false;
+            return this.clientConfig;
         },
 
         /**
-         * @param {Object} event
-         * @returns void
+         * Adding logic to be triggered onClick action for smart buttons component
          */
-        click: function (event) {
-            event.preventDefault();
+        onClick: function() {},
 
-            $('#' + this.paypalButton).click();
+        /**
+         * Adds error message
+         *
+         * @param {string} message
+         */
+        addError: function(message) {
+            customerData.set('messages', {messages: [{
+                    type: 'error',
+                    text: message
+                }],
+                data_id: Math.floor(Date.now() / 1000)});
         }
     });
 });
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 72441139c4a48..0c23a23497d0a 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -4,9 +4,8 @@
  */
 define([
     'paypalInContextExpressCheckout',
-    'Magento_Ui/js/model/messageList',
     'mage/translate'
-], function (paypal, messageList, $t) {
+], function (paypal, $t) {
     'use strict';
 
     /**
@@ -33,7 +32,7 @@ define([
             style: clientConfig.styles,
 
             // Enable Pay Now checkout flow (optional)
-            commit: true,
+            commit: clientConfig.commit,
 
             /**
              * Validate payment method
@@ -48,9 +47,7 @@ define([
              * Execute logic on Paypal button click
              */
             onClick: function () {
-                if (typeof clientConfig.onClick === 'function') {
-                    clientConfig.onClick();
-                }
+                clientConfig.rendererComponent.onClick();
             },
 
             /**
@@ -75,10 +72,7 @@ define([
                                     return resolve(res.token);
                                 }
 
-                                messageList.addErrorMessage({
-                                    message: res['error_message']
-                                });
-
+                                clientConfig.rendererComponent.addError(res['error_message']);
                                 return reject(new Error(res['error_message']));
                             });
                         }).fail(function (response) {
@@ -89,10 +83,8 @@ define([
                             } catch (exception) {
                                 error = $t('Something went wrong with your request. Please try again later.');
                             }
-                            messageList.addErrorMessage({
-                                message: error
-                            });
 
+                            clientConfig.rendererComponent.addError(error);
                             return reject(new Error(error));
                         });
                     });
@@ -102,10 +94,7 @@ define([
                     if (res.success) {
                         return res.token;
                     }
-
-                    messageList.addErrorMessage({
-                        message: res['error_message']
-                    });
+                    clientConfig.rendererComponent.addError(res['error_message']);
                 });
             },
 
@@ -121,7 +110,6 @@ define([
                     paymentToken: data.paymentToken,
                     payerId: data.payerID,
                     quoteId: clientConfig.quoteId,
-                    method: clientConfig.payment.method,
                     customerId: clientConfig.customerId || '',
                     'form_key': clientConfig.formKey
                 };
@@ -131,10 +119,7 @@ define([
 
                         return actions.redirect(window, res.redirectUrl);
                     }
-
-                    messageList.addErrorMessage({
-                        message: res['error_message']
-                    });
+                    clientConfig.rendererComponent.addError(res['error_message']);
                 });
 
             },
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index 52f3e8e3f5819..131a4a14fe99a 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -85,33 +85,38 @@ define([
          * @return {Object}
          */
         prepareClientConfig: function () {
-            this.clientConfig.payment = {
-                method: this.item.method
-            };
             this.clientConfig.quoteId = window.checkoutConfig.quoteData['entity_id'];
             this.clientConfig.formKey = window.checkoutConfig.formKey;
             this.clientConfig.customerId = window.customerData.id;
             this.clientConfig.button = 0;
             this.clientConfig.merchantId = this.merchantId;
-            this.clientConfig.validator = additionalValidators;
             this.clientConfig.client = {};
             this.clientConfig.client[this.clientConfig.environment] = this.merchantId;
             this.clientConfig.additionalAction = setPaymentMethodAction;
             this.clientConfig.rendererComponent = this;
             this.clientConfig.messageContainer = this.messageContainer;
-
-            /** Add logic to be triggered onClick action for smart buttons component*/
-            this.clientConfig.onClick = function () {
-                additionalValidators.validate();
-                this.selectPaymentMethod();
-            };
-            _.each(this.clientConfig, function (fn, name) {
-                if (_.isFunction(fn)) {
-                    this.clientConfig[name] = fn.bind(this);
-                }
-            }, this);
+            this.clientConfig.commit = true;
 
             return this.clientConfig;
+        },
+
+        /**
+         * Adding logic to be triggered onClick action for smart buttons component
+         */
+        onClick: function() {
+            additionalValidators.validate();
+            this.selectPaymentMethod();
+        },
+
+        /**
+         * Adds error message
+         *
+         * @param {string} message
+         */
+        addError: function(message) {
+            messageList.addErrorMessage({
+                message: message
+            });
         }
     });
 });

From 0b4e01787f63f7ce1753f04d1b4894caad0eb9ec Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 23 Jan 2019 16:54:45 -0600
Subject: [PATCH 798/932] GraphQl-232: GraphQL tools cannot perform "standard
 introspection query" in production mode

---
 .../GraphQl/Query/IntrospectionConfiguration.php          | 4 ++--
 .../Framework/GraphQl/Query/QueryComplexityLimiter.php    | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
index 1bdb5e56d10de..0182b68957adc 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
@@ -14,7 +14,7 @@
  */
 class IntrospectionConfiguration
 {
-    const CONFIG_PATH_DISABLE_INTROSPECTION = 'graphql/disable_introspection';
+    private const CONFIG_PATH_DISABLE_INTROSPECTION = 'graphql/disable_introspection';
 
     /**
      * @var DeploymentConfig
@@ -35,7 +35,7 @@ public function __construct(
      *
      * @return int
      */
-    public function disableIntrospection(): int
+    public function isIntrospectionDisabled(): int
     {
         return (int) $this->deploymentConfig->get(self::CONFIG_PATH_DISABLE_INTROSPECTION);
     }
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
index 2e88f8902b663..5a35200c03a6f 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
@@ -11,7 +11,6 @@
 use GraphQL\Validator\Rules\DisableIntrospection;
 use GraphQL\Validator\Rules\QueryDepth;
 use GraphQL\Validator\Rules\QueryComplexity;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * QueryComplexityLimiter
@@ -47,12 +46,11 @@ class QueryComplexityLimiter
     public function __construct(
         int $queryDepth,
         int $queryComplexity,
-        IntrospectionConfiguration $introspectionConfig = null
+        IntrospectionConfiguration $introspectionConfig
     ) {
         $this->queryDepth = $queryDepth;
         $this->queryComplexity = $queryComplexity;
-        $this->introspectionConfig = $introspectionConfig ?? ObjectManager::getInstance()
-                ->get(IntrospectionConfiguration::class);
+        $this->introspectionConfig = $introspectionConfig;
     }
 
     /**
@@ -63,7 +61,7 @@ public function __construct(
     public function execute(): void
     {
         DocumentValidator::addRule(new QueryComplexity($this->queryComplexity));
-        DocumentValidator::addRule(new DisableIntrospection($this->introspectionConfig->disableIntrospection()));
+        DocumentValidator::addRule(new DisableIntrospection($this->introspectionConfig->isIntrospectionDisabled()));
         DocumentValidator::addRule(new QueryDepth($this->queryDepth));
     }
 }

From b6fe3ff39e221b6604b29753f5c378d93a063296 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 23 Jan 2019 17:00:00 -0600
Subject: [PATCH 799/932] GraphQl-232: GraphQL tools cannot perform "standard
 introspection query" in production mode

---
 .../Framework/GraphQl/Query/IntrospectionConfiguration.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
index 0182b68957adc..2fdb3df5f6d71 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/IntrospectionConfiguration.php
@@ -33,10 +33,10 @@ public function __construct(
     /**
      * Check the the environment config to determine if introspection should be disabled.
      *
-     * @return int
+     * @return bool
      */
-    public function isIntrospectionDisabled(): int
+    public function isIntrospectionDisabled(): bool
     {
-        return (int) $this->deploymentConfig->get(self::CONFIG_PATH_DISABLE_INTROSPECTION);
+        return (bool)$this->deploymentConfig->get(self::CONFIG_PATH_DISABLE_INTROSPECTION);
     }
 }

From 9889d0ffac1b8bb05940a9bf3684156cee4c685c Mon Sep 17 00:00:00 2001
From: John S <john00ivy@gmail.com>
Date: Wed, 23 Jan 2019 17:29:00 -0600
Subject: [PATCH 800/932] MQE-1421: Updating EndToEnd Tests

- Updating hardcoded schema paths with the URN versions.
---
 .../Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml  | 2 +-
 .../ActionGroup/AdminOrderBraintreeFillActionGroup.xml     | 6 +++---
 .../Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml    | 6 +++---
 .../Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml    | 6 +++---
 .../Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml  | 6 +++---
 .../Test/Mftf/ActionGroup/DeleteProductActionGroup.xml     | 5 +++--
 .../Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml     | 7 +++----
 .../Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml   | 3 +--
 .../Magento/Braintree/Test/Mftf/Data/NewProductData.xml    | 3 +--
 .../Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml | 6 ++++--
 .../Braintree/Test/Mftf/Section/AdminCreateUserSection.xml | 6 ++++--
 .../Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml | 6 ++++--
 .../Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml | 6 ++++--
 .../Test/Mftf/Section/AdminEditRoleInfoSection.xml         | 6 ++++--
 .../Test/Mftf/Section/AdminEditUserRoleSection.xml         | 6 ++++--
 .../Braintree/Test/Mftf/Section/AdminEditUserSection.xml   | 6 ++++--
 .../Braintree/Test/Mftf/Section/AdminMenuSection.xml       | 2 +-
 .../Braintree/Test/Mftf/Section/AdminRoleGridSection.xml   | 6 ++++--
 .../Braintree/Test/Mftf/Section/AdminUserGridSection.xml   | 6 ++++--
 .../Test/Mftf/Section/BraintreeConfiguraionSection.xml     | 7 ++++---
 .../Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml  | 2 +-
 .../Test/Mftf/Section/ConfigurationListSection.xml         | 2 +-
 .../Test/Mftf/Section/ConfigurationPaymentSection.xml      | 2 +-
 .../Braintree/Test/Mftf/Section/CustomersPageSection.xml   | 2 +-
 .../Test/Mftf/Section/CustomersSubmenuSection.xml          | 2 +-
 .../Braintree/Test/Mftf/Section/NewCustomerPageSection.xml | 3 +--
 .../Braintree/Test/Mftf/Section/NewOrderSection.xml        | 7 ++++---
 .../Braintree/Test/Mftf/Section/NewProductPageSection.xml  | 2 +-
 .../Braintree/Test/Mftf/Section/ProductsPageSection.xml    | 3 +--
 .../Braintree/Test/Mftf/Section/StoresSubmenuSection.xml   | 2 +-
 .../Braintree/Test/Mftf/Section/SwitchAccountSection.xml   | 5 +----
 .../Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml    | 3 +--
 app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml  | 2 +-
 .../Catalog/Test/Mftf/Metadata/catalog_price-meta.xml      | 5 +++--
 .../Test/Mftf/Section/StorefrontMiniCartSection.xml        | 2 +-
 ...ngAndQuantityIncrementsWorkWithDecimalinventoryTest.xml | 4 ++--
 ...entityOfDefaultBillingAndShippingAddressActionGroup.xml | 5 ++---
 .../ActionGroup/StorefrontShippmentFromActionGroup.xml     | 4 ++--
 app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml   | 4 ++--
 .../IdentityOfDefaultBillingAndShippingAddressSection.xml  | 3 +--
 .../Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml    | 5 +++--
 .../IdentityOfDefaultBillingAndShippingAddressTest.xml     | 2 +-
 .../Magento/Config/Test/Mftf/Data/SystemConfigData.xml     | 2 +-
 .../Config/Test/Mftf/Metadata/system_config-meta.xml       | 3 ++-
 .../ConfigurableProductAttributeNameDesignActionGroup.xml  | 4 +---
 .../Data/ConfigurableProductAttributeNameDesignData.xml    | 3 +--
 .../ConfigurableProductAttributeNameDesignSection.xml      | 4 +---
 .../Section/VerifySubscribedNewsLetterDisplayedSection.xml | 6 ++----
 .../Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml  | 4 ++--
 .../Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml        | 2 +-
 .../Mftf/Test/AdminCreateOrderWithBundleProductTest.xml    | 5 +++--
 .../Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml  | 3 ++-
 .../Test/Mftf/Section/CartPriceRulesSubmenuSection.xml     | 4 ++--
 .../User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml    | 6 +++---
 .../User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml    | 5 ++---
 .../Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml     | 2 +-
 .../Widget/Test/Mftf/Section/AdminWidgetsSection.xml       | 2 +-
 .../Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml  | 2 +-
 ...gurableProductChildImageShouldBeShownOnWishListTest.xml | 3 ++-
 .../Test/Mftf/Test/StorefrontUpdateWishlistTest.xml        | 7 +++----
 60 files changed, 126 insertions(+), 119 deletions(-)

diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
index 8c258accdf06c..ed30395406f7d 100644
--- a/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
         <section name="AdminMenuSection"/>
     </page>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
index 412513c59c63c..be8abbad80cd1 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml
@@ -5,9 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOrderBraintreeFillActionGroup">
         <!--Select Braintree Payment method on Admin Order Create Page-->
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
@@ -39,4 +39,4 @@
         <wait stepKey="waitForFillCVV" time="1"/>
         <switchToIFrame stepKey="switchBackFromCVV"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
index a68042127ec48..047f656f5eabe 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateCustomerActionGroup.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateCustomerActionGroup">
         <click stepKey="openCustomers" selector="{{AdminMenuSection.customers}}"/>
         <waitForAjaxLoad stepKey="waitForCatalogSubmenu" time="5"/>
@@ -39,6 +40,5 @@
         <click stepKey="save" selector="{{NewCustomerPageSection.saveCustomer}}"/>
         <waitForPageLoad stepKey="waitForCustomersPage" time="10"/>
         <waitForElementVisible selector="{{NewCustomerPageSection.createdSuccessMessage}}" stepKey="waitForSuccessfullyCreatedMessage" time="20"/>
-
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
index 17d634c009b3e..1f3b70f22fdcc 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewOrderActionGroup.xml
@@ -5,9 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="useBraintreeForMasterCard">
         <click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
         <waitForPageLoad stepKey="waitForBraintreeConfigs" time="5"/>
@@ -36,4 +36,4 @@
         <wait stepKey="waitForFillCVV" time="1"/>
         <switchToIFrame stepKey="switchBackFromCVV"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
index 19de3e859ae9a..53de47f810600 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/CreateNewProductActionGroup.xml
@@ -5,10 +5,10 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateNewProductActionGroup">
-
         <click stepKey="openCatalog" selector="{{AdminMenuSection.catalog}}"/>
         <waitForPageLoad stepKey="waitForCatalogSubmenu" time="5"/>
         <click stepKey="clickOnProducts" selector="{{CatalogSubmenuSection.products}}"/>
@@ -22,4 +22,4 @@
         <waitForElementVisible stepKey="waitForSuccessfullyCreatedMessage" selector="{{NewProductPageSection.createdSuccessMessage}}" time="10"/>
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
index 724c6d92846c4..7491b39aa8f20 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/DeleteProductActionGroup.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="DeleteProductActionGroup">
         <arguments>
             <argument name="productName" defaultValue=""/>
@@ -23,4 +24,4 @@
         <click stepKey="clickOnOk" selector="{{ProductsPageSection.ok}}"/>
         <waitForElementVisible stepKey="waitForSuccessfullyDeletedMessage" selector="{{ProductsPageSection.deletedSuccessMessage}}" time="10"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
index 7c774a634b369..4c59edbcb8057 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml
@@ -5,9 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Sign out-->
     <actionGroup name="SignOut">
         <click selector="{{SignOutSection.admin}}" stepKey="clickToAdminProfile"/>
@@ -24,5 +24,4 @@
         <fillField userInput="{{NewAdmin.password}}" selector="{{LoginFormSection.password}}" stepKey="fillPassword"/>
         <click selector="{{LoginFormSection.signIn}}" stepKey="clickLogin"/>
     </actionGroup>
-
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
index 30345ec31bacd..cdd117c2a0b12 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/NewCustomerData.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="NewCustomerData" type="braintree_config_state">
         <data key="FirstName">Abgar</data>
         <data key="LastName">Abgaryan</data>
@@ -20,5 +20,4 @@
         <data key="PhoneNumber">9999</data>
         <data key="Country">Armenia</data>
     </entity>
-
 </entities>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml b/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
index 72661ae94076f..4479805cb12fb 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Data/NewProductData.xml
@@ -7,11 +7,10 @@
 -->
 
 <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="NewProductData" type="braintree_config_state">
         <data key="ProductName">ProductTest</data>
         <data key="Price">100</data>
         <data key="Quantity">100</data>
     </entity>
-
 </entities>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
index 1158f471d51f0..7dd313a2ba897 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -5,7 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateRoleSection">
         <element name="create" type="button" selector="#add"/>
         <element name="name" type="button" selector="#role_name"/>
@@ -21,4 +23,4 @@
         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
index 98d748b5a30ea..376b0b9f66db9 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateUserSection.xml
@@ -5,7 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateUserSection">
         <element name="system" type="input" selector="#menu-magento-backend-system"/>
         <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
@@ -20,4 +22,4 @@
         <element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
         <element name="saveButton" type="button" selector="#save"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
index 220c9a444b02f..1b55d09d0597e 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
@@ -5,11 +5,13 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDeleteRoleSection">
         <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
         <element name="current_pass" type="button" selector="#current_password"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
         <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
index bf2e2b44eb602..0ba197999be6c 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
@@ -5,11 +5,13 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDeleteUserSection">
         <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
         <element name="password" selector="#user_current_password" type="input"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
         <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
index e37ce8f4738b3..a34cdf15e7ad7 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -5,7 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditRoleInfoSection">
         <element name="roleName" type="input" selector="#role_name"/>
         <element name="password" type="input" selector="#current_password"/>
@@ -18,4 +20,4 @@
         <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
         <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
index e999413c96d74..216292b81162c 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml
@@ -5,7 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditUserRoleSection">
         <element name="usernameTextField" type="input" selector="#user_username"/>
         <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
@@ -14,4 +16,4 @@
         <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
index 2e5fcfb7b5c8d..cee262864d8ca 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml
@@ -5,7 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditUserSection">
         <element name="system" type="input" selector="#menu-magento-backend-system"/>
         <element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
@@ -25,4 +27,4 @@
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
         <element name="saveButton" type="button" selector="#save"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
index eb7a9ce2c376e..24e5efdc610ff 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMenuSection">
         <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
         <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
index 63cbadc71d3d3..1cf54bf94e772 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
@@ -5,7 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminRoleGridSection">
         <element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
         <element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
@@ -14,4 +16,4 @@
         <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
index 9564bc61f799c..7c4a76871d58c 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
@@ -5,7 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminUserGridSection">
         <element name="usernameFilterTextField" type="input" selector="#permissionsUserGrid_filter_username"/>
         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
@@ -14,4 +16,4 @@
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
         <element name="successMessage" type="text" selector=".message-success"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
index 016af2e102744..f8802e9a34ae5 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml
@@ -5,7 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BraintreeConfiguraionSection">
         <element name="titleForBraintreeSettings" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_title']"/>
         <element name="environment" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_environment']"/>
@@ -29,6 +31,5 @@
         <element name="actionAuthorize" type="text" selector="//select[@id='payment_us_braintree_section_braintree_braintree_paypal_payment_action']/option[text()='Authorize']"/>
         <element name="save" type="button" selector="//span[text()='Save Config']"/>
         <element name="successfulMessage" type="text" selector="//*[@data-ui-id='messages-message-success']"/>
-
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
index 32f02a69f817e..84a81c5204acc 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/CatalogSubmenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CatalogSubmenuSection">
         <element name="products" type="button" selector="//li[@id='menu-magento-catalog-catalog']//li[@data-ui-id='menu-magento-catalog-catalog-products']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
index 100407438eaae..bce5f95cf78a6 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationListSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ConfigurationListSection">
         <element name="sales" type="button" selector="//div[contains(@class, 'admin__page-nav-title title _collapsible')]/strong[text()='Sales']"/>
         <element name="salesPaymentMethods" type="button" selector="//span[text()='Payment Methods']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
index 885a45be721f1..2192dd935c331 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ConfigurationPaymentSection">
         <element name="configureButton" type="button" selector="//button[@id='payment_us_braintree_section_braintree-head']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
index e4a75b1b6a842..60c635387199a 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CustomersPageSection">
         <element name="addNewCustomerButton" type="button" selector="//*[@id='add']"/>
         <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
index 937afb83da96f..6eeef1ba9daf0 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/CustomersSubmenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CustomersSubmenuSection">
         <element name="allCustomers" type="button" selector="//li[@id='menu-magento-customer-customer']//li[@data-ui-id='menu-magento-customer-customer-manage']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
index d302f9c7d0cba..abb8aa6c1d826 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/NewCustomerPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewCustomerPageSection">
         <element name="associateToWebsite" type="select" selector="//*[@class='admin__field-control _with-tooltip']//*[@class='admin__control-select']"/>
         <element name="group" type="select" selector="//div[@class='admin__field-control admin__control-fields required']//div[@class='admin__field-control']//select[@class='admin__control-select']"/>
@@ -28,6 +28,5 @@
         <element name="phoneNumber" type="input" selector="//input[contains(@name, 'telephone')]"/>
         <element name="saveCustomer" type="button" selector="//button[@title='Save Customer']"/>
         <element name="createdSuccessMessage" type="button" selector="//div[@data-ui-id='messages-message-success']"/>
-
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
index 13f59ad2cf18e..26e00bf4c0aa4 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/NewOrderSection.xml
@@ -5,7 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewOrderSection">
         <element name="createNewOrder" type="button" selector="#add"/>
         <element name="customer" type="button" selector="//td[contains(text(), 'Abgar')]"/>
@@ -30,6 +32,5 @@
         <element name="cvv" type="input" selector="#cvv"/>
         <element name="submitOrder" type="input" selector="#submit_order_top_button"/>
         <element name="successMessage" type="input" selector="#messages"/>
-
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
index 42e451940c91b..b98bd47b54132 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/NewProductPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="NewProductPageSection">
         <element name="productName" type="input" selector="//input[@name='product[name]']"/>
         <element name="sku" type="input" selector="//input[@name='product[sku]']"/>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
index 267efdf3d0e5e..ea37eb59b67f4 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/ProductsPageSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ProductsPageSection">
         <element name="addProductButton" type="button" selector="//button[@id='add_new_product-button']"/>
         <element name="checkboxForProduct" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
@@ -15,6 +15,5 @@
         <element name="delete" type="button" selector="//*[contains(@class,'admin__data-grid-header-row row row-gutter')]//*[text()='Delete']"/>
         <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
         <element name="deletedSuccessMessage" type="button" selector="//*[@class='message message-success success']"/>
-
     </section>
 </sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
index f094baa9f3446..806762f826462 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/StoresSubmenuSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StoresSubmenuSection">
         <element name="configuration" type="button" selector="//li[@id='menu-magento-backend-stores']//li[@data-ui-id='menu-magento-config-system-config']"/>
     </section>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
index 3a07cbc6dd145..4442e317694ee 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Section/SwitchAccountSection.xml
@@ -7,8 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="LoginFormSection">
         <element name="username" type="input" selector="#username"/>
         <element name="password" type="input" selector="#login"/>
@@ -19,6 +18,4 @@
         <element name="admin" type="button" selector=".admin__action-dropdown-text"/>
         <element name="logout" type="button" selector="//*[contains(text(), 'Sign Out')]"/>
     </section>
-
 </sections>
-
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml
index cad8a8cd03e0d..0f7f4da1b68c0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogPriceData.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="CatalogPriceScopeWebsite" type="catalog_price_config_state">
         <requiredEntity type="scope">scopeWebsite</requiredEntity>
         <requiredEntity type="default_product_price">defaultProductPrice</requiredEntity>
@@ -29,5 +29,4 @@
     <entity name="defaultProductPrice" type="default_product_price">
         <data key="value"/>
     </entity>
-
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
index 0aec1244d2650..2be9a7a0358a1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.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="testDataTierPrice" type="data">
         <data key="goldenPrice1">$676.50</data>
         <data key="goldenPrice2">$615.00</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
index e16688ba0d37b..1ee57c89b2b31 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_price-meta.xml
@@ -5,8 +5,9 @@
   * 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">
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CatalogPriceConfigState" dataType="catalog_price_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
         <object key="groups" dataType="catalog_price_config_state">
             <object key="price" dataType="catalog_price_config_state">
@@ -21,4 +22,4 @@
             </object>
         </object>
     </operation>
-</operations>
\ No newline at end of file
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml
index ff2e5f2f36015..c6ea96715cf82 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontMiniCartSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontMiniCartSection">
         <element name="quantity" type="button" selector="span.counter-number"/>
         <element name="show" type="button" selector="a.showcart"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
index f283a040ced41..4d7c97b26457c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest">
         <annotations>
             <features value="Catalog"/>
@@ -84,4 +84,4 @@
         <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickOnUpdateShoppingCartButton"/>
         <seeInField userInput="5.5" selector="{{CheckoutCartProductSection.ProductQuantityByName(('$$createPreReqSimpleProduct.name$$'))}}" stepKey="seeInField2"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
index 6e5f127eefc18..15c157a982643 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/IdentityOfDefaultBillingAndShippingAddressActionGroup.xml
@@ -5,9 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Assert That Shipping And Billing Address are the same-->
     <actionGroup name="AssertThatShippingAndBillingAddressTheSame">
         <!--Get shipping and billing addresses-->
@@ -18,5 +18,4 @@
         <see userInput="Billing Address" stepKey="seeBillingAddress"/>
         <assertEquals stepKey="assert" actual="$billingAddr" expected="$shippingAddr"/>
     </actionGroup>
-
 </actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
index 354ad6d2b44ba..d3d96cb9c743c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Fill shipment form for free shipping-->
     <actionGroup name="ShipmentFormFreeShippingActionGroup">
         <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="setCustomerEmail"/>
@@ -26,4 +26,4 @@
         <waitForPageLoad time="5" stepKey="waitForReviewAndPaymentsPageIsLoaded"/>
         <seeInCurrentUrl url="payment" stepKey="reviewAndPaymentIsShown"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml
index dc82932ec5ca7..7fc349bf9f05c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/CountryData.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="Countries" type="countryArray">
         <array key="country">
             <item>Bahamas</item>
@@ -35,4 +35,4 @@
             <item>United Kingdom</item>
         </array>
     </entity>
-</entities>
\ No newline at end of file
+</entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
index 89b3a25b45e3c..2039128ac2de3 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/IdentityOfDefaultBillingAndShippingAddressSection.xml
@@ -7,8 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ShipmentFormSection">
         <element name="shippingAddress" type="textarea" selector="//*[@class='box box-billing-address']//address"/>
         <element name="billingAddress" type="textarea" selector="//*[@class='box box-shipping-address']//address"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
index 269ca94b3f772..851d22b8928ba 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutSpecificDestinationsTest.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CheckoutSpecificDestinationsTest">
         <annotations>
             <title value="Check that top destinations can be removed after a selection was previously saved"/>
@@ -83,4 +84,4 @@
             <deleteData createDataKey="defaultCategory" stepKey="deleteCategory"/>
         </after>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
index 9664ec47420cc..9412313dccca3 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/IdentityOfDefaultBillingAndShippingAddressTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="IdentityOfDefaultBillingAndShippingAddressTest">
         <annotations>
             <features value="Customer"/>
diff --git a/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml b/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml
index 75dc19dc99c8e..85188eb6e04cb 100644
--- a/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.xml
+++ b/app/code/Magento/Config/Test/Mftf/Data/SystemConfigData.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="AdminAccountSharingYes" type="admin_account_sharing_value">
         <data key="value">Yes</data>
     </entity>
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
index 37b8414d1f396..e7544c4e8ae28 100644
--- a/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/system_config-meta.xml
@@ -5,8 +5,9 @@
   * 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">
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="AdminAccountSharingConfig" dataType="admin_account_sharing_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/admin/" method="POST">
         <object key="groups" dataType="admin_account_sharing_config">
             <object key="security" dataType="admin_account_sharing_config">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml
index 95533057608f2..c4ad02ee14134 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/ConfigurableProductAttributeNameDesignActionGroup.xml
@@ -7,8 +7,7 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="GotoCatalogProductsPage">
 
         <!--Click on Catalog item-->
@@ -168,5 +167,4 @@
         <waitForPageLoad stepKey="waitForAllFilterReset"/>
 
     </actionGroup>
-
 </actionGroups>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml
index 73a668fd2fefd..0018f5996c9bc 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductAttributeNameDesignData.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="NewProductsData" type="user">
         <data key="productName" unique="prefix">Shoes</data>
         <data key="price">60</data>
@@ -31,5 +31,4 @@
         <data key="configurableProduct">configurable</data>
         <data key="errorMessage">element.disabled is not a function</data>
     </entity>
-
 </entities>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml
index b3077d9d5d566..ea5638f6816c9 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/ConfigurableProductAttributeNameDesignSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CatalogProductsSection">
         <element name="catalogItem" type="button" selector="//*[@id='menu-magento-catalog-catalog']/a/span"/>
         <element name="productItem" type="button" selector="//*[@data-ui-id='menu-magento-catalog-catalog-products']/a"/>
@@ -53,7 +53,6 @@
         <element name="saveAttributeButton" type="button" selector="//*[@id='save']"/>
         <element name="advancedAttributeProperties" type="button" selector="//*[@id='advanced_fieldset-wrapper']//*[contains(text(),'Advanced Attribute Properties')]"/>
         <element name="attributeCodeField" type="input"  selector="//*[@id='attribute_code']"/>
-
     </section>
 
     <section name="CreateProductConfigurations">
@@ -64,5 +63,4 @@
         <element name="checkboxBlack" type="input" selector="//fieldset[@class='admin__fieldset admin__fieldset-options']//*[contains(text(),'black')]/preceding-sibling::input"/>
         <element name="errorMessage" type="input" selector="//div[@data-ui-id='messages-message-error']"/>
     </section>
-
 </sections>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
index 06f762900436e..bb651784d4dcf 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/VerifySubscribedNewsLetterDisplayedSection.xml
@@ -7,8 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerCreateFormSection">
         <element name="signUpForNewsletter" type="checkbox" selector="//span[contains(text(), 'Sign Up for Newsletter')]"/>
     </section>
@@ -16,5 +15,4 @@
     <section name="CustomerMyAccountPage">
         <element name="DescriptionNewsletter" type="text" selector=".box-newsletter p"/>
     </section>
-
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
index faed8b1af952e..83917c5385c96 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="VerifySubscribedNewsletterDisplayedTest">
         <annotations>
             <features value="Newsletter"/>
@@ -63,4 +64,3 @@
         </actionGroup>
     </test>
 </tests>
-
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
index 94e99d25dbb60..099cf7fbce914 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateInvoiceTest">
         <annotations>
             <features value="Sales"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
index f15f5de5df696..d087b291de87c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateOrderWithBundleProductTest">
         <annotations>
             <title value="Create Order in Admin and update bundle product configuration"/>
@@ -108,4 +109,4 @@
             <deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
         </after>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
index 041252af0ac5b..63607e59c41b2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminSubmitConfigurableProductOrderTest">
         <annotations>
             <title value="Create Order in Admin and update product configuration"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml
index f3d5e9627efcf..eb4098d71dca2 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/CartPriceRulesSubmenuSection.xml
@@ -7,8 +7,8 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CartPriceRulesSubmenuSection">
         <element name="cartPriceRules" type="button" selector="//li[@data-ui-id='menu-magento-catalogrule-promo']//li[@data-ui-id='menu-magento-salesrule-promo-quote']"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
index d8a6a60299f8e..b1f376ff75d03 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
@@ -5,8 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="GoToUserRoles">
         <click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
         <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
@@ -32,7 +33,6 @@
         <see userInput="You saved the role." stepKey="seeSuccessMessage" />
     </actionGroup>
 
-
     <!--Delete role-->
     <actionGroup name="AdminDeleteRoleActionGroup">
         <arguments>
@@ -46,4 +46,4 @@
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
index 3e776df9fb97f..8dffd47034d34 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
@@ -5,9 +5,9 @@
   * See COPYING.txt for license details.
   */
 -->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
 
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!--Go to all users-->
     <actionGroup name="GoToAllUsers">
         <click selector="{{AdminCreateUserSection.system}}" stepKey="clickOnSystemIcon"/>
@@ -39,7 +39,6 @@
         <see userInput="You saved the user." stepKey="seeSuccessMessage" />
     </actionGroup>
 
-
     <!--Delete User-->
     <actionGroup name="AdminDeleteUserActionGroup">
         <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
diff --git a/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml b/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml
index 421899ad21646..46209f9e5f015 100644
--- a/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Page/AdminWidgetsPage.xml
@@ -7,7 +7,7 @@
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminWidgetsPage" url="admin/widget_instance/" area="admin" module="Magento_Widget">
         <section name="AdminWidgetsSection"/>
     </page>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml
index 5a0515d35ad58..f3282362d9aa1 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminWidgetsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminWidgetsSection">
         <element name="widgetTitleSearch" type="input" selector="#widgetInstanceGrid_filter_title"/>
         <element name="searchButton" type="button" selector=".action-default.scalable.action-secondary"/>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
index 23908626389f9..0e2f6cec73a92 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/StorefrontWidgetsSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontWidgetsSection">
         <element name="widgetProductsGrid" type="block" selector=".block.widget.block-products-list.grid"/>
         <element name="widgetProductName" type="text" selector=".product-item-name"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
index 42d4203999a44..6b951c89208c2 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
@@ -6,7 +6,8 @@
   */
 -->
 
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ConfigurableProductChildImageShouldBeShownOnWishListTest">
         <annotations>
             <features value="Wishlist"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
index 9f11de49adcd4..95309b76c1eb7 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
@@ -5,14 +5,14 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontUpdateWishlistTest">
         <annotations>
             <title value="Displaying of message after Wish List update"/>
             <stories value="MAGETWO-91666: Wishlist update does not return a success message"/>
             <description value="Displaying of message after Wish List update"/>
-            <features value="Wishlist"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-94296"/>
             <group value="Wishlist"/>
@@ -54,6 +54,5 @@
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
-
     </test>
-</tests>
\ No newline at end of file
+</tests>

From 07f9ac8a55aa439741034ab3d3f0842e53c7feab Mon Sep 17 00:00:00 2001
From: John S <john00ivy@gmail.com>
Date: Wed, 23 Jan 2019 17:30:56 -0600
Subject: [PATCH 801/932] MQE-1421: Updating EndToEnd Tests

- Replacing "feature" tag with "stories" to resolve "generate:tests" DEPRECATED messages.
---
 .../AdminFilteringCategoryProductsUsingScopeSelectorTest.xml | 2 +-
 .../StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml  | 4 ++--
 .../Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml  | 4 ++--
 .../Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml | 4 ++--
 .../Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml  | 5 +++--
 .../Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml | 5 +++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
index e0e214342ad72..5c434ecabf80d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminFilteringCategoryProductsUsingScopeSelectorTest">
         <annotations>
-            <features value="Catalog"/>
+            <stories value="Filtering Category Products"/>
             <title value="Filtering Category Products using scope selector"/>
             <description value="Filtering Category Products using scope selector"/>
             <severity value="MAJOR"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
index aa90b7c1b54db..fb80b4880a6f4 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontUpdateShoppingCartWhileUpdateMinicartTest.xml
@@ -7,10 +7,10 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StoreFrontUpdateShoppingCartWhileUpdateMinicartTest">
         <annotations>
-            <features value="Checkout"/>
+            <stories value="Shopping Cart"/>
             <title value="Check updating shopping cart while updating items from minicart"/>
             <description value="Check updating shopping cart while updating items from minicart"/>
             <severity value="AVERAGE"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
index 778c1637a802d..2d560ead50c48 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -7,10 +7,10 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontOnePageCheckoutDataWhenChangeQtyTest">
         <annotations>
-            <features value="Checkout"/>
+            <stories value="Checkout"/>
             <title value="One page Checkout Customer data when changing Product Qty"/>
             <description value="One page Checkout Customer data when changing Product Qty"/>
             <severity value="MAJOR"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
index 2c331fa05efd7..dd641fd370ba7 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -7,10 +7,10 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCheckValidatorConfigurableProductTest">
         <annotations>
-            <features value="ConfigurableProduct"/>
+            <stories value="Configurable Product"/>
             <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"/>
diff --git a/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
index 2e3467fe2c7c5..d2d8fcb4b60f7 100644
--- a/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
+++ b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
@@ -5,11 +5,12 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminRemoveProductWeeeAttributeOptionTest">
         <annotations>
-            <features value="Weee attribute options can be removed in product page"/>
+            <stories value="Weee attribute options can be removed in product page"/>
             <title value="Weee attribute options can be removed in product page"/>
             <description value="Weee attribute options can be removed in product page"/>
             <severity value="CRITICAL"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
index 800b0a060edac..f011a8bead4f2 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
@@ -6,10 +6,11 @@
   */
 -->
 
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+<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="Wishlist"/>
             <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"/>

From fac823863633eecdc591996728ae0e2cfad53a56 Mon Sep 17 00:00:00 2001
From: Rico Sonntag <mail@ricosonntag.de>
Date: Thu, 24 Jan 2019 08:04:49 +0100
Subject: [PATCH 802/932] Update popup_content.phtml

Avoid duplicate call to `getContainers`.
---
 .../adminhtml/templates/order/packaging/popup_content.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
index c32b63bddab56..db0739d127b2b 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
@@ -61,7 +61,7 @@
                                     <?php else: ?>
                                         class="admin__control-select"
                                     <?php endif; ?>>
-                                <?php foreach ($block->getContainers() as $key => $value): ?>
+                                <?php foreach ($containers as $key => $value): ?>
                                     <option value="<?= /* @escapeNotVerified */ $key ?>" >
                                         <?= /* @escapeNotVerified */ $value ?>
                                     </option>

From 059fc9c665c07178f2d681e22d5d8bed2fb400e8 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 24 Jan 2019 10:43:36 +0300
Subject: [PATCH 803/932] MAGETWO-91513: Password reset email cannot be sent if
 the customer does not have customer attribute set that is changed to required
 after original account creation

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

diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 6be41c278a17f..192b8081254f4 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -60,6 +60,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AccountManagement implements AccountManagementInterface
 {

From 5b481c1890382ac26d53edec28b4497642678290 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 24 Jan 2019 10:51:58 +0300
Subject: [PATCH 804/932] MAGETWO-60910: Session initialized during reindex
 from CLI and result fatal error

- Fix static test
---
 lib/internal/Magento/Framework/Session/SessionManager.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index 6000a16db7be7..c7d201676b228 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -12,6 +12,7 @@
 /**
  * Session Manager
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class SessionManager implements SessionManagerInterface
 {

From 93b8077bc4cf5646edc249744bbbdb7f4bbfe00d Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcommerce.com>
Date: Thu, 24 Jan 2019 13:40:47 +0530
Subject: [PATCH 805/932] issue fixed #20563 Go to shipping information, Update
 qty & Addresses and Enter a new address button Not aligned from left and
 right in 767px screen size

issue fixed #20563 Go to shipping information, Update qty & Addresses and Enter a new address button Not aligned from left and right in 767px screen size
---
 .../Magento_Multishipping/web/css/source/_module.less  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
index 7662c60734a1b..9761f36b96344 100644
--- a/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Multishipping/web/css/source/_module.less
@@ -374,7 +374,7 @@
                 text-align: right;
 
                 .action {
-                    margin-left: @indent__s;
+                    margin-left: 0;
 
                     &.back {
                         display: block;
@@ -496,4 +496,12 @@
             margin-left: @indent__xl;
         }
     }
+    
+    .multicheckout { 
+        .actions-toolbar {
+            > .primary {
+                margin-right: 0;
+            }
+        }
+    }
 }

From 251502920a1c611c19f5505901cda785ebd9a8dd Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 24 Jan 2019 11:14:52 +0300
Subject: [PATCH 806/932] MAGETWO-82221: [CE 2.1.0 rc3] - Cancel an order
 [configurable product]#5313

- Added automated test script.
---
 .../Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
index ab607d9ba55cd..b8dfec102fdf4 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
@@ -93,6 +93,6 @@
         <actionGroup ref="filterProductGridBySku2" stepKey="filterProductGridBySku">
             <argument name="sku" value="$$createConfigProduct.sku$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Quantity')}}" userInput="99.0000" stepKey="seeProductSkuInGrid"/>
+        <see selector="{{AdminProductGridSection.productGridCell('1', 'Quantity')}}" userInput="99" stepKey="seeProductSkuInGrid"/>
     </test>
 </tests>

From 6e3f2b539f8c70caa43cd6172ace677bf2f1eb4a Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 24 Jan 2019 12:55:31 +0300
Subject: [PATCH 807/932] MAGETWO-97434: MFTF test cases have parsing error

- Stabilize functional tests.
---
 .../Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
index 6ea5a2842470b..a1630128638d9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
@@ -131,10 +131,10 @@
 
         <!--Check all products and Cart Subtotal -->
         <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert" after="waitForDetailsOpen">
-            <argument name="subtotal" value="BundleProductsSummary.subtotal"/>
-            <argument name="shipping" value="BundleProductsSummary.shipping"/>
-            <argument name="shippingMethod" value="BundleProductsSummary.shippingMethod"/>
-            <argument name="total" value="BundleProductsSummary.total"/>
+            <argument name="subtotal" value="1,968.00"/>
+            <argument name="shipping" value="5.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="1,973.00"/>
         </actionGroup>
     </test>
 </tests>

From f0cb89697a58d13ff08af30e206d7f2ea9097568 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 24 Jan 2019 13:31:49 +0200
Subject: [PATCH 808/932] Fix static tests.

---
 .../Magento/blank/Magento_Catalog/web/css/source/_module.less   | 2 +-
 .../Magento/luma/Magento_Catalog/web/css/source/_module.less    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
index 33fafc2339916..c692b37f5d51b 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -489,7 +489,7 @@
         .product-items-names {
             .product-item {
                 margin-bottom: @indent__s;
-              display: flex;
+                display: flex;
             }
 
             .product-item-name {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index 3905f6d4fcb29..21cc850d42325 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -564,7 +564,7 @@
         .product-items-names {
             .product-item {
                 margin-bottom: @indent__s;
-              display: flex;
+                display: flex;
             }
 
             .product-item-name {

From fce9a9d5d8cd0db8a9aa8410ffdc607b75c59188 Mon Sep 17 00:00:00 2001
From: ajay-2jcommerce <ajay@2jcommerce.in>
Date: Thu, 24 Jan 2019 19:04:31 +0530
Subject: [PATCH 809/932] Time-fields-misaligned-in-iPad-landscape-view ::Time
 fields misaligned in iPad landscape view (1024 x 768)

---
 .../web/css/source/module/main/_collapsible-blocks.less         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index 6420738c6fb9b..b12b4a71d5ce6 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -322,7 +322,7 @@
             }
 
             .value {
-                padding-right: 4rem;
+                padding-right: 2rem;
             }
         }
 

From 149d9e12a12e8da0bc3066e6e97e72f66adf497c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Thu, 24 Jan 2019 13:13:38 +0200
Subject: [PATCH 810/932] magento/magento2#14849: Nullable status code fix.

---
 app/code/Magento/Sales/Model/Order/Config.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index 70cf8c181cf95..1b31caa573f99 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -109,7 +109,7 @@ protected function _getState($state)
      * @param   string $state
      * @return  string|null
      */
-    public function getStateDefaultStatus($state)
+    public function getStateDefaultStatus($state): ?string
     {
         $status = false;
         $stateNode = $this->_getState($state);
@@ -123,11 +123,11 @@ public function getStateDefaultStatus($state)
     /**
      * Get status label for a specified area
      *
-     * @param string $code
+     * @param string|null $code
      * @param string $area
-     * @return string
+     * @return string|null
      */
-    private function getStatusLabelForArea(string $code, string $area): string
+    private function getStatusLabelForArea(?string $code, string $area): ?string
     {
         $code = $this->maskStatusForArea($area, $code);
         $status = $this->orderStatusFactory->create()->load($code);
@@ -142,8 +142,8 @@ private function getStatusLabelForArea(string $code, string $area): string
     /**
      * Retrieve status label for detected area
      *
-     * @param string $code
-     * @return string
+     * @param string|null $code
+     * @return string|null
      * @throws LocalizedException
      */
     public function getStatusLabel($code)
@@ -155,10 +155,10 @@ public function getStatusLabel($code)
     /**
      * Retrieve status label for area
      *
-     * @param string $code
-     * @return string
+     * @param string|null $code
+     * @return string|null
      */
-    public function getStatusFrontendLabel(string $code): string
+    public function getStatusFrontendLabel(?string $code): ?string
     {
         return $this->getStatusLabelForArea($code, \Magento\Framework\App\Area::AREA_FRONTEND);
     }

From 0def01b420b3e7cb20ae36ddb09751ca83248777 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravi.chandra@krishtechnolabs.com>
Date: Thu, 24 Jan 2019 19:14:52 +0530
Subject: [PATCH 811/932] correct spelling

---
 .../Magento/Catalog/Api/Data/ProductRender/ImageInterface.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
index 4cdb2631edea5..9c137cb2e882c 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
@@ -111,7 +111,7 @@ public function setLabel($label);
     /**
      * Retrieve resize width
      *
-     * This width is image dimension, which represents the width, that can be used for perfomance improvements
+     * This width is image dimension, which represents the width, that can be used for performance improvements
      *
      * @return float
      * @since 101.1.0

From 5b535365aa101a689ff96c722f76ec3137d5ad2d Mon Sep 17 00:00:00 2001
From: Patrick McLain <pat@pmclain.com>
Date: Thu, 24 Jan 2019 08:59:13 -0500
Subject: [PATCH 812/932] Fix value passed to DisableIntrospection

The constructor value passed to `GraphQL\Validator\Rules\DisableIntrospection`
must be `int 0` to enable intropection.
---
 .../Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
index 5a35200c03a6f..ba6439fc9b652 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
@@ -61,7 +61,7 @@ public function __construct(
     public function execute(): void
     {
         DocumentValidator::addRule(new QueryComplexity($this->queryComplexity));
-        DocumentValidator::addRule(new DisableIntrospection($this->introspectionConfig->isIntrospectionDisabled()));
+        DocumentValidator::addRule(new DisableIntrospection((int) $this->introspectionConfig->isIntrospectionDisabled()));
         DocumentValidator::addRule(new QueryDepth($this->queryDepth));
     }
 }

From 62bfb5c928d92432b28a6b0aa0758243ddcb8be5 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Thu, 24 Jan 2019 16:14:28 +0200
Subject: [PATCH 813/932] Fix static tests.

---
 .../Magento/blank/Magento_Catalog/web/css/source/_module.less   | 2 +-
 .../Magento/luma/Magento_Catalog/web/css/source/_module.less    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
index c692b37f5d51b..d3b314836ae8e 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -488,8 +488,8 @@
 
         .product-items-names {
             .product-item {
-                margin-bottom: @indent__s;
                 display: flex;
+                margin-bottom: @indent__s;
             }
 
             .product-item-name {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
index 21cc850d42325..a3067f5d36fc3 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -563,8 +563,8 @@
 
         .product-items-names {
             .product-item {
-                margin-bottom: @indent__s;
                 display: flex;
+                margin-bottom: @indent__s;
             }
 
             .product-item-name {

From bcfaf87dda95ec266257e7f890d0c8c5516f56e5 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Thu, 24 Jan 2019 09:06:30 -0600
Subject: [PATCH 814/932] Revert "[EngCom] Public Pull Requests - GraphQL"

---
 .../Products/DataProvider/CategoryTree.php    | 12 +---
 .../ExtractDataFromCategoryTree.php           | 69 ++-----------------
 .../Model/Resolver/UpdateCustomerAddress.php  |  4 --
 app/code/Magento/GraphQl/etc/schema.graphqls  |  1 +
 .../Magento/StoreGraphQl/etc/schema.graphqls  |  4 +-
 .../Magento/GraphQl/Catalog/CategoryTest.php  | 50 ++------------
 .../Customer/UpdateCustomerAddressTest.php    | 13 ++--
 .../Magento/Catalog/_files/categories.php     |  2 +-
 8 files changed, 23 insertions(+), 132 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index 35ed52ff0501d..f2634574a2d15 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -101,21 +101,11 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterato
 
         $collection->addFieldToFilter('level', ['gt' => $level]);
         $collection->addFieldToFilter('level', ['lteq' => $level + $depth - self::DEPTH_OFFSET]);
-        $collection->addIsActiveFilter();
         $collection->setOrder('level');
-        $collection->setOrder(
-            'position',
-            $collection::SORT_ORDER_DESC
-        );
         $collection->getSelect()->orWhere(
-            $collection->getSelect()
-                ->getConnection()
-                ->quoteIdentifier(
-                    'e.' . $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField()
-                ) . ' = ?',
+            $this->metadata->getMetadata(CategoryInterface::class)->getIdentifierField() . ' = ?',
             $rootCategoryId
         );
-
         return $collection->getIterator();
     }
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
index 351754cda9f29..ac8d5709c85b3 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ExtractDataFromCategoryTree.php
@@ -20,16 +20,6 @@ class ExtractDataFromCategoryTree
      */
     private $categoryHydrator;
 
-    /**
-     * @var CategoryInterface;
-     */
-    private $iteratingCategory;
-
-    /**
-     * @var int
-     */
-    private $startCategoryFetchLevel = 1;
-
     /**
      * @param Hydrator $categoryHydrator
      */
@@ -52,63 +42,14 @@ public function execute(\Iterator $iterator): array
             /** @var CategoryInterface $category */
             $category = $iterator->current();
             $iterator->next();
-
-            $pathElements = explode("/", $category->getPath());
-            if (empty($tree)) {
-                $this->startCategoryFetchLevel = count($pathElements) - 1;
+            $nextCategory = $iterator->current();
+            $tree[$category->getId()] = $this->categoryHydrator->hydrateCategory($category);
+            $tree[$category->getId()]['model'] = $category;
+            if ($nextCategory && (int) $nextCategory->getLevel() !== (int) $category->getLevel()) {
+                $tree[$category->getId()]['children'] = $this->execute($iterator);
             }
-
-            $this->iteratingCategory = $category;
-            $currentLevelTree = $this->explodePathToArray($pathElements, $this->startCategoryFetchLevel);
-            if (empty($tree)) {
-                $tree = $currentLevelTree;
-            }
-            $tree = $this->mergeCategoriesTrees($currentLevelTree, $tree);
         }
 
         return $tree;
     }
-
-    /**
-     * Merge together complex categories trees
-     *
-     * @param array $tree1
-     * @param array $tree2
-     * @return array
-     */
-    private function mergeCategoriesTrees(array &$tree1, array &$tree2): array
-    {
-        $mergedTree = $tree1;
-        foreach ($tree2 as $currentKey => &$value) {
-            if (is_array($value) && isset($mergedTree[$currentKey]) && is_array($mergedTree[$currentKey])) {
-                $mergedTree[$currentKey] = $this->mergeCategoriesTrees($mergedTree[$currentKey], $value);
-            } else {
-                $mergedTree[$currentKey] = $value;
-            }
-        }
-        return $mergedTree;
-    }
-
-    /**
-     * Recursive method to generate tree for one category path
-     *
-     * @param array $pathElements
-     * @param int $index
-     * @return array
-     */
-    private function explodePathToArray(array $pathElements, int $index): array
-    {
-        $tree = [];
-        $tree[$pathElements[$index]]['id'] = $pathElements[$index];
-        if ($index === count($pathElements) - 1) {
-            $tree[$pathElements[$index]] = $this->categoryHydrator->hydrateCategory($this->iteratingCategory);
-            $tree[$pathElements[$index]]['model'] = $this->iteratingCategory;
-        }
-        $currentIndex = $index;
-        $index++;
-        if (isset($pathElements[$index])) {
-            $tree[$pathElements[$currentIndex]]['children'] = $this->explodePathToArray($pathElements, $index);
-        }
-        return $tree;
-    }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
index 833ab2e450280..7bae40e4cc5de 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -109,10 +109,6 @@ private function updateCustomerAddress(int $customerId, int $addressId, array $a
     {
         $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
         $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
-        if (isset($addressData['region']['region_id'])) {
-            $address->setRegionId($address->getRegion()->getRegionId());
-        }
-
         return $this->addressRepository->save($address);
     }
 }
diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
index 7ea715097cdf3..2281495d059e1 100644
--- a/app/code/Magento/GraphQl/etc/schema.graphqls
+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -5,6 +5,7 @@ type Query {
 }
 
 type Mutation {
+    placeholderMutation: String @doc(description: "Mutation type cannot be declared without fields. The placeholder will be removed when at least one mutation field is declared.")
 }
 
 input FilterTypeInput @doc(description: "FilterTypeInput specifies which action will be performed in a query ") {
diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
index d9f7eaaaa294c..af79d0e3e28b7 100644
--- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -6,10 +6,10 @@ type Query {
 
 type Website @doc(description: "The type contains information about a website") {
     id : Int @doc(description: "The ID number assigned to the website")
-    name : String @doc(description: "The website name. Websites use this name to identify it easier.")
+    name : String @doc(description: "The website name. Websites use this name to identify it easyer.")
     code : String @doc(description: "A code assigned to the website to identify it")
     sort_order : Int @doc(description: "The attribute to use for sorting websites")
-    default_group_id : String @doc(description: "The default group ID that the website has")
+    default_group_id : String @doc(description: "The default group id that the website has")
     is_default : Boolean @doc(description: "Specifies if this is the default website")
 }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
index 3f149cfcb26bf..54e98367ab8ca 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -83,8 +83,8 @@ public function testCategoriesTree()
         $responseDataObject = new DataObject($response);
         //Some sort of smoke testing
         self::assertEquals(
-            'Its a description of Test Category 1.2',
-            $responseDataObject->getData('category/children/0/children/1/description')
+            'Ololo',
+            $responseDataObject->getData('category/children/7/children/1/description')
         );
         self::assertEquals(
             'default-category',
@@ -99,54 +99,16 @@ public function testCategoriesTree()
             $responseDataObject->getData('category/children/0/default_sort_by')
         );
         self::assertCount(
-            7,
+            8,
             $responseDataObject->getData('category/children')
         );
         self::assertCount(
             2,
-            $responseDataObject->getData('category/children/0/children')
+            $responseDataObject->getData('category/children/7/children')
         );
         self::assertEquals(
-            13,
-            $responseDataObject->getData('category/children/0/children/1/id')
-        );
-    }
-
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testGetCategoryById()
-    {
-        $rootCategoryId = 13;
-        $query = <<<QUERY
-{
-  category(id: {$rootCategoryId}) {
-      id
-      name
-  }
-}
-QUERY;
-
-        // get customer ID token
-        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = $this->objectManager->create(
-            \Magento\Integration\Api\CustomerTokenServiceInterface::class
-        );
-        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
-        $responseDataObject = new DataObject($response);
-        //Some sort of smoke testing
-        self::assertEquals(
-            'Category 1.2',
-            $responseDataObject->getData('category/name')
-        );
-        self::assertEquals(
-            13,
-            $responseDataObject->getData('category/id')
+            5,
+            $responseDataObject->getData('category/children/7/children/1/children/0/id')
         );
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
index 6a9708b4f86a2..519fe2b1405a0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -218,12 +218,13 @@ private function assertCustomerAddressesFields(AddressInterface $address, $actua
         ];
         $this->assertResponseFields($actualResponse, $assertionMap);
         $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
-        $assertionRegionMap = [
-            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
-            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
-            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
-        ];
-        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
+        // https://github.com/magento/graphql-ce/issues/270
+//        $assertionRegionMap = [
+//            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
+//            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
+//            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
+//        ];
+//        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
index a5ab961932461..a903274793c34 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
@@ -178,7 +178,7 @@
     ->setParentId(3)
     ->setPath('1/2/3/13')
     ->setLevel(3)
-    ->setDescription('Its a description of Test Category 1.2')
+    ->setDescription('Ololo')
     ->setAvailableSortBy('name')
     ->setDefaultSortBy('name')
     ->setIsActive(true)

From 7877bcd3dd694958570b9d6f755f622a0b7c6633 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Thu, 24 Jan 2019 09:30:15 -0600
Subject: [PATCH 815/932] MC-13630: Integrate smart button functionality on
 product detail page

---
 .../Block/Express/InContext/SmartButton.php   | 145 ++++++++++++++++++
 .../Magento/Paypal/Block/Express/Shortcut.php |   4 +-
 .../Observer/AddPaypalShortcutsObserver.php   |   1 +
 app/code/Magento/Paypal/etc/frontend/di.xml   |   8 +
 .../templates/express/shortcut_button.phtml   |  13 ++
 .../view/frontend/web/js/in-context/button.js |  19 ++-
 .../express-checkout-smart-buttons.js         |  27 +---
 .../js/in-context/product-express-checkout.js |  78 ++++++++++
 8 files changed, 267 insertions(+), 28 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
 create mode 100644 app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml
 create mode 100644 app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js

diff --git a/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
new file mode 100644
index 0000000000000..c4407dfc10553
--- /dev/null
+++ b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Block\Express\InContext;
+
+use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\ConfigFactory;
+use Magento\Framework\View\Element\Template;
+use Magento\Catalog\Block\ShortcutInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Paypal\Model\SmartButtonConfig;
+use Magento\Framework\UrlInterface;
+
+/**
+ * Class Button
+ */
+class SmartButton extends Template implements ShortcutInterface
+{
+    const ALIAS_ELEMENT_INDEX = 'alias';
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var SmartButtonConfig
+     */
+    private $smartButtonConfig;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param Context $context
+     * @param ConfigFactory $configFactory
+     * @param SerializerInterface $serializer
+     * @param SmartButtonConfig $smartButtonConfig
+     * @param UrlInterface $urlBuilder
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        ConfigFactory $configFactory,
+        SerializerInterface $serializer,
+        SmartButtonConfig $smartButtonConfig,
+        UrlInterface $urlBuilder,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+
+        $this->config = $configFactory->create();
+        $this->config->setMethod(Config::METHOD_EXPRESS);
+        $this->serializer = $serializer;
+        $this->smartButtonConfig = $smartButtonConfig;
+        $this->urlBuilder = $urlBuilder;
+    }
+
+    /**
+     * Check `in_context` config value
+     *
+     * @return bool
+     */
+    private function isInContext() : bool
+    {
+        return (bool)(int) $this->config->getValue('in_context');
+    }
+
+    /**
+     * Check is Paypal In-Context Express Checkout button
+     * should render in cart/mini-cart
+     *
+     * @return bool
+     */
+    protected function shouldRender() : bool
+    {
+        return true;
+        //TODO: add config check
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _toHtml()
+    {
+        if (!$this->shouldRender()) {
+            return '';
+        }
+
+        return parent::_toHtml();
+    }
+
+    /**
+     * Get shortcut alias
+     *
+     * @return string
+     */
+    public function getAlias()
+    {
+        return $this->getData(self::ALIAS_ELEMENT_INDEX);
+    }
+
+    /**
+     * @return string
+     */
+    public function getJsInitParams(): string
+    {
+        $clientConfig = [
+            'button' => 1,
+            'getTokenUrl' => $this->urlBuilder->getUrl(
+                'paypal/express/getTokenData',
+                ['_secure' => $this->getRequest()->isSecure()]
+            ),
+            'onAuthorizeUrl' => $this->urlBuilder->getUrl(
+                'paypal/express/onAuthorization',
+                ['_secure' => $this->getRequest()->isSecure()]
+            ),
+            'onCancelUrl' => $this->urlBuilder->getUrl(
+                'paypal/express/cancel',
+                ['_secure' => $this->getRequest()->isSecure()]
+            )
+        ];
+        $smartButtonsConfig = $this->smartButtonConfig->getConfig('product');
+        $clientConfig = array_replace_recursive($clientConfig, $smartButtonsConfig);
+        $config = [
+            'Magento_Paypal/js/in-context/product-express-checkout' => [
+                'clientConfig' => $clientConfig
+            ]
+        ];
+
+        return $this->serializer->serialize($config);
+    }
+}
diff --git a/app/code/Magento/Paypal/Block/Express/Shortcut.php b/app/code/Magento/Paypal/Block/Express/Shortcut.php
index bdb9279356d83..20fd4316f3555 100644
--- a/app/code/Magento/Paypal/Block/Express/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Express/Shortcut.php
@@ -145,7 +145,9 @@ protected function _beforeToHtml()
 
         $isInCatalog = $this->getIsInCatalogProduct();
 
-        if (!$this->_shortcutValidator->validate($this->_paymentMethodCode, $isInCatalog)) {
+        if (!$this->_shortcutValidator->validate($this->_paymentMethodCode, $isInCatalog)
+            || (bool)(int)$this->config->getValue('in_context')
+        ) {
             $this->_shouldRender = false;
             return $result;
         }
diff --git a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
index 74f554020a6b9..97ddc38fce00d 100644
--- a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
+++ b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
@@ -52,6 +52,7 @@ public function execute(EventObserver $observer)
         $blocks = [
             \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton::class =>
                 PaypalConfig::METHOD_WPS_EXPRESS,
+            \Magento\Paypal\Block\Express\InContext\SmartButton::class => PaypalConfig::METHOD_WPS_EXPRESS,
             \Magento\Paypal\Block\Express\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
             \Magento\Paypal\Block\Bml\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
             \Magento\Paypal\Block\WpsExpress\Shortcut::class => PaypalConfig::METHOD_WPS_EXPRESS,
diff --git a/app/code/Magento/Paypal/etc/frontend/di.xml b/app/code/Magento/Paypal/etc/frontend/di.xml
index b75d6f5682be7..8c76acdb9d24f 100644
--- a/app/code/Magento/Paypal/etc/frontend/di.xml
+++ b/app/code/Magento/Paypal/etc/frontend/di.xml
@@ -97,6 +97,14 @@
             <argument name="payment" xsi:type="object">Magento\Paypal\Model\Express</argument>
         </arguments>
     </type>
+    <type name="Magento\Paypal\Block\Express\InContext\SmartButton">
+        <arguments>
+            <argument name="data" xsi:type="array">
+                <item name="alias" xsi:type="string">product.info.addtocart.paypalexpress</item>
+                <item name="template" xsi:type="string">express/shortcut_button.phtml</item>
+            </argument>
+        </arguments>
+    </type>
 
 
     <type name="Magento\Vault\Model\Ui\TokensConfigProvider">
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml
new file mode 100644
index 0000000000000..ac0eda99ee939
--- /dev/null
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut_button.phtml
@@ -0,0 +1,13 @@
+
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+/**
+ * @var \Magento\Paypal\Block\Express\Shortcut $block
+ */
+?>
+<div data-mage-init='<?= /* @noEscape */ $block->getJsInitParams() ?>'></div>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
index d6315e7a7dcb5..67c903a780f28 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
@@ -12,14 +12,14 @@ define([
 
     return Component.extend({
         /**
-         * @returns {Object}
+         * @return {Object}
          */
         initialize: function (config, element) {
             this._super();
-
             this.prepareClientConfig();
-
             checkoutSmartButtons(this.prepareClientConfig(), element);
+
+            return this;
         },
 
         /**
@@ -41,25 +41,28 @@ define([
             this.clientConfig.rendererComponent = this;
             this.clientConfig.formKey = $.mage.cookies.get('form_key');
             this.clientConfig.commit = false;
+
             return this.clientConfig;
         },
 
         /**
          * Adding logic to be triggered onClick action for smart buttons component
          */
-        onClick: function() {},
+        onClick: function () {},
 
         /**
          * Adds error message
          *
-         * @param {string} message
+         * @param {String} message
          */
-        addError: function(message) {
-            customerData.set('messages', {messages: [{
+        addError: function (message) {
+            customerData.set('messages', {
+                messages: [{
                     type: 'error',
                     text: message
                 }],
-                data_id: Math.floor(Date.now() / 1000)});
+                'data_id': Math.floor(Date.now() / 1000)
+            });
         }
     });
 });
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index 0c23a23497d0a..a3fd17d66cd14 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -3,9 +3,9 @@
  * See COPYING.txt for license details.
  */
 define([
-    'paypalInContextExpressCheckout',
-    'mage/translate'
-], function (paypal, $t) {
+    'underscore',
+    'paypalInContextExpressCheckout'
+], function (_, paypal) {
     'use strict';
 
     /**
@@ -15,7 +15,7 @@ define([
      * @return {Array}
      */
     function getFunding(config) {
-        return config.map(function (name) {
+        return _.map(config, function (name) {
             return paypal.FUNDING[name];
         });
     }
@@ -40,14 +40,14 @@ define([
              * @param {Object} actions
              */
             validate: function (actions) {
-                clientConfig.rendererComponent.validate(actions);
+                clientConfig.rendererComponent.validate && clientConfig.rendererComponent.validate(actions);
             },
 
             /**
              * Execute logic on Paypal button click
              */
             onClick: function () {
-                clientConfig.rendererComponent.onClick();
+                clientConfig.rendererComponent.onClick && clientConfig.rendererComponent.onClick();
             },
 
             /**
@@ -65,27 +65,16 @@ define([
 
                 if (!clientConfig.button) {
                     return new paypal.Promise(function (resolve, reject) {
-                        clientConfig.additionalAction(clientConfig.messageContainer).done(function () {
+                        clientConfig.rendererComponent.beforePayment(resolve, reject).then(function () {
                             paypal.request.post(clientConfig.getTokenUrl, params).then(function (res) {
                                 if (res.success) {
-
                                     return resolve(res.token);
                                 }
 
                                 clientConfig.rendererComponent.addError(res['error_message']);
+
                                 return reject(new Error(res['error_message']));
                             });
-                        }).fail(function (response) {
-                            var error;
-
-                            try {
-                                error = JSON.parse(response.responseText);
-                            } catch (exception) {
-                                error = $t('Something went wrong with your request. Please try again later.');
-                            }
-
-                            clientConfig.rendererComponent.addError(error);
-                            return reject(new Error(error));
                         });
                     });
                 }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
new file mode 100644
index 0000000000000..a28257cebd2fa
--- /dev/null
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
@@ -0,0 +1,78 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'underscore',
+    'jquery',
+    'uiComponent',
+    'Magento_Paypal/js/in-context/express-checkout-smart-buttons'
+], function (_, $, Component, checkoutSmartButtons) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            productFormSelector: '#product_addtocart_form',
+            validationElements: 'input',
+            getQuoteUrl: '',
+            formInvalid: false
+        },
+
+        initialize: function (config, element) {
+            this._super();
+            checkoutSmartButtons(this.prepareClientConfig(), element);
+        },
+
+        validate: function (actions) {
+            this.actions = actions;
+        },
+
+        onClick: function () {
+            var $form = $(this.productFormSelector);
+
+            $form.submit();
+            this.formInvalid = !$form.validation('isValid') ? true : false;
+        },
+
+        beforePayment: function (resolve, reject) {
+            var promise = $.Deferred();
+
+            if (this.formInvalid) {
+                reject();
+            } else {
+                promise.resolve();
+            }
+
+            return promise;
+        },
+
+        /**
+         * @returns {String}
+         */
+        getButtonId: function () {
+            return this.inContextId;
+        },
+
+        /**
+         * @returns {String}
+         */
+        getAgreementId: function () {
+            return this.inContextId + '-agreement';
+        },
+
+        /**
+         * Populate client config with all required data
+         *
+         * @return {Object}
+         */
+        prepareClientConfig: function () {
+            this.clientConfig.client = {};
+            this.clientConfig.client[this.clientConfig.environment] = this.clientConfig.merchantId;
+            this.clientConfig.rendererComponent = this;
+            this.clientConfig.formKey = $.mage.cookies.get('form_key');
+            this.clientConfig.commit = false;
+
+            return this.clientConfig;
+        }
+    });
+});

From 1cfa5acddddfdd3c7510bad9bee0b37638952917 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 24 Jan 2019 11:37:29 -0600
Subject: [PATCH 816/932] MC-6286  Cart Minicart Flow

---
 .../Magento/Paypal/Block/Bml/Shortcut.php     |   2 +-
 .../Test/Unit/Block/Bml/ShortcutTest.php      |  14 ++
 .../Reader/_files/expected/config.xml         | 200 ++++++++++++++++--
 3 files changed, 195 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/Bml/Shortcut.php b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
index eb37f755ecd4f..c46087f076d90 100644
--- a/app/code/Magento/Paypal/Block/Bml/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
@@ -111,7 +111,7 @@ public function __construct(
         $this->setTemplate($shortcutTemplate);
         $this->_bmlMethodCode = $bmlMethodCode;
         $this->config = $config
-            ? $config
+            ? $config->create()
             : \Magento\Framework\App\ObjectManager::getInstance()->get(ConfigFactory::class)->create();
         $this->config->setMethod($this->_paymentMethodCode);
         parent::__construct($context, $data);
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
index b8558cdc08491..f8d72f8552372 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
@@ -33,12 +33,26 @@ protected function setUp()
         $this->paypalShortcutHelperMock = $this->createMock(\Magento\Paypal\Helper\Shortcut\ValidatorInterface::class);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $configFactoryMock =
+            $this->getMockBuilder(\Magento\Paypal\Model\ConfigFactory::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['create'])
+                ->getMock();
+
+        $configMock =
+            $this->getMockBuilder(\Magento\Paypal\Model\Config::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['setMethod'])
+                ->getMock();
+        $configFactoryMock->expects($this->any())->method('create')->willReturn($configMock);
+
         $this->shortcut = $this->objectManagerHelper->getObject(
             \Magento\Paypal\Block\Bml\Shortcut::class,
             [
                 'paymentData' => $this->paymentHelperMock,
                 'mathRandom' => $this->randomMock,
                 'shortcutValidator' => $this->paypalShortcutHelperMock,
+                'config' => $configFactoryMock
             ]
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index 778929f06c816..5fadc185547f8 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -1225,14 +1225,15 @@
                                 <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                                     <label>Customize Button</label>
                                     <comment><![CDATA[Customize the display of the PayPal button in the Checkout.]]></comment>
-                                    <config_path>payment/paypal_express/checkout_page_button_customize</config_path>
+                                    <config_path>paypal/style/checkout_page_button_customize</config_path>
                                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                                     <attribute type="shared">1</attribute>
                                 </field>
-                                <field id="checkout_page_button_label" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+                                <field id="checkout_page_button_label" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                                     <label>Label</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_label</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Label::getCheckoutLabel</source_model>
+                                    <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
+                                    <config_path>paypal/style/checkout_page_button_label</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                     </depends>
@@ -1240,8 +1241,8 @@
                                 </field>
                                 <field id="checkout_page_button_mx_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                                     <label>Mexico Installment Period</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_mx_installment_period</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutMxInstallmentPeriod</source_model>
+                                    <config_path>paypal/style/checkout_page_button_mx_installment_period</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getMxInstallmentPeriod</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                         <field id="checkout_page_button_label">installment</field>
@@ -1250,8 +1251,8 @@
                                 </field>
                                 <field id="checkout_page_button_br_installment_period" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
                                     <label>Brazil Installment Period</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_br_installment_period</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\InstallmentPeriod::getCheckoutBrInstallmentPeriod</source_model>
+                                    <config_path>paypal/style/checkout_page_button_br_installment_period</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getBrInstallmentPeriod</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                         <field id="checkout_page_button_label">installment</field>
@@ -1260,8 +1261,8 @@
                                 </field>
                                 <field id="checkout_page_button_layout" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
                                     <label>Layout</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_layout</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Layout::getCheckoutLayout</source_model>
+                                    <config_path>paypal/style/checkout_page_button_layout</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLayout</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                         <field id="checkout_page_button_label" negative="1">credit</field>
@@ -1270,8 +1271,8 @@
                                 </field>
                                 <field id="checkout_page_button_size" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
                                     <label>Size</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_size</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Size::getCheckoutSize</source_model>
+                                    <config_path>paypal/style/checkout_page_button_size</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getSize</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                     </depends>
@@ -1279,8 +1280,8 @@
                                 </field>
                                 <field id="checkout_page_button_shape" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
                                     <label>Shape</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_shape</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Shape::getCheckoutShape</source_model>
+                                    <config_path>paypal/style/checkout_page_button_shape</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getShape</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                     </depends>
@@ -1288,8 +1289,8 @@
                                 </field>
                                 <field id="checkout_page_button_color" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
                                     <label>Color</label>
-                                    <config_path>payment/paypal_express/checkout_page_button_color</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\Color::getCheckoutColor</source_model>
+                                    <config_path>paypal/style/checkout_page_button_color</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getColor</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                         <field id="checkout_page_button_label" negative="1">credit</field>
@@ -1297,17 +1298,176 @@
                                     <attribute type="shared">1</attribute>
                                 </field>
                             </group>
-                            <group id="features" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                            <group id="product_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                                <label>PayPal Button - Product Page</label>
+                                <field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                                    <comment/>
+                                    <config_path>paypal/style/product_page_button_customize</config_path>
+                                </field>
+                                <field id="product_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                                    <config_path>paypal/style/product_page_button_label</config_path>
+                                    <depends>
+                                        <field id="product_page_button_customize">1</field>
+                                    </depends>
+                                </field>
+                                <field id="product_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                                    <config_path>paypal/style/product_page_button_mx_installment_period</config_path>
+                                    <depends>
+                                        <field id="product_page_button_customize">1</field>
+                                        <field id="product_page_button_label">installment</field>
+                                    </depends>
+                                </field>
+                                <field id="product_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                                    <config_path>paypal/style/product_page_button_br_installment_period</config_path>
+                                    <depends>
+                                        <field id="product_page_button_customize">1</field>
+                                        <field id="product_page_button_label">installment</field>
+                                    </depends>
+                                </field>
+                                <field id="product_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                                    <config_path>paypal/style/product_page_button_layout</config_path>
+                                    <depends>
+                                        <field id="product_page_button_customize">1</field>
+                                        <field id="product_page_button_label" negative="1">credit</field>
+                                    </depends>
+                                </field>
+                                <field id="product_page_button_size"  extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_size">
+                                    <config_path>paypal/style/product_page_button_size</config_path>
+                                    <depends>
+                                        <field id="product_page_button_customize">1</field>
+                                    </depends>
+                                </field>
+                                <field id="product_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                                    <config_path>paypal/style/product_page_button_shape</config_path>
+                                    <depends>
+                                        <field id="product_page_button_customize">1</field>
+                                    </depends>
+                                </field>
+                                <field id="product_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                                    <config_path>paypal/style/product_page_button_color</config_path>
+                                    <depends>
+                                        <field id="product_page_button_customize">1</field>
+                                        <field id="product_page_button_label" negative="1">credit</field>
+                                    </depends>
+                                </field>
+                            </group>
+                            <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
+                                <label>PayPal Button - Cart Page</label>
+                                <field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                                    <comment/>
+                                    <config_path>paypal/style/cart_page_button_customize</config_path>
+                                </field>
+                                <field id="cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                                    <config_path>paypal/style/cart_page_button_label</config_path>
+                                    <depends>
+                                        <field id="cart_page_button_customize">1</field>
+                                    </depends>
+                                </field>
+                                <field id="cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                                    <config_path>paypal/style/cart_page_button_mx_installment_period</config_path>
+                                    <depends>
+                                        <field id="cart_page_button_customize">1</field>
+                                        <field id="cart_page_button_label">installment</field>
+                                    </depends>
+                                </field>
+                                <field id="cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                                    <config_path>paypal/style/cart_page_button_br_installment_period</config_path>
+                                    <depends>
+                                        <field id="cart_page_button_customize">1</field>
+                                        <field id="cart_page_button_label">installment</field>
+                                    </depends>
+                                </field>
+                                <field id="cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                                    <config_path>paypal/style/cart_page_button_layout</config_path>
+                                    <depends>
+                                        <field id="cart_page_button_customize">1</field>
+                                        <field id="cart_page_button_label" negative="1">credit</field>
+                                    </depends>
+                                </field>
+                                <field id="cart_page_button_size"  extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_size">
+                                    <config_path>paypal/style/cart_page_button_size</config_path>
+                                    <depends>
+                                        <field id="cart_page_button_customize">1</field>
+                                    </depends>
+                                </field>
+                                <field id="cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                                    <config_path>paypal/style/cart_page_button_shape</config_path>
+                                    <depends>
+                                        <field id="cart_page_button_customize">1</field>
+                                    </depends>
+                                </field>
+                                <field id="cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                                    <config_path>paypal/style/cart_page_button_color</config_path>
+                                    <depends>
+                                        <field id="cart_page_button_customize">1</field>
+                                        <field id="cart_page_button_label" negative="1">credit</field>
+                                    </depends>
+                                </field>
+                            </group>
+                            <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
+                                <label>PayPal Button - Mini Cart</label>
+                                <field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
+                                    <comment/>
+                                    <config_path>paypal/style/mini_cart_page_button_customize</config_path>
+                                </field>
+                                <field id="mini_cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
+                                    <config_path>paypal/style/mini_cart_page_button_label</config_path>
+                                    <depends>
+                                        <field id="mini_cart_page_button_customize">1</field>
+                                    </depends>
+                                </field>
+                                <field id="mini_cart_page_button_mx_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_mx_installment_period">
+                                    <config_path>paypal/style/mini_cart_page_button_mx_installment_period</config_path>
+                                    <depends>
+                                        <field id="mini_cart_page_button_customize">1</field>
+                                        <field id="mini_cart_page_button_label">installment</field>
+                                    </depends>
+                                </field>
+                                <field id="mini_cart_page_button_br_installment_period" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_br_installment_period">
+                                    <config_path>paypal/style/mini_cart_page_button_br_installment_period</config_path>
+                                    <depends>
+                                        <field id="mini_cart_page_button_customize">1</field>
+                                        <field id="mini_cart_page_button_label">installment</field>
+                                    </depends>
+                                </field>
+                                <field id="mini_cart_page_button_layout" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_layout">
+                                    <config_path>paypal/style/mini_cart_page_button_layout</config_path>
+                                    <depends>
+                                        <field id="mini_cart_page_button_customize">1</field>
+                                        <field id="mini_cart_page_button_label" negative="1">credit</field>
+                                    </depends>
+                                </field>
+                                <field id="mini_cart_page_button_size"  extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_size">
+                                    <config_path>paypal/style/mini_cart_page_button_size</config_path>
+                                    <depends>
+                                        <field id="mini_cart_page_button_customize">1</field>
+                                    </depends>
+                                </field>
+                                <field id="mini_cart_page_button_shape" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_shape">
+                                    <config_path>paypal/style/mini_cart_page_button_shape</config_path>
+                                    <depends>
+                                        <field id="mini_cart_page_button_customize">1</field>
+                                    </depends>
+                                </field>
+                                <field id="mini_cart_page_button_color" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_color">
+                                    <config_path>paypal/style/mini_cart_page_button_color</config_path>
+                                    <depends>
+                                        <field id="mini_cart_page_button_customize">1</field>
+                                        <field id="mini_cart_page_button_label" negative="1">credit</field>
+                                    </depends>
+                                </field>
+                            </group>
+                            <group id="features" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="130">
                                 <label>Features</label>
                                 <field id="disable_funding_options" translate="label comment" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                                     <label>Disable Funding Options</label>
                                     <comment>
                                         <![CDATA[PayPal will automatically display each enabled funding option to eligible buyers.
-                                For example, PayPal Credit is only shown to buyers in countries where Paybal Credit is
+                                For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is
                                 offered and the currency offered by the merchant is USD.]]>
                                     </comment>
-                                    <config_path>payment/paypal_express/disable_funding_options</config_path>
-                                    <source_model>Magento\Paypal\Model\System\Config\Source\ExpressButtons\DisableFundingOptions</source_model>
+                                    <config_path>paypal/style/disable_funding_options</config_path>
+                                    <source_model>Magento\Paypal\Model\System\Config\Source\DisableFundingOptions</source_model>
                                     <attribute type="shared">1</attribute>
                                 </field>
                             </group>

From 67d7145a81b5192bec9e7024c11748e5e0d04ed0 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Thu, 24 Jan 2019 12:11:19 -0600
Subject: [PATCH 817/932] MQE-1424: Stabilize mtf-eol branch

- Add wait for AdminCreateVirtualProductWithoutManageStockTest
- Add some waits for AdminMoveCategoryFromParentAnchoredCategoryTest
---
 .../Test/Mftf/Section/AdminCategoryBasicFieldSection.xml        | 2 +-
 .../Catalog/Test/Mftf/Section/AdminProductFormSection.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
index 651ee54c08339..977e63b9ec927 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection.xml
@@ -22,7 +22,7 @@
         <element name="ContentTab" type="input" selector="input[name='name']"/>
         <element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>
         <element name="panelFieldControl" type="input" selector='//aside//div[@data-index="{{arg1}}"]/descendant::*[@name="{{arg2}}"]' parameterized="true"/>
-        <element name="productsInCategory" type="input" selector="div[data-index='assign_products']"/>
+        <element name="productsInCategory" type="input" selector="div[data-index='assign_products']" timeout="30"/>
     </section>
     <section name="CategoryContentSection">
         <element name="SelectFromGalleryBtn" type="button" selector="//label[text()='Select from Gallery']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 89f904c26e090..ad3e140c0818e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -28,7 +28,7 @@
         <element name="advancedPricingLink" type="button" selector="button[data-index='advanced_pricing_button']" timeout="30"/>
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
-        <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]"/>
+        <element name="advancedInventoryLink" type="button" selector="//button[contains(@data-index, 'advanced_inventory_button')]" timeout="30"/>
         <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']"/>
         <element name="stockStatus" type="select" selector="[data-index='product-details'] select[name='product[quantity_and_stock_status][is_in_stock]']"/>
         <element name="productWeight" type="input" selector=".admin__field[data-index=weight] input"/>

From a9e303fe45f07ca6c0fba9e336d86b46da119e85 Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Thu, 24 Jan 2019 12:36:04 -0600
Subject: [PATCH 818/932] MC-11034: Enable Paypal Credit option should be
 disabled/greyed out when a non-US merchant is chosen - Moved logic from
 source to frontend model. - Addressed review comments.

---
 .../MultiSelect/DisabledFundingOptions.php    | 76 +++++++++++++++++++
 .../Config/Source/DisableFundingOptions.php   | 67 ++--------------
 .../etc/adminhtml/system/express_checkout.xml |  1 +
 3 files changed, 83 insertions(+), 61 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
new file mode 100644
index 0000000000000..f7f0902bb2075
--- /dev/null
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: pganapat
+ * Date: 1/23/19
+ * Time: 3:21 PM
+ */
+
+namespace Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect;
+
+use Magento\Paypal\Model\Config\StructurePlugin;
+
+/**
+ * Class DisabledFundingOptions
+
+ * @package Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect
+ */
+class DisabledFundingOptions extends \Magento\Config\Block\System\Config\Form\Field
+{
+    const FIELD_CONFIG_PATH = 'general/country/default';
+    /**
+     * DisabledFundingOptions constructor.
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        $data = []
+    ) {
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Render country field considering request parameter
+     *
+     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        if (!$this->isSelectedMerchantCountry('US')) {
+            $fundingOptions = $element->getValues();
+            $element->setValues($this->filterValuesForPaypalCredit($fundingOptions));
+        }
+        return parent::render($element);
+    }
+
+    /**
+     * Filters array for PAYPAL_FUNDING_CREDIT
+     *
+     * @param array $options
+     * @return array
+     */
+    private function filterValuesForPaypalCredit($options)
+    {
+        return array_filter($options, function ($opt) {
+            return ($opt['value'] != 'CREDIT');
+        });
+    }
+
+    /**
+     * Checks for chosen Merchant country from the config/url
+     *
+     * @param string $country
+     * @return bool
+     */
+    private function isSelectedMerchantCountry($country): bool
+    {
+        $paypalCountry = $this->getRequest()->getParam(StructurePlugin::REQUEST_PARAM_COUNTRY);
+        $defaultCountry = $this->_scopeConfig->getValue(self::FIELD_CONFIG_PATH);
+        if ($paypalCountry) {
+            return $paypalCountry === $country;
+        }
+        return $defaultCountry === $country;
+    }
+}
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
index 11138e8cc724b..1a9cfe0998fb8 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/DisableFundingOptions.php
@@ -7,41 +7,21 @@
 
 namespace Magento\Paypal\Model\System\Config\Source;
 
-use Magento\Paypal\Model\Config\StructurePlugin;
-
 /**
  * Get disable funding options
  */
-class DisableFundingOptions implements \Magento\Framework\Data\OptionSourceInterface
+class DisableFundingOptions
 {
-    /**
-     * @var \Magento\Paypal\Model\ConfigFactory
-     */
-    protected $_configFactory;
-
-    protected $requestCountry;
-
-    protected $http;
-
-    /**
-     * DisableFundingOptions constructor.
-     * @param \Magento\Paypal\Model\ConfigFactory $configFactory
-     * @param \Magento\Framework\App\Request\Http $http
-     */
-    public function __construct(
-        \Magento\Paypal\Model\ConfigFactory $configFactory,
-        \Magento\Framework\App\Request\Http $http
-    ) {
-        $this->_configFactory = $configFactory;
-        $this->http = $http;
-    }
-
     /**
      * @inheritdoc
      */
     public function toOptionArray(): array
     {
-        $defaultFundingOptions = [
+        return [
+            [
+                'value' => 'CREDIT',
+                'label' => __('PayPal Credit')
+            ],
             [
                 'value' => 'CARD',
                 'label' => __('PayPal Guest Checkout Credit Card Icons')
@@ -51,40 +31,5 @@ public function toOptionArray(): array
                 'label' => __('Elektronisches Lastschriftverfahren - German ELV')
             ]
         ];
-        $fundingOptions = $this->addPaypalCreditForUS($defaultFundingOptions);
-        return $fundingOptions;
-    }
-
-    /**
-     * Adds Paypal Credit for US
-     *
-     * @param {array} $fundingOptions
-     * @return array
-     */
-    private function addPaypalCreditForUS($fundingOptions): array
-    {
-        $paypalCredit = [
-            'value' => 'CREDIT',
-            'label' => __('PayPal Credit')
-        ];
-        if ($this->checkMerchantCountry('US')) {
-            array_unshift($fundingOptions, $paypalCredit);
-        }
-        return $fundingOptions;
-    }
-
-    /**
-     * Checks for chosen Merchant country from the config/url
-     *
-     * @param {string} $country
-     * @return bool
-     */
-    private function checkMerchantCountry($country): bool
-    {
-        $paypalCountry = $this->http->get(StructurePlugin::REQUEST_PARAM_COUNTRY);
-        if ($paypalCountry) {
-            return $paypalCountry === $country;
-        }
-        return $this->_configFactory->create()->getMerchantCountry() === $country;
     }
 }
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 060f62b86b062..74ca2e07f2e03 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -738,6 +738,7 @@
                                 offered and the currency offered by the merchant is USD.]]>
                             </comment>
                             <config_path>paypal/style/disable_funding_options</config_path>
+                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions</frontend_model>
                             <source_model>Magento\Paypal\Model\System\Config\Source\DisableFundingOptions</source_model>
                             <attribute type="shared">1</attribute>
                         </field>

From ea65e8b24821a9185cdb8222f2ef73d95147be21 Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Thu, 24 Jan 2019 12:45:54 -0600
Subject: [PATCH 819/932] MC-11034: Enable Paypal Credit option should be
 disabled/greyed out when a non-US merchant is chosen - Updated Annotations

---
 .../System/Config/MultiSelect/DisabledFundingOptions.php    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
index f7f0902bb2075..ea07f3363d92d 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
@@ -1,9 +1,7 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: pganapat
- * Date: 1/23/19
- * Time: 3:21 PM
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect;

From 4469c7a3141561b37ae61d07da4ab9c4834c2be9 Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Thu, 24 Jan 2019 13:51:01 -0600
Subject: [PATCH 820/932] MC-13646: System error message display when guest
 place order without confirming Term & Conditions - Moved listener
 initialization to payment-method block

---
 .../web/template/payment/paypal-express-in-context.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index 4d62a6d7e0ff5..bdd21b919bc58 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="payment-method" css="_active: getCode() == isChecked()">
+<div class="payment-method" css="_active: getCode() == isChecked()" afterRender="initListeners">
     <div class="payment-method-title field choice">
         <input type="radio"
                name="payment[method]"
@@ -25,7 +25,7 @@
                translate="'What is PayPal?'"/>
         </label>
     </div>
-    <div class="payment-method-content" afterRender="initListeners">
+    <div class="payment-method-content">
         <each args="getRegion('messages')" render=""/>
         <div class="checkout-agreements-block" attr="id: getAgreementId()">
             <each args="$parent.getRegion('before-place-order')" render=""/>

From 8dc118a8ecb9db4c37b04b73325e5255d20985a4 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 24 Jan 2019 13:53:05 -0600
Subject: [PATCH 821/932] MC-6286: Cart/Minicart Flow

---
 .../Checkout/Block/QuoteShortcutButtons.php   |  2 ++
 .../Magento/Paypal/Block/Bml/Shortcut.php     | 19 ++++++++-------
 .../Express/InContext/Minicart/Button.php     | 15 +++++++++---
 .../InContext/Minicart/SmartButton.php        | 24 ++++---------------
 app/code/Magento/Paypal/Model/Config.php      |  4 ++--
 .../Paypal/Model/SmartButtonConfig.php        |  4 ++--
 .../AddPaypalShortcutsObserverTest.php        | 10 ++++++++
 7 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
index b7f6a163845e0..3b2f1604fae44 100644
--- a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
+++ b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
@@ -8,6 +8,8 @@
 use Magento\Framework\View\Element\Template;
 
 /**
+ * Displays buttons on shopping cart page
+ *
  * @api
  */
 class QuoteShortcutButtons extends \Magento\Catalog\Block\ShortcutButtons
diff --git a/app/code/Magento/Paypal/Block/Bml/Shortcut.php b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
index c46087f076d90..28f2326e799c3 100644
--- a/app/code/Magento/Paypal/Block/Bml/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
@@ -11,6 +11,9 @@
 use Magento\Paypal\Model\ConfigFactory;
 use Magento\Paypal\Model\Config;
 
+/**
+ * Class shortcut
+ */
 class Shortcut extends \Magento\Framework\View\Element\Template implements CatalogBlock\ShortcutInterface
 {
     /**
@@ -74,19 +77,19 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
     private $config;
 
     /**
-     * Shortcut constructor.
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param ValidatorInterface $shortcutValidator
-     * @param $paymentMethodCode
-     * @param $startAction
-     * @param $alias
-     * @param $bmlMethodCode
-     * @param $shortcutTemplate
+     * @param string $paymentMethodCode
+     * @param string $startAction
+     * @param string $alias
+     * @param string $bmlMethodCode
+     * @param string $shortcutTemplate
      * @param array $data
      * @param ConfigFactory|null $config
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @codingStandardsIgnoreStart
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -104,7 +107,6 @@ public function __construct(
         $this->_paymentData = $paymentData;
         $this->_mathRandom = $mathRandom;
         $this->_shortcutValidator = $shortcutValidator;
-
         $this->_paymentMethodCode = $paymentMethodCode;
         $this->_startAction = $startAction;
         $this->_alias = $alias;
@@ -116,9 +118,10 @@ public function __construct(
         $this->config->setMethod($this->_paymentMethodCode);
         parent::__construct($context, $data);
     }
+    //@codingStandardsIgnoreEnd
 
     /**
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     * @inheritdoc
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
index 6be1ea6b31b77..8d1e04c1397fc 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
@@ -59,8 +59,8 @@ class Button extends Template implements ShortcutInterface
      * @param Context $context
      * @param ResolverInterface $localeResolver
      * @param ConfigFactory $configFactory
-     * @param MethodInterface $payment
      * @param Session $session
+     * @param MethodInterface $payment
      * @param array $data
      */
     public function __construct(
@@ -101,8 +101,7 @@ private function isVisibleOnCart()
     }
 
     /**
-     * Check is Paypal In-Context Express Checkout button
-     * should render in cart/mini-cart
+     * Check is Paypal In-Context Express Checkout button should render in cart/mini-cart
      *
      * @return bool
      */
@@ -127,6 +126,8 @@ protected function _toHtml()
     }
 
     /**
+     * Returns container id
+     *
      * @return string
      */
     public function getContainerId()
@@ -135,6 +136,8 @@ public function getContainerId()
     }
 
     /**
+     * Returns link action
+     *
      * @return string
      */
     public function getLinkAction()
@@ -143,6 +146,8 @@ public function getLinkAction()
     }
 
     /**
+     * Returns add to cart selector
+     *
      * @return string
      */
     public function getAddToCartSelector()
@@ -151,6 +156,8 @@ public function getAddToCartSelector()
     }
 
     /**
+     * Returns image url
+     *
      * @return string
      */
     public function getImageUrl()
@@ -171,6 +178,8 @@ public function getAlias()
     }
 
     /**
+     * Set information if button renders in the mini cart
+     *
      * @param bool $isCatalog
      * @return $this
      */
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
index a9203369501a0..e9ae16971e4e6 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
@@ -27,11 +27,6 @@ class SmartButton extends Template implements ShortcutInterface
 {
     const ALIAS_ELEMENT_INDEX = 'alias';
 
-    /**
-     * @var bool
-     */
-    private $isMiniCart = false;
-
     /**
      * @var Config
      */
@@ -122,15 +117,13 @@ private function isVisibleOnCart() : bool
     }
 
     /**
-     * Check is Paypal In-Context Express Checkout button
-     * should render in cart/mini-cart
+     * Check is Paypal In-Context Express Checkout button should render in cart/mini-cart
      *
      * @return bool
      */
     protected function shouldRender() : bool
     {
         return $this->payment->isAvailable($this->session->getQuote())
-            && $this->isMiniCart
             && $this->isInContext()
             && $this->isVisibleOnCart();
     }
@@ -158,17 +151,8 @@ public function getAlias()
     }
 
     /**
-     * @param bool $isCatalog
-     * @return $this
-     */
-    public function setIsInCatalogProduct($isCatalog)
-    {
-        $this->isMiniCart = !$isCatalog;
-
-        return $this;
-    }
-
-    /**
+     * Returns string to initialize js component
+     *
      * @return string
      */
     public function getJsInitParams(): string
@@ -209,6 +193,8 @@ public function getJsInitParams(): string
     }
 
     /**
+     * Returns container id
+     *
      * @return string
      */
     public function getContainerId()
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 375e00e8e954c..baddbd24f5f84 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1702,11 +1702,11 @@ protected function _mapMethodFieldset($fieldName)
     /**
      * Map PayPal button style config fields
      *
-     * @param $fieldName
+     * @param string $fieldName
      * @return null|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function _mapButtonStyles($fieldName)
+    private function _mapButtonStyles(string $fieldName)
     {
         $page = substr($fieldName, 0, (int)strpos($fieldName, '_page_button_'));
 
diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 5909c14ad0ad4..ec91654545bde 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -45,7 +45,6 @@ public function __construct(
         $this->defaultStyles = $defaultStyles;
     }
 
-
     /**
      * Get smart button config
      *
@@ -62,8 +61,8 @@ public function getConfig(string $page): array
             'disallowedFunding' => $this->getDisallowedFunding(),
             'styles' => $this->getButtonStyles($page)
         ];
-
     }
+
     /**
      * Returns disallowed funding from configuration
      *
@@ -88,6 +87,7 @@ private function getAllowedFunding() : array
     /**
      * Returns button styles based on configuration
      *
+     * @param string $page
      * @return array
      */
     public function getButtonStyles(string $page) : array
diff --git a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
index 16e474178bb35..491484a6c3e8b 100644
--- a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
@@ -163,6 +163,11 @@ public function dataProviderShortcutsButtons()
                         self::PAYMENT_AVAILABLE => true,
                         self::PAYMENT_IS_BML => false,
                     ],
+                    \Magento\Paypal\Block\Express\InContext\SmartButton::class => [
+                        self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
+                        self::PAYMENT_AVAILABLE => true,
+                        self::PAYMENT_IS_BML => false,
+                    ],
                     \Magento\Paypal\Block\Express\Shortcut::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPP_EXPRESS,
                         self::PAYMENT_AVAILABLE => true,
@@ -202,6 +207,11 @@ public function dataProviderShortcutsButtons()
                         self::PAYMENT_AVAILABLE => false,
                         self::PAYMENT_IS_BML => false,
                     ],
+                    \Magento\Paypal\Block\Express\InContext\SmartButton::class => [
+                        self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
+                        self::PAYMENT_AVAILABLE => true,
+                        self::PAYMENT_IS_BML => false,
+                    ],
                     \Magento\Paypal\Block\Express\Shortcut::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPP_EXPRESS,
                         self::PAYMENT_AVAILABLE => false,

From 1e6da5e37a1848d048b6ac99a3ec9186ccb898ae Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Thu, 24 Jan 2019 14:03:28 -0600
Subject: [PATCH 822/932] MQE-1424: Stabilize mtf-eol branch

- Fix parameterized selector reference in AdminUpdateCategoryWithInactiveIncludeInMenuTest
---
 .../Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
index 67e5ffb84b650..2a03faec75ed6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
@@ -55,7 +55,7 @@
         <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SimpleRootSubCategory.urlKey}}" stepKey="fillUpdatedCategoryUrlKey"/>
         <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <see stepKey="seeCategoryUrlKey" selector="{{AdminUrlRewriteIndexSection.requestPathColumn(1)}}" userInput="{{SimpleRootSubCategory.urlKey}}.html" />
+        <see stepKey="seeCategoryUrlKey" selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{SimpleRootSubCategory.urlKey}}.html" />
 
         <!--Verify Updated Category UrlKey directs to category Store Front-->
         <amOnPage url="{{SimpleRootSubCategory.urlKey}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>

From 9eb48fd6147ab05b661d4f6dc562cfcb3d8826f4 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Thu, 24 Jan 2019 14:30:26 -0600
Subject: [PATCH 823/932] MQE-1424: Stabilize mtf-eol branch

- Make AdminCheckPaginationInStorefrontTest more robust
---
 .../AdminCheckPaginationInStorefrontTest.xml  | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
index c93fe1cfd20a1..f40a62c164ecc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
@@ -18,7 +18,6 @@
             <group value="Catalog"/>
         </annotations>
         <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1 "/>
             <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 1 "/>
             <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
@@ -42,31 +41,32 @@
             <createData entity="PaginationProduct" stepKey="simpleProduct18"/>
             <createData entity="PaginationProduct" stepKey="simpleProduct19"/>
             <createData entity="PaginationProduct" stepKey="simpleProduct20"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
         </before>
         <after>
-            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
-            <deleteData  createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-            <deleteData  createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
-            <deleteData  createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
-            <deleteData  createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
-            <deleteData  createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
-            <deleteData  createDataKey="simpleProduct6" stepKey="deleteSimpleProduct6"/>
-            <deleteData  createDataKey="simpleProduct7" stepKey="deleteSimpleProduct7"/>
-            <deleteData  createDataKey="simpleProduct8" stepKey="deleteSimpleProduct8"/>
-            <deleteData  createDataKey="simpleProduct9" stepKey="deleteSimpleProduct9"/>
-            <deleteData  createDataKey="simpleProduct10" stepKey="deleteSimpleProduct10"/>
-            <deleteData  createDataKey="simpleProduct11" stepKey="deleteSimpleProduct11"/>
-            <deleteData  createDataKey="simpleProduct12" stepKey="deleteSimpleProduct12"/>
-            <deleteData  createDataKey="simpleProduct13" stepKey="deleteSimpleProduct13"/>
-            <deleteData  createDataKey="simpleProduct14" stepKey="deleteSimpleProduct14"/>
-            <deleteData  createDataKey="simpleProduct15" stepKey="deleteSimpleProduct15"/>
-            <deleteData  createDataKey="simpleProduct16" stepKey="deleteSimpleProduct16"/>
-            <deleteData  createDataKey="simpleProduct17" stepKey="deleteSimpleProduct17"/>
-            <deleteData  createDataKey="simpleProduct18" stepKey="deleteSimpleProduct18"/>
-            <deleteData  createDataKey="simpleProduct19" stepKey="deleteSimpleProduct19"/>
-            <deleteData  createDataKey="simpleProduct20" stepKey="deleteSimpleProduct20"/>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0" />
             <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 0" />
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
+            <deleteData createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
+            <deleteData createDataKey="simpleProduct6" stepKey="deleteSimpleProduct6"/>
+            <deleteData createDataKey="simpleProduct7" stepKey="deleteSimpleProduct7"/>
+            <deleteData createDataKey="simpleProduct8" stepKey="deleteSimpleProduct8"/>
+            <deleteData createDataKey="simpleProduct9" stepKey="deleteSimpleProduct9"/>
+            <deleteData createDataKey="simpleProduct10" stepKey="deleteSimpleProduct10"/>
+            <deleteData createDataKey="simpleProduct11" stepKey="deleteSimpleProduct11"/>
+            <deleteData createDataKey="simpleProduct12" stepKey="deleteSimpleProduct12"/>
+            <deleteData createDataKey="simpleProduct13" stepKey="deleteSimpleProduct13"/>
+            <deleteData createDataKey="simpleProduct14" stepKey="deleteSimpleProduct14"/>
+            <deleteData createDataKey="simpleProduct15" stepKey="deleteSimpleProduct15"/>
+            <deleteData createDataKey="simpleProduct16" stepKey="deleteSimpleProduct16"/>
+            <deleteData createDataKey="simpleProduct17" stepKey="deleteSimpleProduct17"/>
+            <deleteData createDataKey="simpleProduct18" stepKey="deleteSimpleProduct18"/>
+            <deleteData createDataKey="simpleProduct19" stepKey="deleteSimpleProduct19"/>
+            <deleteData createDataKey="simpleProduct20" stepKey="deleteSimpleProduct20"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
@@ -162,6 +162,11 @@
         <waitForPageLoad stepKey="waitForPageToLoad11"/>
         <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="5" stepKey="seeNumberOfProductsInSecondPage3"/>
 
+        <!--Select First Page using page number-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="scrollToPreviousPage5"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad13"/>
+
         <!--Select 30 items per page  and verify number of products displayed in each page -->
         <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
         <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="30" stepKey="selectPerPageOption2"/>

From 7cd52fb59a15b0aae863fe98addc4578b77eac75 Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Thu, 24 Jan 2019 15:43:26 -0600
Subject: [PATCH 824/932] MC-11034: Enable Paypal Credit option should be
 disabled/greyed out when a non-US merchant is chosen - Fixed review comments
 and annotations

---
 .../MultiSelect/DisabledFundingOptions.php    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
index ea07f3363d92d..463fd630545c7 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
@@ -10,21 +10,26 @@
 
 /**
  * Class DisabledFundingOptions
-
- * @package Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect
  */
 class DisabledFundingOptions extends \Magento\Config\Block\System\Config\Form\Field
 {
-    const FIELD_CONFIG_PATH = 'general/country/default';
+    /**
+     * @var \Magento\Paypal\Model\ConfigFactory
+     */
+    private $configFactory;
+
     /**
      * DisabledFundingOptions constructor.
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Paypal\Model\ConfigFactory $configFactory
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
+        \Magento\Paypal\Model\ConfigFactory $configFactory,
         $data = []
     ) {
+        $this->configFactory = $configFactory;
         parent::__construct($context, $data);
     }
 
@@ -44,7 +49,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
     }
 
     /**
-     * Filters array for PAYPAL_FUNDING_CREDIT
+     * Filters array for CREDIT
      *
      * @param array $options
      * @return array
@@ -52,7 +57,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
     private function filterValuesForPaypalCredit($options)
     {
         return array_filter($options, function ($opt) {
-            return ($opt['value'] != 'CREDIT');
+            return ($opt['value'] !== 'CREDIT');
         });
     }
 
@@ -62,13 +67,10 @@ private function filterValuesForPaypalCredit($options)
      * @param string $country
      * @return bool
      */
-    private function isSelectedMerchantCountry($country): bool
+    private function isSelectedMerchantCountry(string $country): bool
     {
-        $paypalCountry = $this->getRequest()->getParam(StructurePlugin::REQUEST_PARAM_COUNTRY);
-        $defaultCountry = $this->_scopeConfig->getValue(self::FIELD_CONFIG_PATH);
-        if ($paypalCountry) {
-            return $paypalCountry === $country;
-        }
-        return $defaultCountry === $country;
+        $merchantCountry = $this->getRequest()->getParam(StructurePlugin::REQUEST_PARAM_COUNTRY)
+            ?: $this->configFactory->create()->getMerchantCountry();
+        return $merchantCountry === $country;
     }
 }

From 5990b49de0bdc39c60284ca8abe1f4e2971699aa Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Thu, 24 Jan 2019 13:53:05 -0600
Subject: [PATCH 825/932] MC-6286: Cart/Minicart Flow

---
 .../Checkout/Block/QuoteShortcutButtons.php   |  2 ++
 .../Magento/Paypal/Block/Bml/Shortcut.php     | 19 +++++++-----
 .../Express/InContext/Minicart/Button.php     | 15 +++++++--
 .../InContext/Minicart/SmartButton.php        | 31 +++++--------------
 .../Block/Express/InContext/SmartButton.php   | 21 +++++--------
 .../Magento/Paypal/Block/Express/Shortcut.php |  4 ++-
 app/code/Magento/Paypal/Model/Config.php      |  4 +--
 .../Paypal/Model/SmartButtonConfig.php        |  4 +--
 .../AddPaypalShortcutsObserverTest.php        | 10 ++++++
 9 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
index b7f6a163845e0..3b2f1604fae44 100644
--- a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
+++ b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
@@ -8,6 +8,8 @@
 use Magento\Framework\View\Element\Template;
 
 /**
+ * Displays buttons on shopping cart page
+ *
  * @api
  */
 class QuoteShortcutButtons extends \Magento\Catalog\Block\ShortcutButtons
diff --git a/app/code/Magento/Paypal/Block/Bml/Shortcut.php b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
index c46087f076d90..28f2326e799c3 100644
--- a/app/code/Magento/Paypal/Block/Bml/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
@@ -11,6 +11,9 @@
 use Magento\Paypal\Model\ConfigFactory;
 use Magento\Paypal\Model\Config;
 
+/**
+ * Class shortcut
+ */
 class Shortcut extends \Magento\Framework\View\Element\Template implements CatalogBlock\ShortcutInterface
 {
     /**
@@ -74,19 +77,19 @@ class Shortcut extends \Magento\Framework\View\Element\Template implements Catal
     private $config;
 
     /**
-     * Shortcut constructor.
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param ValidatorInterface $shortcutValidator
-     * @param $paymentMethodCode
-     * @param $startAction
-     * @param $alias
-     * @param $bmlMethodCode
-     * @param $shortcutTemplate
+     * @param string $paymentMethodCode
+     * @param string $startAction
+     * @param string $alias
+     * @param string $bmlMethodCode
+     * @param string $shortcutTemplate
      * @param array $data
      * @param ConfigFactory|null $config
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @codingStandardsIgnoreStart
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -104,7 +107,6 @@ public function __construct(
         $this->_paymentData = $paymentData;
         $this->_mathRandom = $mathRandom;
         $this->_shortcutValidator = $shortcutValidator;
-
         $this->_paymentMethodCode = $paymentMethodCode;
         $this->_startAction = $startAction;
         $this->_alias = $alias;
@@ -116,9 +118,10 @@ public function __construct(
         $this->config->setMethod($this->_paymentMethodCode);
         parent::__construct($context, $data);
     }
+    //@codingStandardsIgnoreEnd
 
     /**
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     * @inheritdoc
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
index 6be1ea6b31b77..8d1e04c1397fc 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
@@ -59,8 +59,8 @@ class Button extends Template implements ShortcutInterface
      * @param Context $context
      * @param ResolverInterface $localeResolver
      * @param ConfigFactory $configFactory
-     * @param MethodInterface $payment
      * @param Session $session
+     * @param MethodInterface $payment
      * @param array $data
      */
     public function __construct(
@@ -101,8 +101,7 @@ private function isVisibleOnCart()
     }
 
     /**
-     * Check is Paypal In-Context Express Checkout button
-     * should render in cart/mini-cart
+     * Check is Paypal In-Context Express Checkout button should render in cart/mini-cart
      *
      * @return bool
      */
@@ -127,6 +126,8 @@ protected function _toHtml()
     }
 
     /**
+     * Returns container id
+     *
      * @return string
      */
     public function getContainerId()
@@ -135,6 +136,8 @@ public function getContainerId()
     }
 
     /**
+     * Returns link action
+     *
      * @return string
      */
     public function getLinkAction()
@@ -143,6 +146,8 @@ public function getLinkAction()
     }
 
     /**
+     * Returns add to cart selector
+     *
      * @return string
      */
     public function getAddToCartSelector()
@@ -151,6 +156,8 @@ public function getAddToCartSelector()
     }
 
     /**
+     * Returns image url
+     *
      * @return string
      */
     public function getImageUrl()
@@ -171,6 +178,8 @@ public function getAlias()
     }
 
     /**
+     * Set information if button renders in the mini cart
+     *
      * @param bool $isCatalog
      * @return $this
      */
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
index a9203369501a0..ae8dd1b5a940c 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
@@ -27,11 +27,6 @@ class SmartButton extends Template implements ShortcutInterface
 {
     const ALIAS_ELEMENT_INDEX = 'alias';
 
-    /**
-     * @var bool
-     */
-    private $isMiniCart = false;
-
     /**
      * @var Config
      */
@@ -122,15 +117,13 @@ private function isVisibleOnCart() : bool
     }
 
     /**
-     * Check is Paypal In-Context Express Checkout button
-     * should render in cart/mini-cart
+     * Check is Paypal In-Context Express Checkout button should render in cart/mini-cart
      *
      * @return bool
      */
-    protected function shouldRender() : bool
+    private function shouldRender() : bool
     {
         return $this->payment->isAvailable($this->session->getQuote())
-            && $this->isMiniCart
             && $this->isInContext()
             && $this->isVisibleOnCart();
     }
@@ -158,22 +151,13 @@ public function getAlias()
     }
 
     /**
-     * @param bool $isCatalog
-     * @return $this
-     */
-    public function setIsInCatalogProduct($isCatalog)
-    {
-        $this->isMiniCart = !$isCatalog;
-
-        return $this;
-    }
-
-    /**
+     * Returns string to initialize js component
+     *
      * @return string
      */
     public function getJsInitParams(): string
     {
-        $json = "";
+        $config = [];
         $quoteId = $this->getQuoteId();
         if (!empty($quoteId)) {
             $clientConfig = [
@@ -202,13 +186,14 @@ public function getJsInitParams(): string
                     'clientConfig' => $clientConfig
                 ]
             ];
-            $json = $this->serializer->serialize($config);
         }
-
+        $json = $this->serializer->serialize($config);
         return $json;
     }
 
     /**
+     * Returns container id
+     *
      * @return string
      */
     public function getContainerId()
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
index c4407dfc10553..646af81f2a126 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
@@ -69,25 +69,16 @@ public function __construct(
     }
 
     /**
-     * Check `in_context` config value
-     *
-     * @return bool
-     */
-    private function isInContext() : bool
-    {
-        return (bool)(int) $this->config->getValue('in_context');
-    }
-
-    /**
-     * Check is Paypal In-Context Express Checkout button
-     * should render in cart/mini-cart
+     * Check is Paypal In-Context Express Checkout button should render in cart/mini-cart
      *
      * @return bool
      */
     protected function shouldRender() : bool
     {
-        return true;
-        //TODO: add config check
+        $isInCatalog = $this->getIsInCatalogProduct();
+        $isInContext = (bool)(int) $this->config->getValue('in_context');
+
+        return ($isInContext && $isInCatalog);
     }
 
     /**
@@ -113,6 +104,8 @@ public function getAlias()
     }
 
     /**
+     * Returns string to initialize js component
+     *
      * @return string
      */
     public function getJsInitParams(): string
diff --git a/app/code/Magento/Paypal/Block/Express/Shortcut.php b/app/code/Magento/Paypal/Block/Express/Shortcut.php
index 20fd4316f3555..16305238e17de 100644
--- a/app/code/Magento/Paypal/Block/Express/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Express/Shortcut.php
@@ -137,7 +137,7 @@ public function __construct(
     }
 
     /**
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     * @inheritdoc
      */
     protected function _beforeToHtml()
     {
@@ -188,6 +188,8 @@ protected function _toHtml()
     }
 
     /**
+     * Check if we should render component
+     *
      * @return bool
      */
     protected function shouldRender()
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 375e00e8e954c..baddbd24f5f84 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1702,11 +1702,11 @@ protected function _mapMethodFieldset($fieldName)
     /**
      * Map PayPal button style config fields
      *
-     * @param $fieldName
+     * @param string $fieldName
      * @return null|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function _mapButtonStyles($fieldName)
+    private function _mapButtonStyles(string $fieldName)
     {
         $page = substr($fieldName, 0, (int)strpos($fieldName, '_page_button_'));
 
diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 5909c14ad0ad4..ec91654545bde 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -45,7 +45,6 @@ public function __construct(
         $this->defaultStyles = $defaultStyles;
     }
 
-
     /**
      * Get smart button config
      *
@@ -62,8 +61,8 @@ public function getConfig(string $page): array
             'disallowedFunding' => $this->getDisallowedFunding(),
             'styles' => $this->getButtonStyles($page)
         ];
-
     }
+
     /**
      * Returns disallowed funding from configuration
      *
@@ -88,6 +87,7 @@ private function getAllowedFunding() : array
     /**
      * Returns button styles based on configuration
      *
+     * @param string $page
      * @return array
      */
     public function getButtonStyles(string $page) : array
diff --git a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
index 16e474178bb35..491484a6c3e8b 100644
--- a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
@@ -163,6 +163,11 @@ public function dataProviderShortcutsButtons()
                         self::PAYMENT_AVAILABLE => true,
                         self::PAYMENT_IS_BML => false,
                     ],
+                    \Magento\Paypal\Block\Express\InContext\SmartButton::class => [
+                        self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
+                        self::PAYMENT_AVAILABLE => true,
+                        self::PAYMENT_IS_BML => false,
+                    ],
                     \Magento\Paypal\Block\Express\Shortcut::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPP_EXPRESS,
                         self::PAYMENT_AVAILABLE => true,
@@ -202,6 +207,11 @@ public function dataProviderShortcutsButtons()
                         self::PAYMENT_AVAILABLE => false,
                         self::PAYMENT_IS_BML => false,
                     ],
+                    \Magento\Paypal\Block\Express\InContext\SmartButton::class => [
+                        self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
+                        self::PAYMENT_AVAILABLE => true,
+                        self::PAYMENT_IS_BML => false,
+                    ],
                     \Magento\Paypal\Block\Express\Shortcut::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPP_EXPRESS,
                         self::PAYMENT_AVAILABLE => false,

From 378a840ffc552359a3e3d8d6246a79314218109e Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Thu, 24 Jan 2019 16:50:21 -0600
Subject: [PATCH 826/932] MC-11034: Enable Paypal Credit option should be
 disabled/greyed out when a non-US merchant is chosen - Fixed review comments

---
 .../MultiSelect/DisabledFundingOptions.php    | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
index 463fd630545c7..5959a64c5d666 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
@@ -7,6 +7,9 @@
 namespace Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect;
 
 use Magento\Paypal\Model\Config\StructurePlugin;
+use Magento\Backend\Block\Template\Context;
+use Magento\Paypal\Model\Config;
+use Magento\Framework\Data\Form\Element\AbstractElement;
 
 /**
  * Class DisabledFundingOptions
@@ -14,22 +17,22 @@
 class DisabledFundingOptions extends \Magento\Config\Block\System\Config\Form\Field
 {
     /**
-     * @var \Magento\Paypal\Model\ConfigFactory
+     * @var \Magento\Paypal\Model\Config
      */
-    private $configFactory;
+    private $config;
 
     /**
      * DisabledFundingOptions constructor.
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Paypal\Model\ConfigFactory $configFactory
+     * @param \Magento\Paypal\Model\Config $config
      * @param array $data
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Paypal\Model\ConfigFactory $configFactory,
+        Context $context,
+        Config $config,
         $data = []
     ) {
-        $this->configFactory = $configFactory;
+        $this->config = $config;
         parent::__construct($context, $data);
     }
 
@@ -39,7 +42,7 @@ public function __construct(
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      */
-    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    public function render(AbstractElement $element)
     {
         if (!$this->isSelectedMerchantCountry('US')) {
             $fundingOptions = $element->getValues();
@@ -70,7 +73,7 @@ private function filterValuesForPaypalCredit($options)
     private function isSelectedMerchantCountry(string $country): bool
     {
         $merchantCountry = $this->getRequest()->getParam(StructurePlugin::REQUEST_PARAM_COUNTRY)
-            ?: $this->configFactory->create()->getMerchantCountry();
+            ?: $this->config->getMerchantCountry();
         return $merchantCountry === $country;
     }
 }

From 93b34b0cd11280b1c9961d0a6f6c0a1f1a597b49 Mon Sep 17 00:00:00 2001
From: ajay-2jcommerce <ajay@2jcommerce.in>
Date: Fri, 25 Jan 2019 12:08:34 +0530
Subject: [PATCH 827/932] Gift-option-massage-overlap-edit-and-remove-button
 ::Gift option massage overlap edit and remove button.

---
 .../luma/Magento_GiftMessage/web/css/source/_module.less   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
index 388ec32b4fc5a..abc93e136a4b2 100644
--- a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
@@ -246,6 +246,9 @@
     .gift-messages-order {
         margin-bottom: @indent__m;
     }
+    .gift-message-summary {
+        padding-right: 7rem;
+    }
 }
 
 //
@@ -282,10 +285,6 @@
         }
     }
 
-    .gift-message-summary {
-        padding-right: 7rem;
-    }
-
     //
     //  In-table block
     //  ---------------------------------------------

From d59b50d17ba0feaefeb0d8535f8d19d2579a2149 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Fri, 25 Jan 2019 11:24:48 +0200
Subject: [PATCH 828/932] Fix static tests.

---
 .../Magento/Catalog/Api/Data/ProductRender/ImageInterface.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
index 9c137cb2e882c..45b070d2706dc 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
@@ -92,6 +92,7 @@ public function setWidth($width);
 
     /**
      * Retrieve image label
+     *
      * Image label is short description of this image
      *
      * @return string
@@ -128,6 +129,8 @@ public function getResizedWidth();
     public function setResizedWidth($width);
 
     /**
+     * Set resized height
+     *
      * @param string $height
      * @return void
      * @since 101.1.0

From 3e9d89253eef3008f310d4ff4f98ab145d35f8a9 Mon Sep 17 00:00:00 2001
From: Parag Chavare <parag@2jcommerce.in>
Date: Fri, 25 Jan 2019 15:05:41 +0530
Subject: [PATCH 829/932] minicart-three-digit-quantity-cutoff

---
 .../blank/Magento_Checkout/web/css/source/module/_minicart.less | 2 +-
 .../luma/Magento_Checkout/web/css/source/module/_minicart.less  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
index 673131563417d..65f3eeef63b01 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
@@ -342,7 +342,7 @@
         .item-qty {
             margin-right: @indent__s;
             text-align: center;
-            width: 40px;
+            width: 45px;
         }
 
         .update-cart-item {
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
index b9b223f44021a..fd418e0c447b8 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -355,7 +355,7 @@
         .item-qty {
             margin-right: @indent__s;
             text-align: center;
-            width: 40px;
+            width: 45px;
         }
 
         .update-cart-item {

From e9c1157920db61ec0d8717fe81f279de4a741093 Mon Sep 17 00:00:00 2001
From: Pratik Oza <magepratik@gmail.com>
Date: Fri, 25 Jan 2019 15:29:03 +0530
Subject: [PATCH 830/932] Fixed Minicart close button overlapping

---
 .../Magento/luma/web/css/source/components/_modals_extend.less  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
index 3814341efd05a..7e3ee14ca5fa4 100644
--- a/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
+++ b/app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less
@@ -58,7 +58,7 @@
 
     .modal-custom {
         .action-close {
-            .lib-css(margin, @indent__m);
+            .lib-css(margin, 15px);
         }
     }
 

From 03bbc13093d58fc1598b9791e918422f203725af Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 25 Jan 2019 08:30:55 -0600
Subject: [PATCH 831/932] MC-11006: Build stabilization

- add unit tests
---
 .../Magento/Paypal/Model/AbstractConfig.php   |  2 +-
 .../Test/Unit/Model/AbstractConfigTest.php    | 42 +++++++++++++++++++
 .../Paypal/Test/Unit/Model/ConfigTest.php     | 28 +++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index 3da7843744b13..41f122ed9b3c9 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -298,7 +298,7 @@ public function isMethodActive($method)
                     $this->_storeId
                 );
                 $isExpressCreditEnabled = $disabledFunding
-                    ? !!strpos('CREDIT', $disabledFunding)
+                    ? strpos($disabledFunding, 'CREDIT') === false
                     : true;
                 $isEnabled = $isExpressCreditEnabled
                 || $this->_scopeConfig->isSetFlag(
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
index 78bd269403b83..52779451ac293 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -293,6 +293,48 @@ public function testIsMethodActive()
         $this->config->isMethodActive('method');
     }
 
+
+    /**
+     * Check bill me later active setting uses disable funding options
+     *
+     * @param string|null $disableFundingOptions
+     * @param int $expectedFlag
+     * @param bool $expectedValue
+     *
+     * @dataProvider isMethodActiveBmlDataProvider
+     */
+    public function testIsMethodActiveBml($disableFundingOptions, $expectedFlag, $expectedValue)
+    {
+        $this->scopeConfigMock->method('getValue')
+            ->with(
+                self::equalTo('payment/paypal_express/disable_funding_options'),
+                self::equalTo('store')
+            )->willReturn($disableFundingOptions);
+
+        $this->scopeConfigMock->method('isSetFlag')
+            ->with('payment/paypal_express_bml/active')
+            ->willReturn($expectedFlag);
+
+        self::assertEquals($expectedValue, $this->config->isMethodActive('paypal_express_bml'));
+    }
+
+    /**
+     * @return array
+     */
+    public function isMethodActiveBmlDataProvider()
+    {
+        return [
+            ['CREDIT,CARD,ELV', 0, false],
+            ['CREDIT,CARD,ELV', 1, true],
+            ['CREDIT', 0, false],
+            ['CREDIT', 1, true],
+            ['CARD', 0, true],
+            ['CARD', 1, true],
+            [null, 0, true],
+            [null, 1, true]
+        ];
+    }
+
     /**
      * Checks a case, when notation code based on Magento edition.
      */
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
index 172fc04f52474..fd90e774fb377 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
@@ -235,6 +235,34 @@ public function testGetSpecificConfigPathPayflowAdvancedLink()
         $this->assertEquals('Authorization', $this->model->getValue('payment_action'));
     }
 
+    /**
+     * @param string $name
+     * @param string $expectedValue
+     * @param string|null $expectedResult
+     *
+     * @dataProvider payPalStylesDataProvider
+     */
+    public function testGetSpecificConfigPathPayPalStyles($name, $expectedValue, $expectedResult)
+    {
+        // _mapGenericStyleFieldset
+        $this->scopeConfig->method('getValue')
+            ->with("paypal/style/{$name}")
+            ->willReturn($expectedValue);
+
+        $this->assertEquals($expectedResult, $this->model->getValue($name));
+    }
+
+    /**
+     * @return array
+     */
+    public function payPalStylesDataProvider()
+    {
+        return [
+            ['checkout_page_button_customize', 'value', 'value'],
+            ['test', 'value', null],
+        ];
+    }
+
     /**
      * @dataProvider skipOrderReviewStepDataProvider
      */

From 11a368acaf2bc79bb5c2f96e1a5b7a2365820f8b Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 25 Jan 2019 09:32:03 -0600
Subject: [PATCH 832/932] MQE-1408: Deliver weekly MTF to MFTF conversion PR

---
 ...efrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml | 1 +
 .../Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
index 9c9f09f807eaf..6ecadf1f2ddc2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -186,6 +186,7 @@
 
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForPageLoad stepKey="waitForPageLoadOrdersPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFilters" />
         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
index 433e390d776de..05baa38e25bf5 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
@@ -37,6 +37,7 @@
         <!-- Update 0.1 tax rate on the tax rate form page -->
         <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="fillTaxIdentifierField2"/>
         <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateFrance.tax_country_id}}" stepKey="selectCountry1"/>
+        <waitForElementVisible selector="{{AdminTaxRateFormSection.state}}" stepKey="waitForRegionsLoaded" />
         <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateFrance.tax_region_id}}" stepKey="selectState"/>
         <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateFrance.tax_postcode}}" stepKey="fillPostCode"/>
         <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateFrance.rate}}" stepKey="fillRate1"/>

From 7bcf26c0fba7f6d0bb058216200cb2d670f288bd Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 25 Jan 2019 09:56:59 -0600
Subject: [PATCH 833/932] MC-11006: Build stabilization

---
 app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
index 52779451ac293..98a846ca56604 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -309,7 +309,8 @@ public function testIsMethodActiveBml($disableFundingOptions, $expectedFlag, $ex
             ->with(
                 self::equalTo('payment/paypal_express/disable_funding_options'),
                 self::equalTo('store')
-            )->willReturn($disableFundingOptions);
+            )
+            ->willReturn($disableFundingOptions);
 
         $this->scopeConfigMock->method('isSetFlag')
             ->with('payment/paypal_express_bml/active')

From 7e4691723e6e3118404541c8e7625346dd8e8545 Mon Sep 17 00:00:00 2001
From: Rajneesh Gupta <er.rajneeshgupta@gmail.com>
Date: Fri, 25 Jan 2019 17:47:58 +0000
Subject: [PATCH 834/932] =?UTF-8?q?Update=20Filter.php=20fix=20issue=20?=
 =?UTF-8?q?=C2=A320624?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue https://github.com/magento/magento2/issues/20624
---
 .../Magento/ImportExport/Block/Adminhtml/Export/Filter.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 8721dd05a0fa6..51954798945ed 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -237,8 +237,8 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
         if ($attribute->getFilterOptions()) {
             $options = [];
 
-            foreach ($attribute->getFilterOptions() as $value => $label) {
-                $options[] = ['value' => $value, 'label' => $label];
+            foreach ($attribute->getFilterOptions() as $filterOptions => $label) {
+                $options[] = ['value' => $filterOptions, 'label' => $label];
             }
         } else {
             $options = $attribute->getSource()->getAllOptions(false);

From f8e871d588c600831c367a8d8e92ad9ca57c1c87 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 25 Jan 2019 12:03:05 -0600
Subject: [PATCH 835/932] MC-13630: Integrate smart button functionality on
 product detail page

---
 .../frontend/web/js/catalog-add-to-cart.js    |  10 +
 .../InContext/Minicart/SmartButton.php        |   3 +-
 .../Controller/Express/GetTokenData.php       |  11 +-
 .../Controller/Express/OnAuthorization.php    |   9 +-
 .../view/frontend/web/js/in-context/button.js |  73 +++----
 .../express-checkout-smart-buttons.js         |  51 ++---
 .../js/in-context/express-checkout-wrapper.js | 183 ++++++++++++++++++
 .../js/in-context/product-express-checkout.js |  70 +++----
 .../in-context/checkout-express.js            |  79 +++-----
 .../payment/paypal-express-in-context.html    |   2 +-
 10 files changed, 327 insertions(+), 164 deletions(-)
 create mode 100644 app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js

diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
index 7434678d1694b..bcb7c668657d3 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
@@ -165,6 +165,16 @@ define([
                     self.enableAddToCartButton(form);
                 },
 
+                /** @inheritdoc */
+                error: function (res) {
+                    $(document).trigger('ajax:addToCart:error', {
+                        'sku': form.data().productSku,
+                        'productIds': productIds,
+                        'form': form,
+                        'response': res
+                    });
+                },
+
                 /** @inheritdoc */
                 complete: function (res) {
                     if (res.state() === 'rejected') {
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
index ae8dd1b5a940c..90c19fe47e764 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
@@ -125,7 +125,8 @@ private function shouldRender() : bool
     {
         return $this->payment->isAvailable($this->session->getQuote())
             && $this->isInContext()
-            && $this->isVisibleOnCart();
+            && $this->isVisibleOnCart()
+            && $this->getQuoteId();
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
index f07251fb7b14a..7d9d72e966759 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -164,14 +164,19 @@ public function execute(): ResultInterface
     private function getToken(): ?string
     {
         $quoteId = $this->getRequest()->getParam('quote_id');
-        $customerId = $this->getRequest()->getParam('customer_id');
+        $customerId = $this->getRequest()->getParam('customer_id') ?: $this->_customerSession->getId();
         $hasButton = (bool)$this->getRequest()->getParam(Checkout::PAYMENT_INFO_BUTTON);
 
-        $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
+        if ($quoteId) {
+            $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
+        } else {
+            $quote = $this->_getQuote();
+        }
+
         $this->_initCheckout($quote);
 
         if ($quote->getIsMultiShipping()) {
-            $quote->setIsMultiShipping(false);
+            $quote->setIsMultiShipping(0);
             $quote->removeAllAddresses();
         }
 
diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index b46e8049c8fa3..8e613308eb13b 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -118,9 +118,14 @@ public function execute()
         $quoteId = $this->getRequest()->getParam('quoteId');
         $payerId = $this->getRequest()->getParam('payerId');
         $tokenId = $this->getRequest()->getParam('paymentToken');
-        $customerId = $this->getRequest()->getParam('customerId');
+        $customerId = $this->getRequest()->getParam('customerId') ?: $this->_customerSession->getId();
+
         try {
-            $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
+            if ($quoteId) {
+                $quote = $customerId ? $this->cartRepository->get($quoteId) : $this->guestCartRepository->get($quoteId);
+            } else {
+                $quote = $this->_getQuote();
+            }
 
             $responseContent = [
                 'success' => true,
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
index 67c903a780f28..2420b10179c28 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
@@ -5,64 +5,51 @@
 define([
     'uiComponent',
     'jquery',
-    'Magento_Paypal/js/in-context/express-checkout-smart-buttons',
-    'Magento_Customer/js/customer-data'
-], function (Component, $, checkoutSmartButtons, customerData) {
+    'Magento_Paypal/js/in-context/express-checkout-wrapper',
+    'Magento_Customer/js/customer-data',
+    'mage/cookies'
+], function (Component, $, Wrapper, customerData) {
     'use strict';
 
-    return Component.extend({
-        /**
-         * @return {Object}
-         */
+    return Component.extend(Wrapper).extend({
+        defaults: {
+            declinePayment: false
+        },
+
+        /** @inheritdoc */
         initialize: function (config, element) {
+            var cart = customerData.get('cart'),
+                customer = customerData.get('customer');
+
             this._super();
-            this.prepareClientConfig();
-            checkoutSmartButtons(this.prepareClientConfig(), element);
+            this.renderPayPalButtons(element);
+            this.declinePayment = !customer().firstname && !cart().isGuestCheckoutAllowed;
 
             return this;
         },
 
-        /**
-         *  Validates Smart Buttons
-         */
-        validate: function (actions) {
-            this.clientConfig.buttonActions = actions || this.clientConfig.buttonActions;
-            this.clientConfig.buttonActions.enable();
+        /** @inheritdoc */
+        beforePayment: function (resolve, reject) {
+            var promise = $.Deferred();
+
+            if (this.declinePayment) {
+                this.addError(this.signInMessage, 'warning');
+
+                reject();
+            } else {
+                promise.resolve();
+            }
+
+            return promise;
         },
 
-        /**
-         * Populate client config with all required data
-         *
-         * @return {Object}
-         */
+        /** @inheritdoc */
         prepareClientConfig: function () {
-            this.clientConfig.client = {};
-            this.clientConfig.client[this.clientConfig.environment] = this.clientConfig.merchantId;
-            this.clientConfig.rendererComponent = this;
+            this._super();
             this.clientConfig.formKey = $.mage.cookies.get('form_key');
             this.clientConfig.commit = false;
 
             return this.clientConfig;
-        },
-
-        /**
-         * Adding logic to be triggered onClick action for smart buttons component
-         */
-        onClick: function () {},
-
-        /**
-         * Adds error message
-         *
-         * @param {String} message
-         */
-        addError: function (message) {
-            customerData.set('messages', {
-                messages: [{
-                    type: 'error',
-                    text: message
-                }],
-                'data_id': Math.floor(Date.now() / 1000)
-            });
         }
     });
 });
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
index a3fd17d66cd14..ad7e86f2e99e0 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -40,14 +40,14 @@ define([
              * @param {Object} actions
              */
             validate: function (actions) {
-                clientConfig.rendererComponent.validate && clientConfig.rendererComponent.validate(actions);
+                clientConfig.rendererComponent.validate(actions);
             },
 
             /**
              * Execute logic on Paypal button click
              */
             onClick: function () {
-                clientConfig.rendererComponent.onClick && clientConfig.rendererComponent.onClick();
+                clientConfig.rendererComponent.onClick();
             },
 
             /**
@@ -63,27 +63,14 @@ define([
                     button: clientConfig.button
                 };
 
-                if (!clientConfig.button) {
-                    return new paypal.Promise(function (resolve, reject) {
-                        clientConfig.rendererComponent.beforePayment(resolve, reject).then(function () {
-                            paypal.request.post(clientConfig.getTokenUrl, params).then(function (res) {
-                                if (res.success) {
-                                    return resolve(res.token);
-                                }
-
-                                clientConfig.rendererComponent.addError(res['error_message']);
-
-                                return reject(new Error(res['error_message']));
-                            });
+                return new paypal.Promise(function (resolve, reject) {
+                    clientConfig.rendererComponent.beforePayment(resolve, reject).then(function () {
+                        paypal.request.post(clientConfig.getTokenUrl, params).then(function (res) {
+                            return clientConfig.rendererComponent.afterPayment(res, resolve, reject);
+                        }).catch(function (err) {
+                            return clientConfig.rendererComponent.catchPayment(err, resolve, reject);
                         });
                     });
-                }
-
-                return paypal.request.post(clientConfig.getTokenUrl, params).then(function (res) {
-                    if (res.success) {
-                        return res.token;
-                    }
-                    clientConfig.rendererComponent.addError(res['error_message']);
                 });
             },
 
@@ -98,17 +85,19 @@ define([
                 var params = {
                     paymentToken: data.paymentToken,
                     payerId: data.payerID,
-                    quoteId: clientConfig.quoteId,
+                    quoteId: clientConfig.quoteId || '',
                     customerId: clientConfig.customerId || '',
                     'form_key': clientConfig.formKey
                 };
 
-                return paypal.request.post(clientConfig.onAuthorizeUrl, params).then(function (res) {
-                    if (res.success) {
-
-                        return actions.redirect(window, res.redirectUrl);
-                    }
-                    clientConfig.rendererComponent.addError(res['error_message']);
+                return new paypal.Promise(function (resolve, reject) {
+                    clientConfig.rendererComponent.beforeOnAuthorize(resolve, reject, actions).then(function () {
+                        paypal.request.post(clientConfig.onAuthorizeUrl, params).then(function (res) {
+                            clientConfig.rendererComponent.afterOnAuthorize(res, resolve, reject, actions);
+                        }).catch(function (err) {
+                            return clientConfig.rendererComponent.catchOnAuthorize(err, resolve, reject);
+                        });
+                    });
                 });
 
             },
@@ -120,14 +109,14 @@ define([
              * @param {Object} actions
              */
             onCancel: function (data, actions) {
-                actions.redirect(window, clientConfig.onCancelUrl);
+                clientConfig.rendererComponent.onCancel(data, actions);
             },
 
             /**
              * Process errors
              */
-            onError: function () {
-                // Uncaught error isn't displayed in the console
+            onError: function (err) {
+                clientConfig.rendererComponent.onError(err);
             }
         }, element);
     };
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
new file mode 100644
index 0000000000000..ace9f8dfbe065
--- /dev/null
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
@@ -0,0 +1,183 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/translate',
+    'Magento_Customer/js/customer-data',
+    'Magento_Paypal/js/in-context/express-checkout-smart-buttons'
+], function ($, $t, customerData, checkoutSmartButtons) {
+    'use strict';
+
+    return {
+        defaults: {
+            paymentActionError: $t('Something went wrong with your request. Please try again later.'),
+            signInMessage: $t('To check out, please sign in with your email address.')
+        },
+
+        /**
+         * Render PayPal buttons using checkout.js
+         */
+        renderPayPalButtons: function (element) {
+            checkoutSmartButtons(this.prepareClientConfig(), element);
+        },
+
+        /**
+         * Validate payment method
+         *
+         * @param {Object} actions
+         */
+        validate: function (actions) {
+            this.actions = actions || this.actions;
+        },
+
+        /**
+         * Execute logic on Paypal button click
+         */
+        onClick: function () {},
+
+        /**
+         * Before payment execute
+         *
+         * @param {Function} resolve
+         * @param {Function} reject
+         * @return {*}
+         */
+        beforePayment: function (resolve, reject) { //eslint-disable-line no-unused-vars
+            return $.Deferred().resolve();
+        },
+
+        /**
+         * After payment execute
+         *
+         * @param {Object} res
+         * @param {Function} resolve
+         * @param {Function} reject
+         *
+         * @return {*}
+         */
+        afterPayment: function (res, resolve, reject) {
+            if (res.success) {
+                return resolve(res.token);
+            }
+
+            this.addError(res['error_message']);
+
+            return reject(new Error(res['error_message']));
+        },
+
+        /**
+         * Catch payment
+         *
+         * @param {Error} err
+         * @param {Function} resolve
+         * @param {Function} reject
+         */
+        catchPayment: function (err, resolve, reject) {
+            this.addError(this.paymentActionError);
+            reject(err);
+        },
+
+        /**
+         * Before onAuthorize execute
+         *
+         * @param {Function} resolve
+         * @param {Function} reject
+         * @param {Object} actions
+         *
+         * @return {jQuery.Deferred}
+         */
+        beforeOnAuthorize: function (resolve, reject, actions) { //eslint-disable-line no-unused-vars
+            return $.Deferred().resolve();
+        },
+
+        /**
+         * After onAuthorize execute
+         *
+         * @param {Object} res
+         * @param {Function} resolve
+         * @param {Function} reject
+         * @param {Object} actions
+         *
+         * @return {*}
+         */
+        afterOnAuthorize: function (res, resolve, reject, actions) {
+            if (res.success) {
+                return resolve(actions.redirect(window, res.redirectUrl));
+            }
+
+            this.addError(res['error_message']);
+
+            return reject(new Error(res['error_message']));
+        },
+
+        /**
+         * Catch payment
+         *
+         * @param {Error} err
+         * @param {Function} resolve
+         * @param {Function} reject
+         */
+        catchOnAuthorize: function (err, resolve, reject) {
+            this.addError(this.paymentActionError);
+            reject(err);
+        },
+
+        /**
+         * Process cancel action
+         *
+         * @param {Object} data
+         * @param {Object} actions
+         */
+        onCancel: function (data, actions) {
+            actions.redirect(window, this.clientConfig.onCancelUrl);
+        },
+
+        /**
+         * Process errors
+         *
+         * @param {Error} err
+         */
+        onError: function (err) { //eslint-disable-line no-unused-vars
+            // Uncaught error isn't displayed in the console
+        },
+
+        /**
+         * Adds error message
+         *
+         * @param {String} message
+         * @param {String} [type]
+         */
+        addError: function (message, type) {
+            type = type || 'error';
+            customerData.set('messages', {
+                messages: [{
+                    type: type,
+                    text: message
+                }],
+                'data_id': Math.floor(Date.now() / 1000)
+            });
+        },
+
+        /**
+         * @returns {String}
+         */
+        getButtonId: function () {
+            return this.inContextId;
+        },
+
+        /**
+         * Populate client config with all required data
+         *
+         * @return {Object}
+         */
+        prepareClientConfig: function () {
+            this.clientConfig.client = {};
+            this.clientConfig.client[this.clientConfig.environment] = this.clientConfig.merchantId;
+            this.clientConfig.rendererComponent = this;
+
+            return this.clientConfig;
+        }
+    };
+});
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
index a28257cebd2fa..a0cee19d0a898 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
@@ -6,69 +6,69 @@ define([
     'underscore',
     'jquery',
     'uiComponent',
-    'Magento_Paypal/js/in-context/express-checkout-smart-buttons'
-], function (_, $, Component, checkoutSmartButtons) {
+    'Magento_Paypal/js/in-context/express-checkout-wrapper',
+    'Magento_Customer/js/customer-data',
+    'mage/cookies'
+], function (_, $, Component, Wrapper, customerData) {
     'use strict';
 
-    return Component.extend({
+    return Component.extend(Wrapper).extend({
         defaults: {
             productFormSelector: '#product_addtocart_form',
-            validationElements: 'input',
-            getQuoteUrl: '',
+            declinePayment: false,
             formInvalid: false
         },
 
+        /** @inheritdoc */
         initialize: function (config, element) {
+            var cart = customerData.get('cart'),
+                customer = customerData.get('customer');
+
             this._super();
-            checkoutSmartButtons(this.prepareClientConfig(), element);
-        },
+            this.renderPayPalButtons(element);
+            this.declinePayment = !customer().firstname && !cart().isGuestCheckoutAllowed;
 
-        validate: function (actions) {
-            this.actions = actions;
+            return this;
         },
 
+        /** @inheritdoc */
         onClick: function () {
             var $form = $(this.productFormSelector);
 
-            $form.submit();
-            this.formInvalid = !$form.validation('isValid') ? true : false;
+            if (!this.declinePayment) {
+                $form.submit();
+                this.formInvalid = !$form.validation('isValid');
+            }
         },
 
+        /** @inheritdoc */
         beforePayment: function (resolve, reject) {
             var promise = $.Deferred();
 
-            if (this.formInvalid) {
+            if (this.declinePayment) {
+                this.addError(this.signInMessage, 'warning');
+                reject();
+            } else if (this.formInvalid) {
                 reject();
             } else {
-                promise.resolve();
+                $(document).on('ajax:addToCart', function (e, data) {
+                    if (_.isEmpty(data.response)) {
+                        return promise.resolve();
+                    }
+
+                    return reject();
+                });
+                $(document).on('ajax:addToCart:error', reject);
             }
 
             return promise;
         },
 
-        /**
-         * @returns {String}
-         */
-        getButtonId: function () {
-            return this.inContextId;
-        },
-
-        /**
-         * @returns {String}
-         */
-        getAgreementId: function () {
-            return this.inContextId + '-agreement';
-        },
-
-        /**
-         * Populate client config with all required data
-         *
-         * @return {Object}
-         */
+        /** @inheritdoc */
         prepareClientConfig: function () {
-            this.clientConfig.client = {};
-            this.clientConfig.client[this.clientConfig.environment] = this.clientConfig.merchantId;
-            this.clientConfig.rendererComponent = this;
+            this._super();
+            this.clientConfig.quoteId = '';
+            this.clientConfig.customerId = '';
             this.clientConfig.formKey = $.mage.cookies.get('form_key');
             this.clientConfig.commit = false;
 
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index 131a4a14fe99a..27a1e4c1b196e 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -4,29 +4,16 @@
  */
 define([
     'jquery',
-    'underscore',
     'Magento_Paypal/js/view/payment/method-renderer/paypal-express-abstract',
+    'Magento_Paypal/js/in-context/express-checkout-wrapper',
     'Magento_Paypal/js/action/set-payment-method',
     'Magento_Checkout/js/model/payment/additional-validators',
-    'Magento_Ui/js/lib/view/utils/dom-observer',
-    'Magento_Customer/js/customer-data',
     'Magento_Ui/js/model/messageList',
-    'Magento_Paypal/js/in-context/express-checkout-smart-buttons',
     'Magento_Ui/js/lib/view/utils/async'
-], function (
-    $,
-    _,
-    Component,
-    setPaymentMethodAction,
-    additionalValidators,
-    domObserver,
-    customerData,
-    messageList,
-    checkoutSmartButtons
-) {
+], function ($, Component, Wrapper, setPaymentMethod, additionalValidators, messageList) {
     'use strict';
 
-    return Component.extend({
+    return Component.extend(Wrapper).extend({
         defaults: {
             template: 'Magento_Paypal/payment/paypal-express-in-context',
             validationElements: 'input'
@@ -48,35 +35,35 @@ define([
         /**
          *  Validates Smart Buttons
          */
-        validate: function (actions) {
-            this.clientConfig.buttonActions = actions || this.clientConfig.buttonActions;
+        validate: function () {
+            this._super();
 
-            if (this.clientConfig.buttonActions) {
-                additionalValidators.validate(true) ?
-                    this.clientConfig.buttonActions.enable() :
-                    this.clientConfig.buttonActions.disable();
+            if (this.actions) {
+                additionalValidators.validate(true) ? this.actions.enable() : this.actions.disable();
             }
         },
 
-        /**
-         * Render PayPal buttons using checkout.js
-         */
-        renderPayPalButtons: function () {
-            checkoutSmartButtons(this.prepareClientConfig(), '#' + this.getButtonId());
-        },
+        /** @inheritdoc */
+        beforePayment: function (resolve, reject) {
+            var promise = $.Deferred();
 
-        /**
-         * @returns {String}
-         */
-        getButtonId: function () {
-            return this.inContextId;
-        },
+            setPaymentMethod(this.messageContainer).done(function () {
+                return promise.resolve();
+            }).fail(function (response) {
+                var error;
 
-        /**
-         * @returns {String}
-         */
-        getAgreementId: function () {
-            return this.inContextId + '-agreement';
+                try {
+                    error = JSON.parse(response.responseText);
+                } catch (exception) {
+                    error = this.paymentActionError;
+                }
+
+                this.addError(error);
+
+                return reject(new Error(error));
+            }.bind(this));
+
+            return promise;
         },
 
         /**
@@ -85,16 +72,12 @@ define([
          * @return {Object}
          */
         prepareClientConfig: function () {
+            this._super();
             this.clientConfig.quoteId = window.checkoutConfig.quoteData['entity_id'];
             this.clientConfig.formKey = window.checkoutConfig.formKey;
             this.clientConfig.customerId = window.customerData.id;
-            this.clientConfig.button = 0;
             this.clientConfig.merchantId = this.merchantId;
-            this.clientConfig.client = {};
-            this.clientConfig.client[this.clientConfig.environment] = this.merchantId;
-            this.clientConfig.additionalAction = setPaymentMethodAction;
-            this.clientConfig.rendererComponent = this;
-            this.clientConfig.messageContainer = this.messageContainer;
+            this.clientConfig.button = 0;
             this.clientConfig.commit = true;
 
             return this.clientConfig;
@@ -103,7 +86,7 @@ define([
         /**
          * Adding logic to be triggered onClick action for smart buttons component
          */
-        onClick: function() {
+        onClick: function () {
             additionalValidators.validate();
             this.selectPaymentMethod();
         },
@@ -111,9 +94,9 @@ define([
         /**
          * Adds error message
          *
-         * @param {string} message
+         * @param {String} message
          */
-        addError: function(message) {
+        addError: function (message) {
             messageList.addErrorMessage({
                 message: message
             });
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index 4d62a6d7e0ff5..cb91d085020d0 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -27,7 +27,7 @@
     </div>
     <div class="payment-method-content" afterRender="initListeners">
         <each args="getRegion('messages')" render=""/>
-        <div class="checkout-agreements-block" attr="id: getAgreementId()">
+        <div class="checkout-agreements-block">
             <each args="$parent.getRegion('before-place-order')" render=""/>
         </div>
         <div class="actions-toolbar" attr="id: getButtonId()" afterRender="renderPayPalButtons"/>

From f2a8139c9bc786ebcae768148bf89a178c4fe446 Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Fri, 25 Jan 2019 12:12:49 -0600
Subject: [PATCH 836/932] MC-13720: Disable Funding Options multi-select
 doesn't accept unselect action - configured disabled funding options to
 contain empty values

---
 .../Magento/Paypal/etc/adminhtml/system/express_checkout.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 74ca2e07f2e03..e8177bf040e14 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -741,6 +741,7 @@
                             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions</frontend_model>
                             <source_model>Magento\Paypal\Model\System\Config\Source\DisableFundingOptions</source_model>
                             <attribute type="shared">1</attribute>
+                            <can_be_empty>1</can_be_empty>
                         </field>
                     </group>
                 </group>

From 261a545ef976def87a7758578403b46ef6bf5c8a Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Fri, 25 Jan 2019 12:13:40 -0600
Subject: [PATCH 837/932] MC-6286: Cart/Minicart Flow

---
 app/code/Magento/Paypal/Model/SmartButtonConfig.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index ec91654545bde..5d0efb42d480f 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -90,16 +90,10 @@ private function getAllowedFunding() : array
      * @param string $page
      * @return array
      */
-    public function getButtonStyles(string $page) : array
+    private function getButtonStyles(string $page) : array
     {
-        $styles = [
-            'layout' => 'vertical',
-            'size' => 'responsive',
-            'color' => 'gold',
-            'shape' => 'rect',
-            'label' => 'paypal'
-        ];
-        if (!!$this->config->getValue("{$page}_page_button_customize")) {
+        $styles = $this->defaultStyles[$page];
+        if ((boolean)$this->config->getValue("{$page}_page_button_customize")) {
             $styles['layout'] = $this->config->getValue("{$page}_page_button_layout");
             $styles['size'] = $this->config->getValue("{$page}_page_button_size");
             $styles['color'] = $this->config->getValue("{$page}_page_button_color");

From de2010cedd15a9a5d8c0bc8703e3af87b849eeec Mon Sep 17 00:00:00 2001
From: Rajneesh Gupta <er.rajneeshgupta@gmail.com>
Date: Sat, 26 Jan 2019 00:11:39 +0530
Subject: [PATCH 838/932] update filter.php $value param was  overridden by
 optionValues.

---
 .../Magento/ImportExport/Block/Adminhtml/Export/Filter.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 51954798945ed..d032f2f7621b2 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -237,8 +237,8 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
         if ($attribute->getFilterOptions()) {
             $options = [];
 
-            foreach ($attribute->getFilterOptions() as $filterOptions => $label) {
-                $options[] = ['value' => $filterOptions, 'label' => $label];
+            foreach ($attribute->getFilterOptions() as $optionValue => $label) {
+                $options[] = ['value' => $optionValue, 'label' => $label];
             }
         } else {
             $options = $attribute->getSource()->getAllOptions(false);

From 872f952b491a02a67d287e9f76d55db45a1b1b08 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 25 Jan 2019 13:09:06 -0600
Subject: [PATCH 839/932] MQE-1408: Deliver weekly MTF to MFTF conversion PR

---
 .../Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
index 05baa38e25bf5..8f81b24e05f91 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
@@ -37,7 +37,7 @@
         <!-- Update 0.1 tax rate on the tax rate form page -->
         <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="fillTaxIdentifierField2"/>
         <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateFrance.tax_country_id}}" stepKey="selectCountry1"/>
-        <waitForElementVisible selector="{{AdminTaxRateFormSection.state}}" stepKey="waitForRegionsLoaded" />
+        <waitForElementVisible selector="{{AdminTaxRateFormSection.state}}:not([disabled])" stepKey="waitForRegionsLoaded" />
         <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateFrance.tax_region_id}}" stepKey="selectState"/>
         <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateFrance.tax_postcode}}" stepKey="fillPostCode"/>
         <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateFrance.rate}}" stepKey="fillRate1"/>

From 463be277d7246eba78f6e23e5cfedd6730a97d88 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Fri, 25 Jan 2019 14:39:52 -0600
Subject: [PATCH 840/932] MC-13630: Integrate smart button functionality on
 product detail page - fix promise resolve

---
 .../frontend/web/js/in-context/express-checkout-wrapper.js    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
index ace9f8dfbe065..b13d49614b3a7 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
@@ -104,7 +104,9 @@ define([
          */
         afterOnAuthorize: function (res, resolve, reject, actions) {
             if (res.success) {
-                return resolve(actions.redirect(window, res.redirectUrl));
+                resolve();
+
+                return actions.redirect(window, res.redirectUrl);
             }
 
             this.addError(res['error_message']);

From 5940619c04c697748fa114db7c0a38efd9dc76a4 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 25 Jan 2019 14:45:08 -0600
Subject: [PATCH 841/932] MQE-1408: Deliver weekly MTF to MFTF conversion PR

---
 .../Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
index 8f81b24e05f91..2ed31c2e20488 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
@@ -37,7 +37,7 @@
         <!-- Update 0.1 tax rate on the tax rate form page -->
         <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="fillTaxIdentifierField2"/>
         <selectOption selector="{{AdminTaxRateFormSection.country}}" userInput="{{taxRateCustomRateFrance.tax_country_id}}" stepKey="selectCountry1"/>
-        <waitForElementVisible selector="{{AdminTaxRateFormSection.state}}:not([disabled])" stepKey="waitForRegionsLoaded" />
+        <wait time="10" stepKey="waitForRegionsLoaded" />
         <selectOption selector="{{AdminTaxRateFormSection.state}}" userInput="{{taxRateCustomRateFrance.tax_region_id}}" stepKey="selectState"/>
         <fillField selector="{{AdminTaxRateFormSection.zipCode}}" userInput="{{taxRateCustomRateFrance.tax_postcode}}" stepKey="fillPostCode"/>
         <fillField selector="{{AdminTaxRateFormSection.rate}}" userInput="{{taxRateCustomRateFrance.rate}}" stepKey="fillRate1"/>

From c5b3429c9c0cbcd17aebce5b6c608a224e50e36a Mon Sep 17 00:00:00 2001
From: Patrick McLain <pat@pmclain.com>
Date: Fri, 4 Jan 2019 17:51:51 -0500
Subject: [PATCH 842/932] Fix region_id update in updateCustomerAddress
 mutation

This commit maps `region/region_id` to `AddressInterface:regionId` when
provided as input.

The `AddressInterface` contains both `region` and `regionId` properties which
are mapped to `\Magento\Customer\Model\Address` by the
`AddressRepositoryInterface`.

After populating an existing customer address with the user input for `region`,
the exting `regionId` was still set on the `AddressInterface`. When saving
the `region` property is mapped to the model before `regionId`.

https://github.com/magento/magento2/blob/1a92f1c1609445c7b6b107a165d387e306f2f779/app/code/Magento/Customer/Model/Address.php#L141-L167
---
 .../Model/Resolver/UpdateCustomerAddress.php        |  4 ++++
 .../GraphQl/Customer/UpdateCustomerAddressTest.php  | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
index 7bae40e4cc5de..833ab2e450280 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -109,6 +109,10 @@ private function updateCustomerAddress(int $customerId, int $addressId, array $a
     {
         $address = $this->getCustomerAddressForUser->execute($addressId, $customerId);
         $this->dataObjectHelper->populateWithArray($address, $addressData, AddressInterface::class);
+        if (isset($addressData['region']['region_id'])) {
+            $address->setRegionId($address->getRegion()->getRegionId());
+        }
+
         return $this->addressRepository->save($address);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
index 519fe2b1405a0..6a9708b4f86a2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php
@@ -218,13 +218,12 @@ private function assertCustomerAddressesFields(AddressInterface $address, $actua
         ];
         $this->assertResponseFields($actualResponse, $assertionMap);
         $this->assertTrue(is_array([$actualResponse['region']]), "region field must be of an array type.");
-        // https://github.com/magento/graphql-ce/issues/270
-//        $assertionRegionMap = [
-//            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
-//            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
-//            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
-//        ];
-//        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
+        $assertionRegionMap = [
+            ['response_field' => 'region', 'expected_value' => $address->getRegion()->getRegion()],
+            ['response_field' => 'region_code', 'expected_value' => $address->getRegion()->getRegionCode()],
+            ['response_field' => 'region_id', 'expected_value' => $address->getRegion()->getRegionId()]
+        ];
+        $this->assertResponseFields($actualResponse['region'], $assertionRegionMap);
     }
 
     /**

From 797147c25de264a5ff1b572ac8b880f367bbb60d Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 19 Dec 2018 13:46:41 +0100
Subject: [PATCH 843/932] Mutation placeholder removed

---
 app/code/Magento/GraphQl/etc/schema.graphqls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
index 2281495d059e1..7ea715097cdf3 100644
--- a/app/code/Magento/GraphQl/etc/schema.graphqls
+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -5,7 +5,6 @@ type Query {
 }
 
 type Mutation {
-    placeholderMutation: String @doc(description: "Mutation type cannot be declared without fields. The placeholder will be removed when at least one mutation field is declared.")
 }
 
 input FilterTypeInput @doc(description: "FilterTypeInput specifies which action will be performed in a query ") {

From d16880f66dae382394c61b52c11ae5d784fc1185 Mon Sep 17 00:00:00 2001
From: Brendan Falkowski <brendan@gravitydept.com>
Date: Wed, 19 Dec 2018 15:34:43 -0800
Subject: [PATCH 844/932] Fix spelling in schema comments

---
 app/code/Magento/StoreGraphQl/etc/schema.graphqls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
index af79d0e3e28b7..d9f7eaaaa294c 100644
--- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -6,10 +6,10 @@ type Query {
 
 type Website @doc(description: "The type contains information about a website") {
     id : Int @doc(description: "The ID number assigned to the website")
-    name : String @doc(description: "The website name. Websites use this name to identify it easyer.")
+    name : String @doc(description: "The website name. Websites use this name to identify it easier.")
     code : String @doc(description: "A code assigned to the website to identify it")
     sort_order : Int @doc(description: "The attribute to use for sorting websites")
-    default_group_id : String @doc(description: "The default group id that the website has")
+    default_group_id : String @doc(description: "The default group ID that the website has")
     is_default : Boolean @doc(description: "Specifies if this is the default website")
 }
 

From ee64dac2b343b3af54ff7364143a19634f5ad1f9 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Fri, 25 Jan 2019 16:01:58 -0600
Subject: [PATCH 845/932] MQE-1424: Stabilize mtf-eol branch

- Add a conditional clear filters to StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest
---
 ...efrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
index 9c9f09f807eaf..b979b466ab132 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -186,6 +186,7 @@
 
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
         <waitForPageLoad stepKey="waitForPageLoadOrdersPage"/>
+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilter"/>
         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="fillOrderNum"/>
         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearchOrderNum"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappearOnSearch"/>

From 21567eb58024d7672e245c39b900eff829b315cb Mon Sep 17 00:00:00 2001
From: Pratik Oza <magepratik@gmail.com>
Date: Sat, 26 Jan 2019 15:00:44 +0530
Subject: [PATCH 846/932] Empty block rendering in My Account page sidebar
 fixed using designing changes

---
 .../Magento_Customer/web/css/source/_module.less    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index 2e7856d390bd0..51424c38f04dd 100755
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -421,6 +421,12 @@
         .column.main {
             width: 77.7%;
         }
+
+        .sidebar-main {
+            .block {
+                margin-bottom: 0;
+            }
+        }
     }
 
     .account {
@@ -532,11 +538,18 @@
         .column.main,
         .sidebar-additional {
             margin: 0;
+            padding: 0;
         }
 
         .data.table {
             &:extend(.abs-table-striped-mobile all);
         }
+
+        .sidebar-main {
+            .account-nav {
+                margin-bottom: 0;
+            }
+        }
     }
 }
 

From cae7e4fe773b36947af0f484db2f01a6bbceeecc Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Sat, 26 Jan 2019 15:16:49 +0000
Subject: [PATCH 847/932] Fixed unit and static tests

---
 .../Unit/Model/ResourceModel/Product/CollectionTest.php   | 4 ++--
 .../Catalog/Product/Composite/Fieldset/Downloadable.php   | 7 ++-----
 .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php   | 6 +++++-
 .../Catalog/Product/Edit/Tab/Downloadable/Links.php       | 8 ++++++++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
index bb39aa7f9db77..3eb219ee2932b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php
@@ -323,7 +323,7 @@ public function testAddTierPriceDataByGroupId()
                 [ '(customer_group_id=? AND all_groups=0) OR all_groups=1', $customerGroupId]
             )
             ->willReturnSelf();
-        $select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
+        $select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
         $this->connectionMock->expects($this->once())
             ->method('fetchAll')
             ->with($select)
@@ -375,7 +375,7 @@ public function testAddTierPriceData()
         $select->expects($this->exactly(1))->method('where')
             ->with('entity_id IN(?)', [1])
             ->willReturnSelf();
-        $select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
+        $select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
         $this->connectionMock->expects($this->once())
             ->method('fetchAll')
             ->with($select)
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
index abb03de5fc376..973d52e865dc9 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
@@ -4,14 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Adminhtml block for fieldset of downloadable product
- *
- * @author     Magento Core Team <core@magentocommerce.com>
- */
 namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Composite\Fieldset;
 
 /**
+ * Adminhtml block for fieldset of downloadable product
+ *
  * @api
  * @since 100.0.2
  * @deprecated
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index c45a5b9524599..8fdf1d395308e 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -136,6 +136,8 @@ public function isHidden()
     }
 
     /**
+     * Get group code
+     *
      * @return string
      */
     public function getGroupCode()
@@ -154,6 +156,8 @@ public function getContentTabId()
     }
 
     /**
+     * Is downloadable
+     *
      * @return bool
      */
     public function isDownloadable()
@@ -162,7 +166,7 @@ public function isDownloadable()
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 58567a1ce292b..47c66c98fc8fb 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -437,6 +437,8 @@ public function getConfig()
     }
 
     /**
+     * Is single store mode
+     *
      * @return bool
      */
     public function isSingleStoreMode()
@@ -445,8 +447,11 @@ public function isSingleStoreMode()
     }
 
     /**
+     * Get base currency code
+     *
      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId $storeId
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getBaseCurrencyCode($storeId)
     {
@@ -454,8 +459,11 @@ public function getBaseCurrencyCode($storeId)
     }
 
     /**
+     * Get base currency symbol
+     *
      * @param null|string|bool|int|\Magento\Store\Model\Store $storeId $storeId
      * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getBaseCurrencySymbol($storeId)
     {

From 12deeebc95e467bcc628bb39d2d8ec753ec20b85 Mon Sep 17 00:00:00 2001
From: Govind Sharma <govindpokhrelsharma@cedcoss.com>
Date: Sat, 26 Jan 2019 21:09:19 +0530
Subject: [PATCH 848/932] Fixed Issue #20631

---
 .../Magento/Ui/view/base/web/js/form/element/post-code.js  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
index 911574a0fb438..5bfba724dfbe8 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
@@ -26,14 +26,17 @@ define([
         update: function (value) {
             var country = registry.get(this.parentName + '.' + 'country_id'),
                 options = country.indexedOptions,
-                option;
+                option = null;
 
             if (!value) {
                 return;
             }
 
             option = options[value];
-
+            if (!option) {
+                return;
+            }
+            
             if (option['is_zipcode_optional']) {
                 this.error(false);
                 this.validation = _.omit(this.validation, 'required-entry');

From d6dad52746402ad2fbe9713865a0709cafcaec3b Mon Sep 17 00:00:00 2001
From: Dominic <d.fernando@ism-apac.com>
Date: Sun, 27 Jan 2019 22:36:06 +0530
Subject: [PATCH 849/932] reove hardcoded value

---
 .../Model/ConfigurableProductTypeResolver.php                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
index aae39800cdd30..e4e1c6aab6922 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
@@ -8,6 +8,7 @@
 namespace Magento\ConfigurableProductGraphQl\Model;
 
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as Type;
 
 /**
  * {@inheritdoc}
@@ -19,7 +20,7 @@ class ConfigurableProductTypeResolver implements TypeResolverInterface
      */
     public function resolveType(array $data) : string
     {
-        if (isset($data['type_id']) && $data['type_id'] == 'configurable') {
+        if (isset($data['type_id']) && $data['type_id'] == Type::TYPE_CODE) {
             return 'ConfigurableProduct';
         }
         return '';

From de1425d5850d93ce391e7c61a64dbf0cab0fbad2 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Sat, 26 Jan 2019 20:55:37 +0000
Subject: [PATCH 850/932] Fixed static tests

---
 .../CatalogInventory/Model/ResourceModel/Stock/Item.php  | 9 ++++++---
 .../Model/Indexer/CustomerGroupDimensionProvider.php     | 5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
index 2ba2bc26d53b0..edccad60231ec 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
@@ -264,8 +264,9 @@ public function updateLowStockDate(int $websiteId)
     }
 
     /**
-     * @param string $tableAlias
+     * Get Manage Stock Expression
      *
+     * @param string $tableAlias
      * @return \Zend_Db_Expr
      */
     public function getManageStockExpr(string $tableAlias = ''): \Zend_Db_Expr
@@ -283,8 +284,9 @@ public function getManageStockExpr(string $tableAlias = ''): \Zend_Db_Expr
     }
 
     /**
-     * @param string $tableAlias
+     * Get Backorders Expression
      *
+     * @param string $tableAlias
      * @return \Zend_Db_Expr
      */
     public function getBackordersExpr(string $tableAlias = ''): \Zend_Db_Expr
@@ -302,8 +304,9 @@ public function getBackordersExpr(string $tableAlias = ''): \Zend_Db_Expr
     }
 
     /**
-     * @param string $tableAlias
+     * Get Minimum Sale Quantity Expression
      *
+     * @param string $tableAlias
      * @return \Zend_Db_Expr
      */
     public function getMinSaleQtyExpr(string $tableAlias = ''): \Zend_Db_Expr
diff --git a/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php b/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
index 0230832342b21..336e7ab770b02 100644
--- a/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
+++ b/app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php
@@ -11,6 +11,9 @@
 use Magento\Framework\Indexer\DimensionFactory;
 use Magento\Framework\Indexer\DimensionProviderInterface;
 
+/**
+ * Class CustomerGroupDimensionProvider
+ */
 class CustomerGroupDimensionProvider implements DimensionProviderInterface
 {
     /**
@@ -55,6 +58,8 @@ public function getIterator(): \Traversable
     }
 
     /**
+     * Get Customer Groups
+     *
      * @return array
      */
     private function getCustomerGroups(): array

From 48a63ed446ea8e2761947ed46305cdeac6406929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Hochd=C3=B6rfer?= <S.Hochdoerfer@bitExpert.de>
Date: Sun, 27 Jan 2019 22:57:57 +0100
Subject: [PATCH 851/932] Fix typehint

---
 app/code/Magento/Quote/Model/Quote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index ecda0dd2c0d74..17d3b9205625f 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -1399,7 +1399,7 @@ public function getAllItems()
     {
         $items = [];
         foreach ($this->getItemsCollection() as $item) {
-            /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $item */
+            /** @var \Magento\Quote\Model\Quote\Item $item */
             if (!$item->isDeleted()) {
                 $items[] = $item;
             }

From e78576e382e6429296ae11835ef96472e284feaf Mon Sep 17 00:00:00 2001
From: "Leandro F. L" <lfluvisotto@gmail.com>
Date: Sun, 27 Jan 2019 21:46:01 -0200
Subject: [PATCH 852/932] It is recommended to use the &&, || operators,
 instead of and, or to prevent confusion.

---
 .../Adminhtml/Product/Attribute/Validate.php         |  2 +-
 .../Controller/Transparent/RequestSecureToken.php    |  2 +-
 .../Security/Model/SecurityChecker/Quantity.php      |  2 +-
 app/code/Magento/SendFriend/Model/SendFriend.php     | 12 ++++++------
 app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php |  2 +-
 .../testsuite/Magento/Test/Integrity/ClassesTest.php |  2 +-
 lib/internal/Magento/Framework/Filter/Template.php   |  2 +-
 lib/internal/Magento/Framework/Message/Manager.php   |  2 +-
 .../Setup/Model/ConfigOptionsList/Session.php        |  2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
index 381ca5d08d82a..50f58efae7127 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -163,7 +163,7 @@ private function isUniqueAdminValues(array $optionsValues, array $deletedOptions
     {
         $adminValues = [];
         foreach ($optionsValues as $optionKey => $values) {
-            if (!(isset($deletedOptions[$optionKey]) and $deletedOptions[$optionKey] === '1')) {
+            if (!(isset($deletedOptions[$optionKey]) && $deletedOptions[$optionKey] === '1')) {
                 $adminValues[] = reset($values);
             }
         }
diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
index 85907c9d371ab..b63799612a24d 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -83,7 +83,7 @@ public function execute()
         /** @var Quote $quote */
         $quote = $this->sessionManager->getQuote();
 
-        if (!$quote or !$quote instanceof Quote) {
+        if (!$quote || !$quote instanceof Quote) {
             return $this->getErrorResponse();
         }
 
diff --git a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
index 9d86b55158be5..44538a7d8e21e 100644
--- a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
+++ b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
@@ -54,7 +54,7 @@ public function check($securityEventType, $accountReference = null, $longIp = nu
     {
         $isEnabled = $this->securityConfig->getPasswordResetProtectionType() != ResetMethod::OPTION_NONE;
         $allowedAttemptsNumber = $this->securityConfig->getMaxNumberPasswordResetRequests();
-        if ($isEnabled and $allowedAttemptsNumber) {
+        if ($isEnabled && $allowedAttemptsNumber) {
             $collection = $this->prepareCollection($securityEventType, $accountReference, $longIp);
             if ($collection->count() >= $allowedAttemptsNumber) {
                 throw new SecurityViolationException(
diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index c69d6342b4892..79bac0e680952 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -236,7 +236,7 @@ public function validate()
         }
 
         $email = $this->getSender()->getEmail();
-        if (empty($email) or !\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
+        if (empty($email) || !\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
             $errors[] = __('Invalid Sender Email');
         }
 
@@ -281,13 +281,13 @@ public function setRecipients($recipients)
         // validate array
         if (!is_array(
             $recipients
-        ) or !isset(
+        ) || !isset(
             $recipients['email']
-        ) or !isset(
+        ) || !isset(
             $recipients['name']
-        ) or !is_array(
+        ) || !is_array(
             $recipients['email']
-        ) or !is_array(
+        ) || !is_array(
             $recipients['name']
         )
         ) {
@@ -487,7 +487,7 @@ protected function _sentCountByCookies($increment = false)
             $oldTimes = explode(',', $oldTimes);
             foreach ($oldTimes as $oldTime) {
                 $periodTime = $time - $this->_sendfriendData->getPeriod();
-                if (is_numeric($oldTime) and $oldTime >= $periodTime) {
+                if (is_numeric($oldTime) && $oldTime >= $periodTime) {
                     $newTimes[] = $oldTime;
                 }
             }
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index 4aea7ab4c5a7c..cee4522903689 100755
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -265,7 +265,7 @@ protected function processExtraTaxables(Address\Total $total, array $itemsByType
     {
         $extraTaxableDetails = [];
         foreach ($itemsByType as $itemType => $itemTaxDetails) {
-            if ($itemType != self::ITEM_TYPE_PRODUCT and $itemType != self::ITEM_TYPE_SHIPPING) {
+            if ($itemType != self::ITEM_TYPE_PRODUCT && $itemType != self::ITEM_TYPE_SHIPPING) {
                 foreach ($itemTaxDetails as $itemCode => $itemTaxDetail) {
                     /** @var \Magento\Tax\Api\Data\TaxDetailsInterface $taxDetails */
                     $taxDetails = $itemTaxDetail[self::KEY_ITEM];
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
index 6d627574a3a18..b5a4e41b63279 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
@@ -194,7 +194,7 @@ private function assertClassesExist(array $classes, string $path): void
         foreach ($classes as $class) {
             $class = trim($class, '\\');
             try {
-                if (strrchr($class, '\\') === false and !Classes::isVirtual($class)) {
+                if (strrchr($class, '\\') === false && !Classes::isVirtual($class)) {
                     $badUsages[] = $class;
                     continue;
                 } else {
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 3e5f9bcf0bd27..a56a4a3edf1fe 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -293,7 +293,7 @@ public function templateDirective($construction)
     {
         // Processing of {template config_path=... [...]} statement
         $templateParameters = $this->getParameters($construction[2]);
-        if (!isset($templateParameters['config_path']) or !$this->getTemplateProcessor()) {
+        if (!isset($templateParameters['config_path']) || !$this->getTemplateProcessor()) {
             // Not specified template or not set include processor
             $replacedValue = '{Error in template processing}';
         } else {
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index c3b5701057d73..484d410181f48 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -226,7 +226,7 @@ public function addUniqueMessages(array $messages, $group = null)
         $items = $this->getMessages(false, $group)->getItems();
 
         foreach ($messages as $message) {
-            if ($message instanceof MessageInterface and !in_array($message, $items, false)) {
+            if ($message instanceof MessageInterface && !in_array($message, $items, false)) {
                 $this->addMessage($message, $group);
             }
         }
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
index c0ec78f046e23..96edca6130cdc 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
@@ -340,7 +340,7 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
 
         if (isset($options[self::INPUT_KEY_SESSION_REDIS_LOG_LEVEL])) {
             $level = $options[self::INPUT_KEY_SESSION_REDIS_LOG_LEVEL];
-            if (($level < 0) or ($level > 7)) {
+            if (($level < 0) || ($level > 7)) {
                 $errors[] = "Invalid Redis log level '{$level}'. Valid range is 0-7, inclusive.";
             }
         }

From 0e32d5a33ab4707bb3932b71e7b08d3de0f4dd7b Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Mon, 28 Jan 2019 11:38:59 +0300
Subject: [PATCH 853/932] MAGETWO-95817: Issue in Redeeming Gift Card

- Stabilize mftf test.
---
 .../Shipping/Test/Mftf/Data/FreeShippingMethodData.xml     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
index 512ef8389bb7b..d700aa622c177 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/FreeShippingMethodData.xml
@@ -13,6 +13,13 @@
     <entity name="freeActiveEnable" type="active">
         <data key="value">1</data>
     </entity>
+    <!-- Disable Free Shipping method -->
+    <entity name="FreeShippingMethodDisableConfig" type="free_shipping_method">
+        <requiredEntity type="active">freeActiveDisable</requiredEntity>
+    </entity>
+    <entity name="freeActiveDisable" type="active">
+        <data key="value">0</data>
+    </entity>
     <!-- Free Shipping method default setup -->
     <entity name="FreeShippinMethodDefault" type="free_shipping_method">
         <requiredEntity type="active">freeActiveDefault</requiredEntity>

From 3b635263c112019bf631b866b916d383f61fa98c Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 28 Jan 2019 11:34:13 +0200
Subject: [PATCH 854/932] Fix static tests.

---
 .../web/css/source/module/checkout/_tooltip.less | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
index e42d8eb7a8dd7..39b9a051e6592 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less
@@ -151,26 +151,28 @@
 //
 //  Tablet
 //  _____________________________________________
+
 @media only screen and (max-width: @screen__m) {
     .field-tooltip .field-tooltip-content {
+        left: auto;
         right: -10px;
         top: 40px;
-        left: auto;
     }
-    .field-tooltip .field-tooltip-content::before, .field-tooltip .field-tooltip-content::after {
+    .field-tooltip .field-tooltip-content::before,
+    .field-tooltip .field-tooltip-content::after {
         border: 10px solid transparent;
         height: 0;
-        width: 0;
+        left: auto;
         margin-top: -21px;
         right: 10px;
-        left: auto;
         top: 0;
+        width: 0;
     }
     .field-tooltip .field-tooltip-content::before {
-        border-bottom-color: #666;
+        border-bottom-color: @color-gray40;
     }
     .field-tooltip .field-tooltip-content::after {
-        border-bottom-color: #f4f4f4;
+        border-bottom-color: @color-gray-light01;
         top: 1px;
     }
-}
\ No newline at end of file
+}

From ac39ca2e54fad653d1aef3f7f2a96affcbde5c78 Mon Sep 17 00:00:00 2001
From: amol 2jcommerce <amol@2jcommerce.in>
Date: Mon, 28 Jan 2019 17:09:16 +0530
Subject: [PATCH 855/932] My-account-page-title-extra-space-on-mobile

---
 .../Magento/blank/Magento_Customer/web/css/source/_module.less  | 2 +-
 .../Magento/luma/Magento_Customer/web/css/source/_module.less   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index 3ffaeb82cdc2a..a22e5baeb57fc 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -368,7 +368,7 @@
 
     .account {
         .page.messages {
-            margin-bottom: @indent__xl;
+            margin-bottom: 0;
         }
 
         .toolbar {
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index d7ae6c3b28f4a..fe423a236c80e 100755
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -551,7 +551,7 @@
 
     .account {
         .page.messages {
-            margin-bottom: @indent__xl;
+            margin-bottom: 0;
         }
 
         .column.main {

From 19291aa3dfb6a33d6d44f81466841b34156e8ebd Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 28 Jan 2019 13:42:55 +0200
Subject: [PATCH 856/932] ENGCOM-3785: Unit and static tests fix.

---
 .../Catalog/Block/Adminhtml/Product/Edit/Tabs.php   | 13 ++++++++++---
 .../Magento/Catalog/Test/Unit/Model/ProductTest.php | 10 +---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
index 136484b4ceccc..37ad3f4bea20e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
@@ -109,7 +109,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -119,6 +119,8 @@ protected function _construct()
     }
 
     /**
+     * Get group collection.
+     *
      * @param int $attributeSetId
      * @return \Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection
      */
@@ -131,10 +133,11 @@ public function getGroupCollection($attributeSetId)
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     protected function _prepareLayout()
     {
@@ -315,6 +318,8 @@ public function getAttributeTabBlock()
     }
 
     /**
+     * Set attribute tab block.
+     *
      * @param string $attributeTabBlock
      * @return $this
      */
@@ -337,6 +342,8 @@ protected function _translateHtml($html)
     }
 
     /**
+     * Get accordion.
+     *
      * @param string $parentTab
      * @return string
      */
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index f7c2c25d743c4..22ba6bfa9f7fd 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -8,11 +8,11 @@
 
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
 
 /**
  * Product Test
@@ -567,14 +567,6 @@ public function testGetCategoryId()
         $this->assertEquals(10, $this->model->getCategoryId());
     }
 
-    public function testGetCategoryIdWhenProductNotInCurrentCategory()
-    {
-        $this->model->setData('category_ids', [12]);
-        $this->category->expects($this->once())->method('getId')->will($this->returnValue(10));
-        $this->registry->expects($this->any())->method('registry')->will($this->returnValue($this->category));
-        $this->assertFalse($this->model->getCategoryId());
-    }
-
     public function testGetIdBySku()
     {
         $this->resource->expects($this->once())->method('getIdBySku')->will($this->returnValue(5));

From fe35a75689b5950540f2731b6b0f19ce33e21fe9 Mon Sep 17 00:00:00 2001
From: amol 2jcommerce <amol@2jcommerce.in>
Date: Mon, 28 Jan 2019 19:05:37 +0530
Subject: [PATCH 857/932] My-account-page-title-extra-space-on-mobile

---
 .../Magento/blank/Magento_Customer/web/css/source/_module.less  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index a22e5baeb57fc..d914f691604cd 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -367,7 +367,7 @@
     }
 
     .account {
-        .page.messages {
+        .messages {
             margin-bottom: 0;
         }
 

From b208e444bf108f8d5dfd800d952376ad2e4d4c13 Mon Sep 17 00:00:00 2001
From: amol 2jcommerce <amol@2jcommerce.in>
Date: Mon, 28 Jan 2019 19:20:51 +0530
Subject: [PATCH 858/932] My-account-page-title-extra-space-on-mobile

---
 .../Magento/luma/Magento_Customer/web/css/source/_module.less   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index c22fd6509248d..92ff50064f3ab 100755
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -554,7 +554,7 @@
     }
 
     .account {
-        .page.messages {
+        .messages {
             margin-bottom: 0;
         }
 

From 6c2d7d973468322af2094eb5aeec7072c7f16cd9 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Mon, 28 Jan 2019 16:50:22 +0200
Subject: [PATCH 859/932] ENGCOM-3980: Static test fix.

---
 .../Paypal/Controller/Transparent/RequestSecureToken.php    | 2 ++
 .../Magento/Security/Model/SecurityChecker/Quantity.php     | 2 +-
 app/code/Magento/SendFriend/Model/SendFriend.php            | 3 +++
 app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php        | 1 +
 lib/internal/Magento/Framework/Message/Manager.php          | 2 ++
 setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php | 6 +++---
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
index b63799612a24d..847388eb755a1 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -107,6 +107,8 @@ public function execute()
     }
 
     /**
+     * Get error response.
+     *
      * @return Json
      */
     private function getErrorResponse()
diff --git a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
index 44538a7d8e21e..5d72ba261f316 100644
--- a/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
+++ b/app/code/Magento/Security/Model/SecurityChecker/Quantity.php
@@ -48,7 +48,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function check($securityEventType, $accountReference = null, $longIp = null)
     {
diff --git a/app/code/Magento/SendFriend/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index 79bac0e680952..38525a9f83a12 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -16,6 +16,7 @@
  * @method \Magento\SendFriend\Model\SendFriend setTime(int $value)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
@@ -162,6 +163,8 @@ protected function _construct()
     }
 
     /**
+     * Send email.
+     *
      * @return $this
      * @throws CoreException
      */
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index cee4522903689..52061fd5d3882 100755
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -408,6 +408,7 @@ protected function enhanceTotalData(
 
     /**
      * Process model configuration array.
+     *
      * This method can be used for changing totals collect sort order
      *
      * @param   array $config
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index 484d410181f48..4ef1754b7e586 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -11,6 +11,8 @@
 
 /**
  * Message manager model
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Manager implements ManagerInterface
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
index 96edca6130cdc..e864a81ffcc0e 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
@@ -139,7 +139,7 @@ class Session implements ConfigOptionsListInterface
     ];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getOptions()
@@ -289,7 +289,7 @@ public function getOptions()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -320,7 +320,7 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate(array $options, DeploymentConfig $deploymentConfig)
     {

From 5cc0b081e9bfdda4b692c78e8a5e542ab5590111 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Mon, 28 Jan 2019 10:11:06 -0600
Subject: [PATCH 860/932] MC-6051: Verify that pagination works when Flat
 Category is enabled

- Re-add this test back to the codebase and fixed it
---
 .../AdminCheckPaginationInStorefrontTest.xml  | 176 ++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
new file mode 100644
index 0000000000000..f40a62c164ecc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
@@ -0,0 +1,176 @@
+<?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="AdminCheckPaginationInStorefrontTest">
+        <annotations>
+            <stories value="Create flat catalog product"/>
+            <title value="Verify that pagination works when Flat Category is enabled"/>
+            <description value="Login as admin, create flat catalog product and check pagination"/>
+            <testCaseId value="MC-6051"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1 "/>
+            <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 1 "/>
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct1"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct2"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct3"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct4"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct5"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct6"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct7"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct8"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct9"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct10"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct11"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct12"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct13"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct14"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct15"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct16"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct17"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct18"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct19"/>
+            <createData entity="PaginationProduct" stepKey="simpleProduct20"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+        </before>
+        <after>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0" />
+            <magentoCLI stepKey="setFlatCatalogProduct" command="config:set catalog/frontend/flat_catalog_product 0" />
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
+            <deleteData createDataKey="simpleProduct4" stepKey="deleteSimpleProduct4"/>
+            <deleteData createDataKey="simpleProduct5" stepKey="deleteSimpleProduct5"/>
+            <deleteData createDataKey="simpleProduct6" stepKey="deleteSimpleProduct6"/>
+            <deleteData createDataKey="simpleProduct7" stepKey="deleteSimpleProduct7"/>
+            <deleteData createDataKey="simpleProduct8" stepKey="deleteSimpleProduct8"/>
+            <deleteData createDataKey="simpleProduct9" stepKey="deleteSimpleProduct9"/>
+            <deleteData createDataKey="simpleProduct10" stepKey="deleteSimpleProduct10"/>
+            <deleteData createDataKey="simpleProduct11" stepKey="deleteSimpleProduct11"/>
+            <deleteData createDataKey="simpleProduct12" stepKey="deleteSimpleProduct12"/>
+            <deleteData createDataKey="simpleProduct13" stepKey="deleteSimpleProduct13"/>
+            <deleteData createDataKey="simpleProduct14" stepKey="deleteSimpleProduct14"/>
+            <deleteData createDataKey="simpleProduct15" stepKey="deleteSimpleProduct15"/>
+            <deleteData createDataKey="simpleProduct16" stepKey="deleteSimpleProduct16"/>
+            <deleteData createDataKey="simpleProduct17" stepKey="deleteSimpleProduct17"/>
+            <deleteData createDataKey="simpleProduct18" stepKey="deleteSimpleProduct18"/>
+            <deleteData createDataKey="simpleProduct19" stepKey="deleteSimpleProduct19"/>
+            <deleteData createDataKey="simpleProduct20" stepKey="deleteSimpleProduct20"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Open Category Page and select created category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <waitForPageLoad stepKey="waitForPageToLoad0"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded2"/>
+
+        <!--Select Products-->
+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
+        <waitForPageLoad stepKey="waitForProductsToLoad"/>
+        <scrollTo selector="{{CatalogProductsSection.resetFilter}}" stepKey="scrollToResetFilter"/>
+        <waitForElementVisible selector="{{CatalogProductsSection.resetFilter}}" time="30" stepKey="waitForResetButtonToVisible"/>
+        <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
+        <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <selectOption selector="{{AdminProductGridFilterSection.productPerPage}}" userInput="20" stepKey="selectPagePerView"/>
+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="pagi"  stepKey="selectProduct1"/>
+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitFroPageToLoad1"/>
+        <see selector="{{AdminProductGridFilterSection.productCount}}" userInput="20" stepKey="seeNumberOfProductsFound"/>
+        <click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
+        <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
+
+        <!--Open Category Store Front Page-->
+        <amOnPage url="{{_defaultCategory.name}}.html" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+
+        <!--Select 9 items per page and verify number of products displayed in each page -->
+        <conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="9" stepKey="selectPerPageOption"/>
+
+        <!--Verify number of products displayed in First Page -->
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage"/>
+
+        <!--Verify number of products displayed in Second Page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage"/>
+
+        <!--Verify number of products displayed in third  Page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage"/>
+
+        <!--Change Pages using Previous Page selector and verify number of products displayed in each page-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad5"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage1"/>
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage1"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad6"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage1"/>
+
+        <!--Select Pages by using page Number and verify number of products displayed-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage2"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad7"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage2"/>
+
+        <!--Select Third Page using page number-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage3"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('3')}}" stepKey="clickOnThirdPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad8"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage2"/>
+
+        <!--Select First Page using page number-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage4"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad9"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsFirstPage2"/>
+
+        <!--Select 15 items per page and verify number of products displayed in each page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="15" stepKey="selectPerPageOption1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad10"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="15" stepKey="seeNumberOfProductsInFirstPage3"/>
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad11"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="5" stepKey="seeNumberOfProductsInSecondPage3"/>
+
+        <!--Select First Page using page number-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="scrollToPreviousPage5"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad13"/>
+
+        <!--Select 30 items per page  and verify number of products displayed in each page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="30" stepKey="selectPerPageOption2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad12"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="20" stepKey="seeNumberOfProductsInFirstPage4"/>
+    </test>
+</tests>

From 69ab58abce044c39a67b2fd26e5de47f27ab5c98 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Mon, 28 Jan 2019 11:28:10 -0600
Subject: [PATCH 861/932] MC-13630: Integrate smart button functionality on
 product detail page - CR fixes

---
 .../MultiSelect/DisabledFundingOptions.php    | 14 ++++---
 .../Magento/Paypal/Block/Bml/Shortcut.php     |  2 +-
 .../InContext/Minicart/SmartButton.php        | 12 +++---
 .../Block/Express/InContext/SmartButton.php   |  4 +-
 .../Controller/Express/GetTokenData.php       | 32 ++++++++--------
 .../Controller/Express/OnAuthorization.php    | 38 +++++++++----------
 app/code/Magento/Paypal/Model/Config.php      |  4 +-
 .../Paypal/Model/SmartButtonConfig.php        | 10 ++---
 .../Observer/AddPaypalShortcutsObserver.php   | 16 ++++----
 .../Patch/Data/UpdatePaypalCreditOption.php   | 12 ++----
 .../Test/Unit/Block/Bml/ShortcutTest.php      |  6 +--
 .../Unit/Model/ExpressConfigProviderTest.php  |  5 ++-
 .../AddPaypalShortcutsObserverTest.php        | 13 ++++---
 13 files changed, 80 insertions(+), 88 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
index 5959a64c5d666..2b47a3b000a45 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect;
 
@@ -10,21 +11,22 @@
 use Magento\Backend\Block\Template\Context;
 use Magento\Paypal\Model\Config;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Config\Block\System\Config\Form\Field;
 
 /**
  * Class DisabledFundingOptions
  */
-class DisabledFundingOptions extends \Magento\Config\Block\System\Config\Form\Field
+class DisabledFundingOptions extends Field
 {
     /**
-     * @var \Magento\Paypal\Model\Config
+     * @var Config
      */
     private $config;
 
     /**
      * DisabledFundingOptions constructor.
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Paypal\Model\Config $config
+     * @param Context $context
+     * @param Config $config
      * @param array $data
      */
     public function __construct(
@@ -39,7 +41,7 @@ public function __construct(
     /**
      * Render country field considering request parameter
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
     public function render(AbstractElement $element)
@@ -57,7 +59,7 @@ public function render(AbstractElement $element)
      * @param array $options
      * @return array
      */
-    private function filterValuesForPaypalCredit($options)
+    private function filterValuesForPaypalCredit($options): array
     {
         return array_filter($options, function ($opt) {
             return ($opt['value'] !== 'CREDIT');
diff --git a/app/code/Magento/Paypal/Block/Bml/Shortcut.php b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
index 28f2326e799c3..e76f1e922452e 100644
--- a/app/code/Magento/Paypal/Block/Bml/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
@@ -102,7 +102,7 @@ public function __construct(
         $bmlMethodCode,
         $shortcutTemplate,
         array $data = [],
-        \Magento\Paypal\Model\ConfigFactory $config = null
+        ConfigFactory $config = null
     ) {
         $this->_paymentData = $paymentData;
         $this->_mathRandom = $mathRandom;
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
index 90c19fe47e764..5ce80813dd0e2 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
@@ -25,7 +25,7 @@
  */
 class SmartButton extends Template implements ShortcutInterface
 {
-    const ALIAS_ELEMENT_INDEX = 'alias';
+    private const ALIAS_ELEMENT_INDEX = 'alias';
 
     /**
      * @var Config
@@ -101,7 +101,7 @@ public function __construct(
      *
      * @return bool
      */
-    private function isInContext() : bool
+    private function isInContext(): bool
     {
         return (bool)(int) $this->config->getValue('in_context');
     }
@@ -111,7 +111,7 @@ private function isInContext() : bool
      *
      * @return bool
      */
-    private function isVisibleOnCart() : bool
+    private function isVisibleOnCart(): bool
     {
         return (bool)(int) $this->config->getValue('visible_on_cart');
     }
@@ -121,7 +121,7 @@ private function isVisibleOnCart() : bool
      *
      * @return bool
      */
-    private function shouldRender() : bool
+    private function shouldRender(): bool
     {
         return $this->payment->isAvailable($this->session->getQuote())
             && $this->isInContext()
@@ -197,7 +197,7 @@ public function getJsInitParams(): string
      *
      * @return string
      */
-    public function getContainerId()
+    public function getContainerId(): string
     {
         return $this->getData('button_id');
     }
@@ -207,7 +207,7 @@ public function getContainerId()
      *
      * @return string
      */
-    private function getQuoteId()
+    private function getQuoteId(): string
     {
         $quoteId = (int)$this->session->getQuoteId();
         if (!$this->session->getQuote()->getCustomerId()) {
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
index 646af81f2a126..2331676a4fa23 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
@@ -21,7 +21,7 @@
  */
 class SmartButton extends Template implements ShortcutInterface
 {
-    const ALIAS_ELEMENT_INDEX = 'alias';
+    private const ALIAS_ELEMENT_INDEX = 'alias';
 
     /**
      * @var Config
@@ -73,7 +73,7 @@ public function __construct(
      *
      * @return bool
      */
-    protected function shouldRender() : bool
+    protected function shouldRender(): bool
     {
         $isInCatalog = $this->getIsInCatalogProduct();
         $isInContext = (bool)(int) $this->config->getValue('in_context');
diff --git a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
index 7d9d72e966759..512dac4cdec06 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetTokenData.php
@@ -59,33 +59,33 @@ class GetTokenData extends AbstractExpress implements HttpGetActionInterface
     private $logger;
 
     /**
-     * @var \Magento\Customer\Model\ResourceModel\CustomerRepository
+     * @var CustomerRepository
      */
     private $customerRepository;
 
     /**
-     * @var \Magento\Quote\Api\CartRepositoryInterface
+     * @var CartRepositoryInterface
      */
     private $cartRepository;
 
     /**
-     * @var \Magento\Quote\Api\GuestCartRepositoryInterface
+     * @var GuestCartRepositoryInterface
      */
     private $guestCartRepository;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Sales\Model\OrderFactory $orderFactory
-     * @param \Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory
-     * @param \Magento\Framework\Session\Generic $paypalSession
-     * @param \Magento\Framework\Url\Helper\Data $urlHelper
-     * @param \Magento\Customer\Model\Url $customerUrl
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Customer\Model\ResourceModel\CustomerRepository $customerRepository
-     * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
-     * @param \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
+     * @param Context $context
+     * @param CustomerSession $customerSession
+     * @param CheckoutSession $checkoutSession
+     * @param OrderFactory $orderFactory
+     * @param CheckoutFactory $checkoutFactory
+     * @param PayPalSession $paypalSession
+     * @param UrlHelper $urlHelper
+     * @param CustomerUrl $customerUrl
+     * @param LoggerInterface $logger
+     * @param CustomerRepository $customerRepository
+     * @param CartRepositoryInterface $cartRepository
+     * @param GuestCartRepositoryInterface $guestCartRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -122,7 +122,7 @@ public function __construct(
     /**
      * Get token data
      *
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @return ResultInterface
      */
     public function execute(): ResultInterface
     {
diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
index 8e613308eb13b..62f4c4c4c457a 100644
--- a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
+++ b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -9,6 +9,7 @@
 
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultInterface;
 use Magento\Paypal\Model\Config as PayPalConfig;
 use Magento\Paypal\Model\Express\Checkout as PayPalCheckout;
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
@@ -20,7 +21,6 @@
 use Magento\Framework\Session\Generic as PayPalSession;
 use Magento\Framework\Url\Helper\Data as UrlHelper;
 use Magento\Customer\Model\Url as CustomerUrl;
-use Magento\Checkout\Api\AgreementsValidatorInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Quote\Api\GuestCartRepositoryInterface;
@@ -47,35 +47,34 @@ class OnAuthorization extends AbstractExpress implements HttpPostActionInterface
     protected $_checkoutType = PayPalCheckout::class;
 
     /**
-     * @var \Magento\Quote\Api\CartRepositoryInterface
+     * @var CartRepositoryInterface
      */
-    protected $cartRepository;
+    private $cartRepository;
 
     /**
      * Url Builder
      *
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     private $urlBuilder;
 
     /**
-     * @var \Magento\Quote\Api\GuestCartRepositoryInterface
+     * @var GuestCartRepositoryInterface
      */
     private $guestCartRepository;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Sales\Model\OrderFactory $orderFactory
-     * @param \Magento\Paypal\Model\Express\Checkout\Factory $checkoutFactory
-     * @param \Magento\Framework\Session\Generic $paypalSession
-     * @param \Magento\Framework\Url\Helper\Data $urlHelper
-     * @param \Magento\Customer\Model\Url $customerUrl
-     * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
-     * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
-     * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
+     * @param Context $context
+     * @param CustomerSession $customerSession
+     * @param CheckoutSession $checkoutSession
+     * @param OrderFactory $orderFactory
+     * @param CheckoutFactory $checkoutFactory
+     * @param PayPalSession $paypalSession
+     * @param UrlHelper $urlHelper
+     * @param CustomerUrl $customerUrl
+     * @param CartRepositoryInterface $cartRepository
+     * @param UrlInterface $urlBuilder
+     * @param GuestCartRepositoryInterface $guestCartRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -87,7 +86,6 @@ public function __construct(
         PayPalSession $paypalSession,
         UrlHelper $urlHelper,
         CustomerUrl $customerUrl,
-        AgreementsValidatorInterface $agreementValidator,
         CartRepositoryInterface $cartRepository,
         UrlInterface $urlBuilder,
         GuestCartRepositoryInterface $guestCartRepository
@@ -110,9 +108,9 @@ public function __construct(
     /**
      * Place order or redirect on Paypal review page
      *
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @return ResultInterface
      */
-    public function execute()
+    public function execute(): ResultInterface
     {
         $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         $quoteId = $this->getRequest()->getParam('quoteId');
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index baddbd24f5f84..9891f68bf8741 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1649,7 +1649,7 @@ protected function _mapGenericStyleFieldset($fieldName)
             case 'disable_funding_options':
                 return "paypal/style/{$fieldName}";
             default:
-                return $this->_mapButtonStyles($fieldName);
+                return $this->mapButtonStyles($fieldName);
         }
     }
 
@@ -1706,7 +1706,7 @@ protected function _mapMethodFieldset($fieldName)
      * @return null|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function _mapButtonStyles(string $fieldName)
+    private function mapButtonStyles(string $fieldName)
     {
         $page = substr($fieldName, 0, (int)strpos($fieldName, '_page_button_'));
 
diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 5d0efb42d480f..9a98f452bff79 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -68,7 +68,7 @@ public function getConfig(string $page): array
      *
      * @return array
      */
-    private function getDisallowedFunding() : array
+    private function getDisallowedFunding(): array
     {
         $disallowedFunding = $this->config->getValue('disable_funding_options');
         return $disallowedFunding ? explode(',', $disallowedFunding) : [];
@@ -79,7 +79,7 @@ private function getDisallowedFunding() : array
      *
      * @return array
      */
-    private function getAllowedFunding() : array
+    private function getAllowedFunding(): array
     {
         return [];
     }
@@ -90,7 +90,7 @@ private function getAllowedFunding() : array
      * @param string $page
      * @return array
      */
-    private function getButtonStyles(string $page) : array
+    private function getButtonStyles(string $page): array
     {
         $styles = $this->defaultStyles[$page];
         if ((boolean)$this->config->getValue("{$page}_page_button_customize")) {
@@ -112,7 +112,7 @@ private function getButtonStyles(string $page) : array
      * @param string $page
      * @return array
      */
-    private function updateStyles(array $styles, string $page) : array
+    private function updateStyles(array $styles, string $page): array
     {
         $locale = $this->localeResolver->getLocale();
 
@@ -133,7 +133,7 @@ private function updateStyles(array $styles, string $page) : array
         if ($styles['label'] === 'installment') {
             if (array_key_exists($locale, $installmentPeriodLocale)) {
                 $styles['installmentperiod'] = (int)$this->config->getValue(
-                    "{$page}_page_button_{$installmentPeriodLocale[$locale]}_installment_period"
+                    $page .'_page_button_' . $installmentPeriodLocale[$locale] . '_installment_period'
                 );
             } else {
                 $styles['label'] = 'paypal';
diff --git a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
index 97ddc38fce00d..861ca74060680 100644
--- a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
+++ b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
@@ -9,6 +9,8 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Paypal\Model\Config as PaypalConfig;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton as MinicartSmartButton;
+use Magento\Paypal\Block\Express\InContext\SmartButton as SmartButton;
 
 /**
  * PayPal module observer
@@ -50,9 +52,9 @@ public function execute(EventObserver $observer)
         /** @var \Magento\Catalog\Block\ShortcutButtons $shortcutButtons */
         $shortcutButtons = $observer->getEvent()->getContainer();
         $blocks = [
-            \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton::class =>
+            MinicartSmartButton::class =>
                 PaypalConfig::METHOD_WPS_EXPRESS,
-            \Magento\Paypal\Block\Express\InContext\SmartButton::class => PaypalConfig::METHOD_WPS_EXPRESS,
+            SmartButton::class => PaypalConfig::METHOD_WPS_EXPRESS,
             \Magento\Paypal\Block\Express\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
             \Magento\Paypal\Block\Bml\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
             \Magento\Paypal\Block\WpsExpress\Shortcut::class => PaypalConfig::METHOD_WPS_EXPRESS,
@@ -78,13 +80,9 @@ public function execute(EventObserver $observer)
                 '',
                 $params
             );
-            $shortcut->setIsInCatalogProduct(
-                $observer->getEvent()->getIsCatalogProduct()
-            )->setShowOrPosition(
-                $observer->getEvent()->getOrPosition()
-            )->setIsShoppingCart(
-                (bool) $observer->getEvent()->getIsShoppingCart()
-            );
+            $shortcut->setIsInCatalogProduct($observer->getEvent()->getIsCatalogProduct())
+                ->setShowOrPosition($observer->getEvent()->getOrPosition())
+                ->setIsShoppingCart((bool) $observer->getEvent()->getIsShoppingCart());
             $shortcutButtons->addShortcut($shortcut);
         }
     }
diff --git a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
index c19714c8faf50..6c4362d83e29f 100644
--- a/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
+++ b/app/code/Magento/Paypal/Setup/Patch/Data/UpdatePaypalCreditOption.php
@@ -39,13 +39,8 @@ public function apply()
         $this->moduleDataSetup->getConnection()->startSetup();
         $connection = $this->moduleDataSetup->getConnection();
         $select = $connection->select()
-            ->from(
-                $this->moduleDataSetup->getTable('core_config_data'),
-                ['scope', 'scope_id', 'value']
-            )->where(
-                'path = ?',
-                'payment/paypal_express_bml/active'
-            );
+            ->from($this->moduleDataSetup->getTable('core_config_data'), ['scope', 'scope_id', 'value'])
+            ->where('path = ?', 'payment/paypal_express_bml/active');
         foreach ($connection->fetchAll($select) as $pair) {
             if (!$pair['value']) {
                 $this->moduleDataSetup->getConnection()
@@ -60,8 +55,7 @@ public function apply()
                     );
             }
         }
-        $this->moduleDataSetup->getConnection()
-            ->endSetup();
+        $this->moduleDataSetup->getConnection()->endSetup();
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
index f8d72f8552372..261af45ff9287 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
@@ -33,14 +33,12 @@ protected function setUp()
         $this->paypalShortcutHelperMock = $this->createMock(\Magento\Paypal\Helper\Shortcut\ValidatorInterface::class);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $configFactoryMock =
-            $this->getMockBuilder(\Magento\Paypal\Model\ConfigFactory::class)
+        $configFactoryMock = $this->getMockBuilder(\Magento\Paypal\Model\ConfigFactory::class)
                 ->disableOriginalConstructor()
                 ->setMethods(['create'])
                 ->getMock();
 
-        $configMock =
-            $this->getMockBuilder(\Magento\Paypal\Model\Config::class)
+        $configMock = $this->getMockBuilder(\Magento\Paypal\Model\Config::class)
                 ->disableOriginalConstructor()
                 ->setMethods(['setMethod'])
                 ->getMock();
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
index 825adf81e2648..e9e4c7373f13f 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Paypal\Test\Unit\Model;
 
 use Magento\Paypal\Model\ExpressConfigProvider;
+use Magento\Paypal\Model\SmartButtonConfig;
 
 class ExpressConfigProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -40,10 +41,10 @@ public function testGetConfig()
         $payment->expects($this->atLeastOnce())->method('getCheckoutRedirectUrl')->willReturn('http://redirect.url');
         $paymentHelper->expects($this->atLeastOnce())->method('getMethodInstance')->willReturn($payment);
 
-        /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject $urlBuilderMock */
+        /** @var \Magento\Framework\UrlInterface|\PHPUnit\Framework\MockObject\MockObject $urlBuilderMock */
         $urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
 
-        $smartButtonConfigMock = $this->createMock(\Magento\Paypal\Model\SmartButtonConfig::class);
+        $smartButtonConfigMock = $this->createMock(SmartButtonConfig::class);
 
         $configProvider = new ExpressConfigProvider(
             $configFactory,
diff --git a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
index 491484a6c3e8b..542b327475de1 100644
--- a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
@@ -10,7 +10,8 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\View\Layout;
-use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton as Button;
+use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton as MinicartButton;
+use Magento\Paypal\Block\Express\InContext\SmartButton as Button;
 use Magento\Paypal\Helper\Shortcut\Factory;
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Observer\AddPaypalShortcutsObserver;
@@ -118,7 +119,7 @@ public function testAddShortcutsButtons(array $blocks)
                 ++$callIndexSession;
             }
 
-            $blockMock = $this->getMockBuilder(Button::class)
+            $blockMock = $this->getMockBuilder(MinicartButton::class)
                 ->setMethods(['setIsInCatalogProduct', 'setShowOrPosition'])
                 ->disableOriginalConstructor()
                 ->getMockForAbstractClass();
@@ -158,12 +159,12 @@ public function dataProviderShortcutsButtons()
         return [
             [
                 'blocks1' => [
-                    \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton::class => [
+                    MinicartButton::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
                         self::PAYMENT_AVAILABLE => true,
                         self::PAYMENT_IS_BML => false,
                     ],
-                    \Magento\Paypal\Block\Express\InContext\SmartButton::class => [
+                    Button::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
                         self::PAYMENT_AVAILABLE => true,
                         self::PAYMENT_IS_BML => false,
@@ -202,12 +203,12 @@ public function dataProviderShortcutsButtons()
             ],
             [
                 'blocks2' => [
-                    \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton::class => [
+                    MinicartButton::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
                         self::PAYMENT_AVAILABLE => false,
                         self::PAYMENT_IS_BML => false,
                     ],
-                    \Magento\Paypal\Block\Express\InContext\SmartButton::class => [
+                    Button::class => [
                         self::PAYMENT_CODE => Config::METHOD_WPS_EXPRESS,
                         self::PAYMENT_AVAILABLE => true,
                         self::PAYMENT_IS_BML => false,

From 823e68473822fdd3125922a5a2d0a5e1bf0cd019 Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Mon, 28 Jan 2019 13:12:04 -0600
Subject: [PATCH 862/932] MC-5717 - Sub-category doesnt display after moving
 categories

---
 app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index 11c0a73a73708..77518fd9bf5cc 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -147,6 +147,7 @@ public function execute()
                 $parentCategory = $this->getParentCategory($parentId, $storeId);
                 $category->setPath($parentCategory->getPath());
                 $category->setParentId($parentCategory->getId());
+                $category->setLevel(null);
             }
 
             /**

From bf95654befd3b02797e6ae544990253e971f362f Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Mon, 28 Jan 2019 13:51:02 -0600
Subject: [PATCH 863/932] MC-13733: When Layout is Set to "Horizontal" PayPal
 Smart Credit button is not displayed.

---
 .../Magento/Paypal/Model/SmartButtonConfig.php  | 17 +++++++++++++----
 app/code/Magento/Paypal/etc/frontend/di.xml     | 17 +++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 9a98f452bff79..7d0bed656ae80 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -29,20 +29,28 @@ class SmartButtonConfig
      */
     private $defaultStyles;
 
+    /**
+     * @var array
+     */
+    private $allowedFunding;
+
     /**
      * @param ResolverInterface $localeResolver
      * @param ConfigFactory $configFactory
      * @param array $defaultStyles
+     * @param array $allowedFunding
      */
     public function __construct(
         ResolverInterface $localeResolver,
         ConfigFactory $configFactory,
-        $defaultStyles = []
+        $defaultStyles = [],
+        $allowedFunding = []
     ) {
         $this->localeResolver = $localeResolver;
         $this->config = $configFactory->create();
         $this->config->setMethod(Config::METHOD_EXPRESS);
         $this->defaultStyles = $defaultStyles;
+        $this->allowedFunding = $allowedFunding;
     }
 
     /**
@@ -57,7 +65,7 @@ public function getConfig(string $page): array
             'merchantId' => $this->config->getValue('merchant_id'),
             'environment' => ((int)$this->config->getValue('sandbox_flag') ? 'sandbox' : 'production'),
             'locale' => $this->localeResolver->getLocale(),
-            'allowedFunding' => $this->getAllowedFunding(),
+            'allowedFunding' => $this->getAllowedFunding($page),
             'disallowedFunding' => $this->getDisallowedFunding(),
             'styles' => $this->getButtonStyles($page)
         ];
@@ -77,11 +85,12 @@ private function getDisallowedFunding(): array
     /**
      * Returns allowed funding
      *
+     * @param string $page
      * @return array
      */
-    private function getAllowedFunding(): array
+    private function getAllowedFunding($page): array
     {
-        return [];
+        return array_values(array_diff($this->allowedFunding[$page], $this->getDisallowedFunding()));
     }
 
     /**
diff --git a/app/code/Magento/Paypal/etc/frontend/di.xml b/app/code/Magento/Paypal/etc/frontend/di.xml
index 8c76acdb9d24f..8c29ae1e2685f 100644
--- a/app/code/Magento/Paypal/etc/frontend/di.xml
+++ b/app/code/Magento/Paypal/etc/frontend/di.xml
@@ -157,6 +157,23 @@
                     <item name="label" xsi:type="string">buynow</item>
                 </item>
             </argument>
+            <argument name="allowedFunding" xsi:type="array">
+                <item name="checkout" xsi:type="array">
+                    <item name="0" xsi:type="string">CREDIT</item>
+                    <item name="1" xsi:type="string">ELV</item>
+                </item>
+                <item name="cart" xsi:type="array">
+                    <item name="0" xsi:type="string">CREDIT</item>
+                    <item name="1" xsi:type="string">ELV</item>
+                </item>
+                <item name="mini_cart" xsi:type="array">
+                    <item name="0" xsi:type="string">CREDIT</item>
+                    <item name="1" xsi:type="string">ELV</item>
+                </item>
+                <item name="product" xsi:type="array">
+                    <item name="0" xsi:type="string">CREDIT</item>
+                </item>
+            </argument>
         </arguments>
     </type>
 </config>

From aa8f955a3076ec1f6b511ae1868cc16fcb890d0e Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Mon, 28 Jan 2019 13:53:03 -0600
Subject: [PATCH 864/932] MC-13630: Integrate smart button functionality on
 product detail page - CR fixes

---
 app/code/Magento/Paypal/Block/Bml/Shortcut.php              | 3 ++-
 .../Magento/Paypal/Block/Express/InContext/SmartButton.php  | 2 +-
 .../Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php     | 6 ++++--
 .../Paypal/Test/Unit/Model/ExpressConfigProviderTest.php    | 4 +++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/Bml/Shortcut.php b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
index e76f1e922452e..d2f5ca009a198 100644
--- a/app/code/Magento/Paypal/Block/Bml/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Bml/Shortcut.php
@@ -10,6 +10,7 @@
 use Magento\Paypal\Helper\Shortcut\ValidatorInterface;
 use Magento\Paypal\Model\ConfigFactory;
 use Magento\Paypal\Model\Config;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class shortcut
@@ -114,7 +115,7 @@ public function __construct(
         $this->_bmlMethodCode = $bmlMethodCode;
         $this->config = $config
             ? $config->create()
-            : \Magento\Framework\App\ObjectManager::getInstance()->get(ConfigFactory::class)->create();
+            : ObjectManager::getInstance()->get(ConfigFactory::class)->create();
         $this->config->setMethod($this->_paymentMethodCode);
         parent::__construct($context, $data);
     }
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
index 2331676a4fa23..6d355038cff1f 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/SmartButton.php
@@ -73,7 +73,7 @@ public function __construct(
      *
      * @return bool
      */
-    protected function shouldRender(): bool
+    private function shouldRender(): bool
     {
         $isInCatalog = $this->getIsInCatalogProduct();
         $isInContext = (bool)(int) $this->config->getValue('in_context');
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
index 261af45ff9287..3fce5dab9dda7 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Bml/ShortcutTest.php
@@ -8,6 +8,8 @@
 
 use Magento\Catalog\Block as CatalogBlock;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Paypal\Model\ConfigFactory;
+use Magento\Paypal\Model\Config;
 
 class ShortcutTest extends \PHPUnit\Framework\TestCase
 {
@@ -33,12 +35,12 @@ protected function setUp()
         $this->paypalShortcutHelperMock = $this->createMock(\Magento\Paypal\Helper\Shortcut\ValidatorInterface::class);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $configFactoryMock = $this->getMockBuilder(\Magento\Paypal\Model\ConfigFactory::class)
+        $configFactoryMock = $this->getMockBuilder(ConfigFactory::class)
                 ->disableOriginalConstructor()
                 ->setMethods(['create'])
                 ->getMock();
 
-        $configMock = $this->getMockBuilder(\Magento\Paypal\Model\Config::class)
+        $configMock = $this->getMockBuilder(Config::class)
                 ->disableOriginalConstructor()
                 ->setMethods(['setMethod'])
                 ->getMock();
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
index e9e4c7373f13f..b316f92c0ce85 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressConfigProviderTest.php
@@ -5,8 +5,10 @@
  */
 namespace Magento\Paypal\Test\Unit\Model;
 
+use Magento\Framework\UrlInterface;
 use Magento\Paypal\Model\ExpressConfigProvider;
 use Magento\Paypal\Model\SmartButtonConfig;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class ExpressConfigProviderTest extends \PHPUnit\Framework\TestCase
 {
@@ -41,7 +43,7 @@ public function testGetConfig()
         $payment->expects($this->atLeastOnce())->method('getCheckoutRedirectUrl')->willReturn('http://redirect.url');
         $paymentHelper->expects($this->atLeastOnce())->method('getMethodInstance')->willReturn($payment);
 
-        /** @var \Magento\Framework\UrlInterface|\PHPUnit\Framework\MockObject\MockObject $urlBuilderMock */
+        /** @var UrlInterface|MockObject $urlBuilderMock */
         $urlBuilderMock = $this->createMock(\Magento\Framework\UrlInterface::class);
 
         $smartButtonConfigMock = $this->createMock(SmartButtonConfig::class);

From ab2c789a251154ad8df703c6c4132c95915a3f4b Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Mon, 28 Jan 2019 15:07:30 -0600
Subject: [PATCH 865/932] MC-13730: PayPal Smart button settings are displayed
 for "Payments Standard" payment method also.

- revert PayPal credit settings for PayFlow Link, Payment Standards and Payments Advanced
- update Smart buttons config labels, tooltip
---
 .../Magento/Paypal/etc/adminhtml/system.xml   | 13 ++++++-
 .../etc/adminhtml/system/express_checkout.xml | 18 +++++-----
 .../etc/adminhtml/system/payflow_advanced.xml |  4 +--
 .../etc/adminhtml/system/payflow_link.xml     |  4 +--
 .../system/payments_pro_hosted_solution.xml   |  2 +-
 ...aypal_payflowpro_with_express_checkout.xml |  2 +-
 app/code/Magento/Paypal/i18n/en_US.csv        | 11 +++---
 .../module/main/_collapsible-blocks.less      |  2 ++
 .../Reader/_files/expected/config.xml         | 34 ++++++++++---------
 9 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index 26ec9b3152e4b..ea48aa65132e8 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -106,12 +106,23 @@
                         <field id="enable_express_checkout">
                             <config_path>payment/wps_express/active</config_path>
                         </field>
-                        <field id="enable_express_checkout_bml">
+                        <field id="enable_express_checkout_bml" showInDefault="1" showInWebsite="1">
                             <config_path>payment/wps_express_bml/active</config_path>
                         </field>
+                        <field id="express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1"/>
                     </group>
                     <group id="settings_ec" translate="label">
                         <label>Basic Settings - PayPal Website Payments Standard</label>
+                        <group id="settings_ec_advanced">
+                            <group id="express_checkout_frontend">
+                                <field id="checkout_display" showInDefault="0" showInWebsite="0" showInStore="0"/>
+                                <group id="checkout_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
+                                <group id="product_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
+                                <group id="cart_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
+                                <group id="mini_cart_page_button" showInDefault="0" showInWebsite="0" showInStore="0"/>
+                                <group id="features" showInDefault="0" showInWebsite="0" showInStore="0"/>
+                            </group>
+                        </group>
                     </group>
                 </group>
             </group>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 92bcd49b4508a..9817441210957 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -646,15 +646,14 @@
                         <attribute type="shared">1</attribute>
                     </field>
                     <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Checkout Display</label>
+                        <label>Customize Smart Buttons</label>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                         <attribute type="shared">1</attribute>
                     </field>
                     <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
-                        <label>PayPal Button - Checkout Page</label>
-                        <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
+                        <label>Checkout Page</label>
+                        <field id="checkout_page_button_customize" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                             <label>Customize Button</label>
-                            <comment><![CDATA[Customize the display of the PayPal button in the Checkout.]]></comment>
                             <config_path>paypal/style/checkout_page_button_customize</config_path>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                             <attribute type="shared">1</attribute>
@@ -699,10 +698,11 @@
                             </depends>
                             <attribute type="shared">1</attribute>
                         </field>
-                        <field id="checkout_page_button_size" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
+                        <field id="checkout_page_button_size" translate="label tooltip" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
                             <label>Size</label>
                             <config_path>paypal/style/checkout_page_button_size</config_path>
                             <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getSize</source_model>
+                            <tooltip>Select Responsive to ensure the PayPal button renders correctly on mobile devices.</tooltip>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
                             </depends>
@@ -728,8 +728,8 @@
                             <attribute type="shared">1</attribute>
                         </field>
                     </group>
-                    <group id="product_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-                        <label>PayPal Button - Product Page</label>
+                    <group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                        <label>Product Pages</label>
                         <field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                             <comment/>
                             <config_path>paypal/style/product_page_button_customize</config_path>
@@ -782,7 +782,7 @@
                         </field>
                     </group>
                     <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
-                        <label>PayPal Button - Cart Page</label>
+                        <label>Cart Page</label>
                         <field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                             <comment/>
                             <config_path>paypal/style/cart_page_button_customize</config_path>
@@ -835,7 +835,7 @@
                         </field>
                     </group>
                     <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
-                        <label>PayPal Button - Mini Cart</label>
+                        <label>Mini Cart</label>
                         <field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                             <comment/>
                             <config_path>paypal/style/mini_cart_page_button_customize</config_path>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
index 5eb596c9c4f45..e7de9c0d641a7 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -97,7 +97,7 @@
                     <field id="enable_payflow_advanced"/>
                 </requires>
             </field>
-            <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml">
+            <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" showInDefault="1" showInWebsite="1">
                 <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                             <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
@@ -108,7 +108,7 @@
                     <field id="enable_payflow_advanced"/>
                 </requires>
             </field>
-            <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
+            <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
                 <config_path>payment/payflow_express_bml/sort_order</config_path>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
                 <depends>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
index d27dde02c579e..647bc7a60975a 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -106,7 +106,7 @@
                     <field id="enable_payflow_link"/>
                 </requires>
             </field>
-            <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41">
+            <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41" showInDefault="1" showInWebsite="1">
                 <comment><![CDATA[Payflow Link lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                         <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
@@ -117,7 +117,7 @@
                     <field id="enable_express_checkout"/>
                 </requires>
             </field>
-            <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
+            <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
                 <config_path>payment/payflow_express_bml/sort_order</config_path>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
                 <depends>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
index 77acff48c247e..35cd844204843 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/payments_pro_hosted_solution.xml
@@ -46,7 +46,7 @@
                 <frontend_class>paypal-enabler paypal-ec-separate</frontend_class>
             </field>
 
-            <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21">
+            <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21" showInDefault="1" showInWebsite="1">
                 <comment><![CDATA[Payments Pro Hosted Solution lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                         <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
index 6090025024dd7..425e4cffb666c 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro_with_express_checkout.xml
@@ -43,7 +43,7 @@
                     <field id="enable_paypal_payflow"/>
                 </requires>
             </field>
-            <field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
+            <field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
                 <config_path>payment/payflow_express_bml/sort_order</config_path>
                 <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
                 <depends>
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index de6cce79052a8..ad07d642de127 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -697,9 +697,8 @@ User,User
                                 The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
                                 or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
                 "
-"Checkout Display","Checkout Display"
-"PayPal Button - Checkout Page","PayPal Button - Checkout Page"
-"Customize the display of the PayPal button in the Checkout.","Customize the display of the PayPal button in the Checkout."
+"Customize Smart Buttons","Customize Smart Buttons"
+"Checkout Page","Checkout Page"
 "Label","Label"
 "The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.","The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR."
 "Checkout","Checkout"
@@ -725,9 +724,9 @@ User,User
 "Blue","Blue"
 "Silver","Silver"
 "Black","Black"
-"PayPal Button - Product Page","PayPal Button - Product Page"
-"PayPal Button - Cart Page","PayPal Button - Cart Page"
-"PayPal Button - Mini Cart","PayPal Button - Mini Cart"
+"Product Pages","Product Pages"
+"Cart Page","Cart Page"
+"Mini Cart","Mini Cart"
 "Features","Features"
 "PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD.","PayPal will automatically display each enabled funding option to eligible buyers. For example, PayPal Credit is only shown to buyers in countries where PayPal Credit is offered and the currency offered by the merchant is USD."
 "PayPal Credit","PayPal Credit"
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index e8e2746717e6a..1d95d84147a6d 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -492,6 +492,8 @@
             width: 44%;
 
             &.with-tooltip {
+                font-size: 0;
+
                 .tooltip {
                     bottom: 0;
                     float: right;
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index 5fadc185547f8..cddfb409e3f82 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -347,7 +347,7 @@
                             <field id="enable_payflow_link"/>
                         </requires>
                     </field>
-                    <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41">
+                    <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="41" showInDefault="1" showInWebsite="1">
                         <comment><![CDATA[Payflow Link lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                         <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
@@ -358,7 +358,7 @@
                             <field id="enable_express_checkout"/>
                         </requires>
                     </field>
-                    <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
+                    <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
                         <config_path>payment/payflow_express_bml/sort_order</config_path>
                         <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
                         <depends>
@@ -1216,15 +1216,14 @@
                                 <attribute type="shared">1</attribute>
                             </field>
                             <field id="checkout_display" translate="label" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
-                                <label>Checkout Display</label>
+                                <label>Customize Smart Buttons</label>
                                 <frontend_model>Magento\Config\Block\System\Config\Form\Field\Heading</frontend_model>
                                 <attribute type="shared">1</attribute>
                             </field>
                             <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
-                                <label>PayPal Button - Checkout Page</label>
+                                <label>Checkout Page</label>
                                 <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                                     <label>Customize Button</label>
-                                    <comment><![CDATA[Customize the display of the PayPal button in the Checkout.]]></comment>
                                     <config_path>paypal/style/checkout_page_button_customize</config_path>
                                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                                     <attribute type="shared">1</attribute>
@@ -1269,10 +1268,11 @@
                                     </depends>
                                     <attribute type="shared">1</attribute>
                                 </field>
-                                <field id="checkout_page_button_size" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
+                                <field id="checkout_page_button_size" translate="label tooltip" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
                                     <label>Size</label>
                                     <config_path>paypal/style/checkout_page_button_size</config_path>
                                     <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getSize</source_model>
+                                    <tooltip>Select Responsive to ensure the PayPal button renders correctly on mobile devices.</tooltip>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
                                     </depends>
@@ -1298,8 +1298,8 @@
                                     <attribute type="shared">1</attribute>
                                 </field>
                             </group>
-                            <group id="product_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
-                                <label>PayPal Button - Product Page</label>
+                            <group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
+                                <label>Product Pages</label>
                                 <field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                                     <comment/>
                                     <config_path>paypal/style/product_page_button_customize</config_path>
@@ -1352,7 +1352,7 @@
                                 </field>
                             </group>
                             <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
-                                <label>PayPal Button - Cart Page</label>
+                                <label>Cart Page</label>
                                 <field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                                     <comment/>
                                     <config_path>paypal/style/cart_page_button_customize</config_path>
@@ -1405,7 +1405,7 @@
                                 </field>
                             </group>
                             <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
-                                <label>PayPal Button - Mini Cart</label>
+                                <label>Mini Cart</label>
                                 <field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
                                     <comment/>
                                     <config_path>paypal/style/mini_cart_page_button_customize</config_path>
@@ -1467,8 +1467,10 @@
                                 offered and the currency offered by the merchant is USD.]]>
                                     </comment>
                                     <config_path>paypal/style/disable_funding_options</config_path>
+                                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions</frontend_model>
                                     <source_model>Magento\Paypal\Model\System\Config\Source\DisableFundingOptions</source_model>
                                     <attribute type="shared">1</attribute>
+                                    <can_be_empty>1</can_be_empty>
                                 </field>
                             </group>
                         </group>
@@ -1515,7 +1517,7 @@
                         <frontend_class>paypal-enabler paypal-ec-separate</frontend_class>
                     </field>
 
-                    <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21">
+                    <field id="enable_express_checkout_bml"  extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" sortOrder="21" showInDefault="1" showInWebsite="1">
                         <comment><![CDATA[Payments Pro Hosted Solution lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                         You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                         <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
@@ -1790,7 +1792,7 @@
                                 <field id="enable_payflow_advanced"/>
                             </requires>
                         </field>
-                        <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml">
+                        <field id="enable_express_checkout_bml" sortOrder="42" extends="payment_all_paypal/express_checkout/express_checkout_required/enable_express_checkout_bml" showInDefault="1" showInWebsite="1">
                             <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
                             You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with PayPal Credit&#174;.
                             <a href="https://www.paypal.com/webapps/mpp/promotional-financing" target="_blank">Learn More</a>]]>
@@ -1801,7 +1803,7 @@
                                 <field id="enable_payflow_advanced"/>
                             </requires>
                         </field>
-                        <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
+                        <field id="express_checkout_bml_sort_order" sortOrder="50" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
                             <config_path>payment/payflow_express_bml/sort_order</config_path>
                             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
                             <depends>
@@ -2073,6 +2075,8 @@
                         <field id="enable_paypal_payflow">
                             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\Payment</frontend_model>
                         </field>
+                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
+                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
                         <group id="paypal_payflow_api_settings" translate="label">
                             <label>Payflow Pro and Express Checkout</label>
                             <field id="business_account" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_required_express_checkout/business_account" translate="label" sortOrder="10">
@@ -2087,8 +2091,6 @@
                                 <field id="enable_paypal_payflow"/>
                             </requires>
                         </field>
-                        <field id="enable_in_context_checkout" showInDefault="0" showInWebsite="0"/>
-                        <field id="merchant_id" showInDefault="0" showInWebsite="0"/>
                         <field id="enable_express_checkout_bml_payflow" translate="label" type="select" sortOrder="21" showInWebsite="1" showInDefault="1">
                             <label>Enable PayPal Credit</label>
                             <comment><![CDATA[PayPal Express Checkout Payflow Edition lets you give customers access to financing through PayPal Credit&#174; - at no additional cost to you.
@@ -2102,7 +2104,7 @@
                                 <field id="enable_paypal_payflow"/>
                             </requires>
                         </field>
-                        <field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order">
+                        <field id="express_checkout_bml_sort_order" sortOrder="30" extends="payment_all_paypal/express_checkout/express_checkout_required/express_checkout_bml_sort_order" showInDefault="1" showInWebsite="1">
                             <config_path>payment/payflow_express_bml/sort_order</config_path>
                             <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\BmlSortOrder</frontend_model>
                             <depends>

From d99cdf41c302b98879d1f27cc24465c1e0d86697 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Mon, 28 Jan 2019 15:18:17 -0600
Subject: [PATCH 866/932] MC-13733: When Layout is Set to "Horizontal" PayPal
 Smart Credit button is not displayed. - CR fixes

---
 app/code/Magento/Paypal/Model/SmartButtonConfig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 7d0bed656ae80..80a0d477216b0 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -88,7 +88,7 @@ private function getDisallowedFunding(): array
      * @param string $page
      * @return array
      */
-    private function getAllowedFunding($page): array
+    private function getAllowedFunding(string $page): array
     {
         return array_values(array_diff($this->allowedFunding[$page], $this->getDisallowedFunding()));
     }

From 387d08e0fb6290f7b9bef6b3a060d7a4ed1468ea Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Mon, 28 Jan 2019 15:55:55 -0600
Subject: [PATCH 867/932] MC-4890: Convert DeleteTaxRuleEntityTest to MFTF

- Add mtf_migrated tag to variation
---
 .../app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml
index dc5e121db3d1a..96bfec0121eb7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/DeleteTaxRuleEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Tax\Test\TestCase\DeleteTaxRuleEntityTest" summary="Delete Tax Rule" ticketId="MAGETWO-20924">
         <variation name="DeleteTaxRuleEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="taxRule/dataset" xsi:type="string">tax_rule_with_custom_tax_classes</data>
             <data name="address/data/country_id" xsi:type="string">United States</data>
             <data name="address/data/region_id" xsi:type="string">California</data>

From 511c9fccbf8da11ba5b966b9a1611f108d5fce80 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Mon, 28 Jan 2019 16:10:04 -0600
Subject: [PATCH 868/932] MC-13730: PayPal Smart button settings are displayed
 for "Payments Standard" payment method also.

---
 .../Paypal/etc/adminhtml/system/express_checkout.xml        | 3 ---
 .../Config/Structure/Reader/_files/expected/config.xml      | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 9817441210957..1d25a664bb1df 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -731,7 +731,6 @@
                     <group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                         <label>Product Pages</label>
                         <field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
-                            <comment/>
                             <config_path>paypal/style/product_page_button_customize</config_path>
                         </field>
                         <field id="product_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
@@ -784,7 +783,6 @@
                     <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
                         <label>Cart Page</label>
                         <field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
-                            <comment/>
                             <config_path>paypal/style/cart_page_button_customize</config_path>
                         </field>
                         <field id="cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
@@ -837,7 +835,6 @@
                     <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
                         <label>Mini Cart</label>
                         <field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
-                            <comment/>
                             <config_path>paypal/style/mini_cart_page_button_customize</config_path>
                         </field>
                         <field id="mini_cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index cddfb409e3f82..30756aa0c9829 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -1222,7 +1222,7 @@
                             </field>
                             <group id="checkout_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
                                 <label>Checkout Page</label>
-                                <field id="checkout_page_button_customize" translate="label comment" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
+                                <field id="checkout_page_button_customize" translate="label" type="select" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="10">
                                     <label>Customize Button</label>
                                     <config_path>paypal/style/checkout_page_button_customize</config_path>
                                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -1232,6 +1232,7 @@
                                     <label>Label</label>
                                     <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
                                     <config_path>paypal/style/checkout_page_button_label</config_path>
+                                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\ButtonStylesLabel</frontend_model>
                                     <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>
@@ -1301,7 +1302,6 @@
                             <group id="product_page_button" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="100">
                                 <label>Product Pages</label>
                                 <field id="product_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
-                                    <comment/>
                                     <config_path>paypal/style/product_page_button_customize</config_path>
                                 </field>
                                 <field id="product_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
@@ -1354,7 +1354,6 @@
                             <group id="cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="110">
                                 <label>Cart Page</label>
                                 <field id="cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
-                                    <comment/>
                                     <config_path>paypal/style/cart_page_button_customize</config_path>
                                 </field>
                                 <field id="cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">
@@ -1407,7 +1406,6 @@
                             <group id="mini_cart_page_button" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="120">
                                 <label>Mini Cart</label>
                                 <field id="mini_cart_page_button_customize" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_customize">
-                                    <comment/>
                                     <config_path>paypal/style/mini_cart_page_button_customize</config_path>
                                 </field>
                                 <field id="mini_cart_page_button_label" extends="payment_all_paypal/express_checkout/settings_ec/settings_ec_advanced/express_checkout_frontend/checkout_page_button/checkout_page_button_label">

From 7457555f965341c1d37dc9d03d19491209655f6d Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Mon, 28 Jan 2019 16:17:43 -0600
Subject: [PATCH 869/932] MC-13735: Error without content display when user
 checkout with PayPal and sign in from Checkout page

---
 .../Magento/Paypal/view/frontend/web/js/in-context/button.js  | 4 +---
 .../frontend/web/js/in-context/express-checkout-wrapper.js    | 4 +++-
 .../frontend/web/js/in-context/product-express-checkout.js    | 4 +---
 .../payment/method-renderer/in-context/checkout-express.js    | 1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
index 2420b10179c28..012a1f18f9ae5 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/button.js
@@ -6,8 +6,7 @@ define([
     'uiComponent',
     'jquery',
     'Magento_Paypal/js/in-context/express-checkout-wrapper',
-    'Magento_Customer/js/customer-data',
-    'mage/cookies'
+    'Magento_Customer/js/customer-data'
 ], function (Component, $, Wrapper, customerData) {
     'use strict';
 
@@ -46,7 +45,6 @@ define([
         /** @inheritdoc */
         prepareClientConfig: function () {
             this._super();
-            this.clientConfig.formKey = $.mage.cookies.get('form_key');
             this.clientConfig.commit = false;
 
             return this.clientConfig;
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
index b13d49614b3a7..905f860fe2651 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-wrapper.js
@@ -6,7 +6,8 @@ define([
     'jquery',
     'mage/translate',
     'Magento_Customer/js/customer-data',
-    'Magento_Paypal/js/in-context/express-checkout-smart-buttons'
+    'Magento_Paypal/js/in-context/express-checkout-smart-buttons',
+    'mage/cookies'
 ], function ($, $t, customerData, checkoutSmartButtons) {
     'use strict';
 
@@ -178,6 +179,7 @@ define([
             this.clientConfig.client = {};
             this.clientConfig.client[this.clientConfig.environment] = this.clientConfig.merchantId;
             this.clientConfig.rendererComponent = this;
+            this.clientConfig.formKey = $.mage.cookies.get('form_key');
 
             return this.clientConfig;
         }
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
index a0cee19d0a898..413820cc731ac 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/in-context/product-express-checkout.js
@@ -7,8 +7,7 @@ define([
     'jquery',
     'uiComponent',
     'Magento_Paypal/js/in-context/express-checkout-wrapper',
-    'Magento_Customer/js/customer-data',
-    'mage/cookies'
+    'Magento_Customer/js/customer-data'
 ], function (_, $, Component, Wrapper, customerData) {
     'use strict';
 
@@ -69,7 +68,6 @@ define([
             this._super();
             this.clientConfig.quoteId = '';
             this.clientConfig.customerId = '';
-            this.clientConfig.formKey = $.mage.cookies.get('form_key');
             this.clientConfig.commit = false;
 
             return this.clientConfig;
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
index 27a1e4c1b196e..5c509238fe5cc 100644
--- a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
+++ b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -74,7 +74,6 @@ define([
         prepareClientConfig: function () {
             this._super();
             this.clientConfig.quoteId = window.checkoutConfig.quoteData['entity_id'];
-            this.clientConfig.formKey = window.checkoutConfig.formKey;
             this.clientConfig.customerId = window.customerData.id;
             this.clientConfig.merchantId = this.merchantId;
             this.clientConfig.button = 0;

From db9a3c89e0874d0ed76fec5d96195c5a7170efd3 Mon Sep 17 00:00:00 2001
From: Andrew Molina <amolina@adobe.com>
Date: Mon, 28 Jan 2019 16:29:06 -0600
Subject: [PATCH 870/932] MC-5717: Sub-category doesnt display after moving
 categories

Fixed static test failures
---
 .../Catalog/Controller/Adminhtml/Category/RefreshPath.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
index e58a0c5b0996e..e3d40bee214d1 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/RefreshPath.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,6 +7,9 @@
 
 use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
 
+/**
+ * Class RefreshPath
+ */
 class RefreshPath extends \Magento\Catalog\Controller\Adminhtml\Category implements HttpGetActionInterface
 {
     /**

From d1340328cb649cec143cd31484536e15393d00bf Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <korshenk@adobe.com>
Date: Mon, 28 Jan 2019 16:44:17 -0600
Subject: [PATCH 871/932] Update post-code.js

---
 .../Magento/Ui/view/base/web/js/form/element/post-code.js    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
index 5bfba724dfbe8..72177a1804df0 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
@@ -33,11 +33,8 @@ define([
             }
 
             option = options[value];
-            if (!option) {
-                return;
-            }
             
-            if (option['is_zipcode_optional']) {
+            if (option && option['is_zipcode_optional']) {
                 this.error(false);
                 this.validation = _.omit(this.validation, 'required-entry');
             } else {

From 0902931633e350761e509a62ad66b22ff40cd093 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <korshenk@adobe.com>
Date: Mon, 28 Jan 2019 16:51:01 -0600
Subject: [PATCH 872/932] Update post-code.js

---
 .../Magento/Ui/view/base/web/js/form/element/post-code.js   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
index 72177a1804df0..b8bab2f72f38a 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
@@ -34,7 +34,11 @@ define([
 
             option = options[value];
             
-            if (option && option['is_zipcode_optional']) {
+            if (!option) {
+                return;
+            }
+            
+            if (option['is_zipcode_optional']) {
                 this.error(false);
                 this.validation = _.omit(this.validation, 'required-entry');
             } else {

From 4b15df4c0725f4760ef268000455dde43f8bcbd3 Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Mon, 28 Jan 2019 17:17:47 -0600
Subject: [PATCH 873/932] MC-11034: Enable Paypal Credit option should be
 disabled/greyed out when a non-US merchant is chosen - Added unit test

---
 .../DisabledFundingOptionsTest.php            | 140 ++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php

diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
new file mode 100644
index 0000000000000..4af07b66ddc4b
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Multiselect;
+
+use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use \Magento\Framework\Data\Form\Element\AbstractElement;
+use \Magento\Framework\App\RequestInterface;
+use \Magento\Framework\View\Helper\Js;
+use \Magento\Paypal\Model\Config;
+use \Magento\Paypal\Block\Adminhtml\System\Config\Multiselect\DisabledFundingOptions;
+use \Magento\Paypal\Model\Config\StructurePlugin;
+use \PHPUnit\Framework\TestCase;
+
+/**
+ * Class DisabledFundingOptionsTest
+ * @package Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Multiselect
+ */
+class DisabledFundingOptionsTest extends TestCase
+{
+    /**
+     * @var \Magento\Paypal\Block\Adminhtml\System\Config\Multiselect\DisabledFundingOptions
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\Data\Form\Element\AbstractElement
+     */
+    private $element;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $request;
+
+    /**
+     * @var \Magento\Framework\View\Helper\Js|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $jsHelper;
+
+    /**
+     * @var \Magento\Paypal\Model\Config
+     */
+    private $config;
+
+    protected function setUp()
+    {
+        $helper = new ObjectManager($this);
+        $this->element = $this->getMockForAbstractClass(
+            AbstractElement::class,
+            [],
+            '',
+            false,
+            true,
+            true,
+            ['getHtmlId', 'getElementHtml', 'getName']
+        );
+        $this->request = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->jsHelper = $this->createMock(Js::class);
+        $this->config = $this->createMock(Config::class);
+        $this->element->setValues($this->getDefaultFundingOptions());
+        $this->model = $helper->getObject(
+            DisabledFundingOptions::class,
+            ['request' => $this->request, 'jsHelper' => $this->jsHelper, 'config' => $this->config]
+        );
+    }
+
+    /**
+     * @param string $requestCountry
+     * @param string $merchantCountry
+     * @param bool $shouldContainPaypalCredit
+     * @dataProvider isPaypalCreditAvailableDataProvider
+     */
+    public function testIsPaypalCreditAvailable($requestCountry, $merchantCountry, $shouldContainPaypalCredit)
+    {
+        $this->request->expects($this->any())
+            ->method('getParam')
+            ->will($this->returnCallback(function ($param) use ($requestCountry) {
+                if ($param == StructurePlugin::REQUEST_PARAM_COUNTRY) {
+                    return $requestCountry;
+                }
+                return $param;
+            }));
+        $this->config->expects($this->any())
+            ->method('getMerchantCountry')
+            ->will($this->returnCallback(function () use ($merchantCountry) {
+                return $merchantCountry;
+            }));
+        $this->model->render($this->element);
+        $payPalCreditOption = [
+            'value' => 'CREDIT',
+            'label' => __('PayPal Credit')
+        ];
+        $elementValues = $this->element->getValues();
+        if ($shouldContainPaypalCredit) {
+            $this->assertContains($payPalCreditOption, $elementValues);
+        } else {
+            $this->assertNotContains($payPalCreditOption, $elementValues);
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function isPaypalCreditAvailableDataProvider(): array
+    {
+        return [
+            [null, 'US', true],
+            ['US', 'US', true],
+            ['US', 'GB', true],
+            ['GB', 'GB', false],
+            ['GB', 'US', false],
+            ['GB', null, false],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    private function getDefaultFundingOptions(): array
+    {
+        return [
+            [
+                'value' => 'CREDIT',
+                'label' => __('PayPal Credit')
+            ],
+            [
+                'value' => 'CARD',
+                'label' => __('PayPal Guest Checkout Credit Card Icons')
+            ],
+            [
+                'value' => 'ELV',
+                'label' => __('Elektronisches Lastschriftverfahren - German ELV')
+            ]
+        ];
+    }
+}
\ No newline at end of file

From 313eeac331cd25d96900e371d59d725824e0efbd Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Mon, 28 Jan 2019 17:34:38 -0600
Subject: [PATCH 874/932] MC-11034: Enable Paypal Credit option should be
 disabled/greyed out when a non-US merchant is chosen - Fixed review comments

MC-11034: Enable Paypal Credit option should be disabled/greyed out when a non-US merchant is chosen
- Fixed review comments

MC-11034: Enable Paypal Credit option should be disabled/greyed out when a non-US merchant is chosen
- Fixed review comments
---
 .../Multiselect/DisabledFundingOptionsTest.php       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
index 4af07b66ddc4b..507edf7ef306a 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
@@ -17,7 +17,6 @@
 
 /**
  * Class DisabledFundingOptionsTest
- * @package Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Multiselect
  */
 class DisabledFundingOptionsTest extends TestCase
 {
@@ -69,13 +68,16 @@ protected function setUp()
     }
 
     /**
-     * @param string $requestCountry
-     * @param string $merchantCountry
+     * @param null|string $requestCountry
+     * @param null|string $merchantCountry
      * @param bool $shouldContainPaypalCredit
      * @dataProvider isPaypalCreditAvailableDataProvider
      */
-    public function testIsPaypalCreditAvailable($requestCountry, $merchantCountry, $shouldContainPaypalCredit)
-    {
+    public function testIsPaypalCreditAvailable(
+        ?string $requestCountry,
+        ?string $merchantCountry,
+        bool $shouldContainPaypalCredit
+    ) {
         $this->request->expects($this->any())
             ->method('getParam')
             ->will($this->returnCallback(function ($param) use ($requestCountry) {

From fb29ecf164c517cf415ef988b560b471594d5df0 Mon Sep 17 00:00:00 2001
From: Dominic <d.fernando@ism-apac.com>
Date: Tue, 29 Jan 2019 10:57:41 +0530
Subject: [PATCH 875/932] add type resolve sting to const

---
 .../Model/ConfigurableProductTypeResolver.php             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
index e4e1c6aab6922..f65a331ab803c 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
@@ -15,13 +15,19 @@
  */
 class ConfigurableProductTypeResolver implements TypeResolverInterface
 {
+    /**
+     * Configurable product type resolver code
+     */
+    const TYPE_RESOLVER = 'ConfigurableProduct';
+
     /**
      * {@inheritdoc}
      */
     public function resolveType(array $data) : string
     {
         if (isset($data['type_id']) && $data['type_id'] == Type::TYPE_CODE) {
-            return 'ConfigurableProduct';
+            return self::TYPE_RESOLVER;
+
         }
         return '';
     }

From 5f6cebdd2bc1b1e129d6da133150c5a1b552ea8f Mon Sep 17 00:00:00 2001
From: Mudit Shukla <muditshukla@cedcoss.com>
Date: Tue, 29 Jan 2019 12:35:07 +0530
Subject: [PATCH 876/932] Updated AbstractAddress.php

---
 app/code/Magento/Customer/Model/Address/AbstractAddress.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 146fec4c79f46..d8d0646b30bb8 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -222,7 +222,7 @@ public function getStreet()
     }
 
     /**
-     * Get steet line by number
+     * Get street line by number
      *
      * @param int $number
      * @return string

From 806a8d30a52dc0fde718b447c1768cd26e28f6b6 Mon Sep 17 00:00:00 2001
From: Mudit Shukla <muditshukla@cedcoss.com>
Date: Tue, 29 Jan 2019 12:35:47 +0530
Subject: [PATCH 877/932] Updated AddressModelInterface.php

---
 .../Magento/Customer/Model/Address/AddressModelInterface.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Address/AddressModelInterface.php b/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
index 0af36e877555f..06de3a99a831c 100644
--- a/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
+++ b/app/code/Magento/Customer/Model/Address/AddressModelInterface.php
@@ -15,7 +15,7 @@
 interface AddressModelInterface
 {
     /**
-     * Get steet line by number
+     * Get street line by number
      *
      * @param int $number
      * @return string

From 95eb888f071c65e4647192150e83551664505f69 Mon Sep 17 00:00:00 2001
From: Mudit Shukla <muditshukla@cedcoss.com>
Date: Tue, 29 Jan 2019 12:36:46 +0530
Subject: [PATCH 878/932] Updated AbstractAgreement.php

---
 app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php b/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
index 2ebe088d31d86..8965684d1085f 100644
--- a/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
+++ b/app/code/Magento/Paypal/Model/Billing/AbstractAgreement.php
@@ -6,7 +6,7 @@
 namespace Magento\Paypal\Model\Billing;
 
 /**
- * Billing Agreement abstaract class
+ * Billing Agreement abstract class
  */
 abstract class AbstractAgreement extends \Magento\Framework\Model\AbstractModel
 {

From ad161491ed92e0a710055a585f62ece9febc1568 Mon Sep 17 00:00:00 2001
From: Mudit Shukla <muditshukla@cedcoss.com>
Date: Tue, 29 Jan 2019 12:37:48 +0530
Subject: [PATCH 879/932] Updated Adjustments.php

---
 .../Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
index d73371d46dae1..291792a61d8ba 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -50,7 +50,7 @@ public function __construct(
     }
 
     /**
-     * Initialize creditmemo agjustment totals
+     * Initialize creditmemo adjustment totals
      *
      * @return $this
      */

From 6401f7a1372007b1b3064044f64a462b75b517db Mon Sep 17 00:00:00 2001
From: satyaprakash <satyaprakash@cedcoss.com>
Date: Tue, 29 Jan 2019 14:46:39 +0530
Subject: [PATCH 880/932] Code Cleanup : Typo Fixed enabed -> enabled

---
 .../Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml     | 2 +-
 .../AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml   | 2 +-
 ...inAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml | 2 +-
 ...dminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
index ded94eab92042..1adb781a67536 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
@@ -36,7 +36,7 @@
         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Page Link" stepKey="selectCMSPageLink" />
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
index 2586ffc11d086..394d79bda1ab3 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
@@ -42,7 +42,7 @@
         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectCatalogProductsList" />
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
index 691a99a73b90b..862f51ea72fad 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
@@ -41,7 +41,7 @@
         <waitForPageLoad stepKey="wait2"/>
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Compared Products" stepKey="selectRecentlyComparedProducts" />
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
index 9cdbccd1f8c32..298aed917fc18 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
@@ -40,7 +40,7 @@
         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Viewed Products" stepKey="selectRecentlyViewedProducts" />

From ed7586ff3a83e5e87f076f678317ea1435344d55 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Tue, 29 Jan 2019 12:40:49 +0300
Subject: [PATCH 881/932] MAGETWO-95823: Order Sales Report includes canceled
 orders

- Update automated test
---
 .../ActionGroup/AdminOrderActionGroup.xml     | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index 8732e7cd84ed6..aea04c8abfa60 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -361,28 +361,6 @@
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="{{orderStatus}}" stepKey="seeOrderStatusCanceled"/>
     </actionGroup>
 
-    <!-- Create Order -->
-    <actionGroup name="CreateOrderActionGroup">
-        <arguments>
-            <argument name="product"/>
-            <argument name="customer"/>
-        </arguments>
-        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
-        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
-        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
-        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
-        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
-        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
-        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
-        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
-        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
-        <waitForPageLoad stepKey="waitForShippingMethods"/>
-        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
-        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
-        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
-    </actionGroup>
-
     <!--Select Check Money payment method-->
     <actionGroup name="SelectCheckMoneyPaymentMethod">
         <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>

From 040e5b5a72db21897ac599cf70b8845dcec8596d Mon Sep 17 00:00:00 2001
From: Dominic <d.fernando@ism-apac.com>
Date: Tue, 29 Jan 2019 18:14:18 +0530
Subject: [PATCH 882/932] add missing php doc comment

---
 .../Magento/BundleGraphQl/Model/Resolver/Options/Collection.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php
index 149155c86275a..7608d6e9e4d97 100644
--- a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php
@@ -61,6 +61,7 @@ public function __construct(
      * Add parent id/sku pair to use for option filter at fetch time.
      *
      * @param int $parentId
+     * @param int $parentEntityId
      * @param string $sku
      */
     public function addParentFilterData(int $parentId, int $parentEntityId, string $sku) : void

From 2bb00c285664d0e42f68217d2ccff6f8e3397e46 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Tue, 29 Jan 2019 15:02:50 +0200
Subject: [PATCH 883/932] MAGETWO-97952: Automate with Integration test
 Confirmation email should be delivered to the customer when address contains
 '+' symbol

---
 .../Customer/Controller/AccountTest.php       | 164 ++++++++++++------
 .../customer_confirmation_config_disable.php  |  21 +++
 ...r_confirmation_config_disable_rollback.php |  23 +++
 .../customer_confirmation_config_enable.php   |  21 +++
 ...er_confirmation_config_enable_rollback.php |  23 +++
 ...ation_email_address_with_special_chars.php |  37 ++++
 ...il_address_with_special_chars_rollback.php |  31 ++++
 7 files changed, 266 insertions(+), 54 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index c94948e23ab4d..ea7a7710acbc3 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -17,18 +17,35 @@
 use Magento\Framework\App\Http;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Message\MessageInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Request;
 use Magento\TestFramework\Response;
 use Zend\Stdlib\Parameters;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Theme\Controller\Result\MessagePlugin;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
 {
+    /**
+     * @var TransportBuilderMock
+     */
+    private $transportBuilderMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilderMock = $this->_objectManager->get(TransportBuilderMock::class);
+    }
+
     /**
      * Login the user
      *
@@ -133,11 +150,7 @@ public function testForgotPasswordEmailMessageWithSpecialCharacters()
         $this->dispatch('customer/account/forgotPasswordPost');
         $this->assertRedirect($this->stringContains('customer/account/'));
 
-        /** @var \Magento\TestFramework\Mail\Template\TransportBuilderMock $transportBuilder */
-        $transportBuilder = $this->_objectManager->get(
-            \Magento\TestFramework\Mail\Template\TransportBuilderMock::class
-        );
-        $subject = $transportBuilder->getSentMessage()->getSubject();
+        $subject = $this->transportBuilderMock->getSentMessage()->getSubject();
         $this->assertContains(
             'Test special\' characters',
             $subject
@@ -260,26 +273,10 @@ public function testNoFormKeyCreatePostAction()
     /**
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_disable.php
      */
     public function testNoConfirmCreatePostAction()
     {
-        /** @var \Magento\Framework\App\Config\MutableScopeConfigInterface $mutableScopeConfig */
-        $mutableScopeConfig = Bootstrap::getObjectManager()
-            ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
-
-        $scopeValue = $mutableScopeConfig->getValue(
-            'customer/create_account/confirm',
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
-
-        $mutableScopeConfig->setValue(
-            'customer/create_account/confirm',
-            0,
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
-
         $this->fillRequestWithAccountDataAndFormKey('test1@email.com');
         $this->dispatch('customer/account/createPost');
         $this->assertRedirect($this->stringEndsWith('customer/account/'));
@@ -287,38 +284,15 @@ public function testNoConfirmCreatePostAction()
             $this->equalTo(['Thank you for registering with Main Website Store.']),
             MessageInterface::TYPE_SUCCESS
         );
-
-        $mutableScopeConfig->setValue(
-            'customer/create_account/confirm',
-            $scopeValue,
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
     }
 
     /**
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
      */
     public function testWithConfirmCreatePostAction()
     {
-        /** @var \Magento\Framework\App\Config\MutableScopeConfigInterface $mutableScopeConfig */
-        $mutableScopeConfig = Bootstrap::getObjectManager()
-            ->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class);
-
-        $scopeValue = $mutableScopeConfig->getValue(
-            'customer/create_account/confirm',
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
-
-        $mutableScopeConfig->setValue(
-            'customer/create_account/confirm',
-            1,
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
-
         $this->fillRequestWithAccountDataAndFormKey('test2@email.com');
         $this->dispatch('customer/account/createPost');
         $this->assertRedirect($this->stringContains('customer/account/index/'));
@@ -330,13 +304,6 @@ public function testWithConfirmCreatePostAction()
             ]),
             MessageInterface::TYPE_SUCCESS
         );
-
-        $mutableScopeConfig->setValue(
-            'customer/create_account/confirm',
-            $scopeValue,
-            ScopeInterface::SCOPE_WEBSITES,
-            null
-        );
     }
 
     /**
@@ -730,6 +697,46 @@ public function testLoginPostRedirect($redirectDashboard, string $redirectUrl)
         $this->assertTrue($this->_objectManager->get(Session::class)->isLoggedIn());
     }
 
+    /**
+     * Test that confirmation email address displays special characters correctly.
+     *
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
+     *
+     * @return void
+     */
+    public function testConfirmationEmailWithSpecialCharacters(): void
+    {
+        $email = 'customer+confirmation@example.com';
+        $this->dispatch('customer/account/confirmation/email/customer%2Bconfirmation%40email.com');
+        $this->getRequest()->setPostValue('email', $email);
+        $this->dispatch('customer/account/confirmation/email/customer%2Bconfirmation%40email.com');
+
+        $this->assertRedirect($this->stringContains('customer/account/index'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Please check your email for confirmation key.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+
+        /** @var $message \Magento\Framework\Mail\Message */
+        $message = $this->transportBuilderMock->getSentMessage();
+        $rawMessage = $message->getRawMessage();
+
+        $this->assertContains('To: ' . $email, $rawMessage);
+
+        $content = $message->getBody()->getPartContent(0);
+        $confirmationUrl = $this->getConfirmationUrlFromMessageContent($content);
+        $this->setRequestInfo($confirmationUrl, 'confirm');
+        $this->clearCookieMessagesList();
+        $this->dispatch($confirmationUrl);
+
+        $this->assertRedirect($this->stringContains('customer/account/index'));
+        $this->assertSessionMessages(
+            $this->equalTo(['Thank you for registering with Main Website Store.']),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
     /**
      * Data provider for testLoginPostRedirect.
      *
@@ -847,4 +854,53 @@ private function assertResponseRedirect(Response $response, string $redirectUrl)
         $this->assertTrue($response->isRedirect());
         $this->assertSame($redirectUrl, $response->getHeader('Location')->getUri());
     }
+
+    /**
+     * Add new request info (request uri, path info, action name).
+     *
+     * @param string $uri
+     * @param string $actionName
+     * @return void
+     */
+    private function setRequestInfo(string $uri, string $actionName): void
+    {
+        $this->getRequest()
+            ->setRequestUri($uri)
+            ->setPathInfo()
+            ->setActionName($actionName);
+    }
+
+    /**
+     * Clear cookie messages list.
+     *
+     * @return void
+     */
+    private function clearCookieMessagesList(): void
+    {
+        $cookieManager = $this->_objectManager->get(CookieManagerInterface::class);
+        $jsonSerializer = $this->_objectManager->get(Json::class);
+        $cookieManager->setPublicCookie(
+            MessagePlugin::MESSAGES_COOKIES_NAME,
+            $jsonSerializer->serialize([])
+        );
+    }
+
+    /**
+     * Get confirmation URL from message content.
+     *
+     * @param string $content
+     * @return string
+     */
+    private function getConfirmationUrlFromMessageContent(string $content): string
+    {
+        $confirmationUrl = '';
+
+        if (preg_match('<a\s*href="(?<url>.*?)".*>', $content, $matches)) {
+            $confirmationUrl = $matches['url'];
+            $confirmationUrl = str_replace('http://localhost/index.php/', '', $confirmationUrl);
+            $confirmationUrl = html_entity_decode($confirmationUrl);
+        }
+
+        return $confirmationUrl;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php
new file mode 100644
index 0000000000000..7d4e451db514b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$mutableScopeConfig = $objectManager->create(MutableScopeConfigInterface::class);
+
+$mutableScopeConfig->setValue(
+    'customer/create_account/confirm',
+    0,
+    ScopeInterface::SCOPE_WEBSITES,
+    null
+);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php
new file mode 100644
index 0000000000000..36743b4a20e9a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_disable_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var Config $config */
+$config = Bootstrap::getObjectManager()->create(Config::class);
+$config->deleteConfig('customer/create_account/confirm');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php
new file mode 100644
index 0000000000000..c8deb7ec2a536
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$mutableScopeConfig = $objectManager->create(MutableScopeConfigInterface::class);
+
+$mutableScopeConfig->setValue(
+    'customer/create_account/confirm',
+    1,
+    ScopeInterface::SCOPE_WEBSITES,
+    null
+);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php
new file mode 100644
index 0000000000000..36743b4a20e9a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_config_enable_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var Config $config */
+$config = Bootstrap::getObjectManager()->create(Config::class);
+$config->deleteConfig('customer/create_account/confirm');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
new file mode 100644
index 0000000000000..c4f046bac57a6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Customer;
+use Magento\TestFramework\Helper\Bootstrap;
+
+include __DIR__ . '/customer_confirmation_config_enable.php';
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Customer $customer */
+$customer = $objectManager->create(Customer::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->create(CustomerRepositoryInterface::class);
+/** @var CustomerInterface $customerInterface */
+$customerInterface = $objectManager->create(CustomerInterface::class);
+
+$customerInterface->setWebsiteId(1)
+    ->setEmail('customer+confirmation@example.com')
+    ->setConfirmation($customer->getRandomConfirmationKey())
+    ->setGroupId(1)
+    ->setStoreId(1)
+    ->setFirstname('John')
+    ->setLastname('Smith')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setTaxvat('12')
+    ->setGender(0);
+
+$customerRepository->save($customerInterface, 'password');
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php
new file mode 100644
index 0000000000000..7a0ebf74ed8a0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_confirmation_email_address_with_special_chars_rollback.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+include __DIR__ . '/customer_confirmation_config_enable_rollback.php';
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = Bootstrap::getObjectManager()->create(CustomerRepositoryInterface::class);
+
+try {
+    $customer = $customerRepository->get('customer+confirmation@example.com');
+    $customerRepository->delete($customer);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    // Customer with the specified email does not exist
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 67c59ec844b4fb475ad45304522b878e3c4a4847 Mon Sep 17 00:00:00 2001
From: Kajal Solanki <kajal.solanki@krishtechnolabs.com>
Date: Tue, 29 Jan 2019 18:57:04 +0530
Subject: [PATCH 884/932] Create universal solution for success icon vertically
 middle and other icon along with it

---
 .../backend/web/css/source/components/_messages.less | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
index 8a0af06cfdb5b..19d076bd20cc5 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less
@@ -76,7 +76,8 @@
         position: absolute;
         speak: none;
         text-shadow: none;
-        top: 1.5rem;
+        top: 50%;
+        margin-top: -1.25rem;
         width: auto;
     }
 }
@@ -121,15 +122,6 @@
     }
 }
 
-.adminhtml-import-index   {
-    .message-success {
-        &:before {
-            color: @alert-icon__success__color;
-            content: @alert-icon__success__content;
-            top: 2.3rem;
-        }
-    }
-}
 .message-spinner {
     &:before {
         display: none;

From 2b9366f21d169e07cb2102746963a172d43d07e4 Mon Sep 17 00:00:00 2001
From: Arvinda kumar <arvindakumar@cedcommerce.com>
Date: Tue, 29 Jan 2019 19:13:10 +0530
Subject: [PATCH 885/932] _payment-options.less updated

_payment-options.less updated
---
 .../web/css/source/module/checkout/_payment-options.less  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
index 47754c9acee4d..3b584bc26fe34 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less
@@ -69,8 +69,12 @@
 
         .payment-option-content {
             .lib-css(padding, 0 0 @indent__base @checkout-payment-option-content__padding__xl);
-            .action-apply {
-                margin-right: 0;
+            .primary {
+                .action {
+                    &.action-apply {
+                        margin-right: 0;
+                    }
+                }
             }
         }
 

From 3167a47c17643582832637a976cb624bdd90cdf7 Mon Sep 17 00:00:00 2001
From: Andrii Meysar <andrii.meysar@transoftgroup.com>
Date: Tue, 29 Jan 2019 16:59:53 +0200
Subject: [PATCH 886/932] MAGETWO-97953: Automate with Integration test Verify
 Email functionality for order

---
 .../TestCase/AbstractBackendController.php    |   4 +-
 .../Adminhtml/Order/Create/SaveTest.php       | 160 +++++++++++++++++-
 .../AbstractCreditmemoControllerTest.php      |  92 ++++++++++
 .../Order/Creditmemo/AddCommentTest.php       | 102 +++++++++++
 .../Adminhtml/Order/Creditmemo/SaveTest.php   |  99 +++++++++++
 .../Controller/Adminhtml/Order/EmailTest.php  | 136 +++++++++++++++
 .../Invoice/AbstractInvoiceControllerTest.php |  92 ++++++++++
 .../Order/Invoice/AddCommentTest.php          | 103 +++++++++++
 .../Adminhtml/Order/Invoice/EmailTest.php     |  88 ++++++++++
 .../Adminhtml/Order/Invoice/SaveTest.php      |  97 +++++++++++
 .../Magento/Sales/Model/Order/CreateTest.php  | 100 +++++++++++
 .../_files/guest_quote_with_addresses.php     |  68 ++++++++
 .../guest_quote_with_addresses_rollback.php   |  32 ++++
 .../AbstractShipmentControllerTest.php        |  92 ++++++++++
 .../Order/Shipment/AddCommentTest.php         | 102 +++++++++++
 .../Adminhtml/Order/Shipment/SaveTest.php     |  97 +++++++++++
 16 files changed, 1458 insertions(+), 6 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php

diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
index b2e0b57bae729..7a387bd41eec2 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\TestFramework\TestCase;
 
-use Magento\Framework\App\Request\Http as HttpRequest;
-
 /**
  * A parent class for backend controllers - contains directives for admin user creation and authentication.
  *
@@ -122,7 +120,7 @@ public function testAclHasAccess()
      */
     public function testAclNoAccess()
     {
-        if ($this->resource === null) {
+        if ($this->resource === null || $this->uri === null) {
             $this->markTestIncomplete('Acl test is not complete');
         }
         if ($this->httpMethod) {
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
index e2638b5df1f88..f863edd049258 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/SaveTest.php
@@ -9,21 +9,61 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Request\Http;
+use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
 use Magento\Sales\Model\Service\OrderService;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
 use Magento\TestFramework\TestCase\AbstractBackendController;
+use PHPUnit\Framework\Constraint\StringContains;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
+/**
+ * Class test backend order save.
+ *
+ * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class SaveTest extends AbstractBackendController
 {
+    /**
+     * @var TransportBuilderMock
+     */
+    private $transportBuilder;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::create';
+
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_create/save';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
     /**
      * Checks a case when order creation is failed on payment method processing but new customer already created
      * in the database and after new controller dispatching the customer should be already loaded in session
      * to prevent invalid validation.
      *
-     * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/Sales/_files/quote_with_new_customer.php
      */
     public function testExecuteWithPaymentOperation()
@@ -36,7 +76,7 @@ public function testExecuteWithPaymentOperation()
         $email = 'john.doe001@test.com';
         $data = [
             'account' => [
-                'email' => $email
+                'email' => $email,
             ]
         ];
         $this->getRequest()->setMethod(Http::METHOD_POST);
@@ -66,13 +106,52 @@ public function testExecuteWithPaymentOperation()
         $this->_objectManager->removeSharedInstance(OrderService::class);
     }
 
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     *
+     * @return void
+     */
+    public function testSendEmailOnOrderSave(): void
+    {
+        $this->prepareRequest(['send_confirmation' => true]);
+        $this->dispatch('backend/sales/order_create/save');
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You created the order.')]),
+            MessageInterface::TYPE_SUCCESS
+        );
+
+        $this->assertRedirect($this->stringContains('sales/order/view/'));
+
+        $orderId = $this->getOrderId();
+        if ($orderId === false) {
+            $this->fail('Order is not created.');
+        }
+        $order = $this->getOrder($orderId);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
+        $assert = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $order->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Order <span class=\"no-link\">#{$order->getIncrementId()}</span>"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $assert);
+    }
+
     /**
      * Gets quote by reserved order id.
      *
      * @param string $reservedOrderId
      * @return \Magento\Quote\Api\Data\CartInterface
      */
-    private function getQuote($reservedOrderId)
+    private function getQuote(string $reservedOrderId): \Magento\Quote\Api\Data\CartInterface
     {
         /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
         $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
@@ -82,6 +161,81 @@ private function getQuote($reservedOrderId)
         /** @var CartRepositoryInterface $quoteRepository */
         $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
         $items = $quoteRepository->getList($searchCriteria)->getItems();
+
         return array_pop($items);
     }
+
+    /**
+     * @inheritdoc
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param int $orderId
+     * @return OrderInterface
+     */
+    private function getOrder(int $orderId): OrderInterface
+    {
+        return $this->_objectManager->get(OrderRepository::class)->get($orderId);
+    }
+
+    /**
+     * @param array $params
+     * @return void
+     */
+    private function prepareRequest(array $params = []): void
+    {
+        $quote = $this->getQuote('guest_quote');
+        $session = $this->_objectManager->get(Quote::class);
+        $session->setQuoteId($quote->getId());
+        $session->setCustomerId(0);
+
+        $email = 'john.doe001@test.com';
+        $data = [
+            'account' => [
+                'email' => $email,
+            ],
+        ];
+
+        $data = array_replace_recursive($data, $params);
+
+        $this->getRequest()
+            ->setMethod('POST')
+            ->setParams(['form_key' => $this->formKey->getFormKey()])
+            ->setPostValue(['order' => $data]);
+    }
+
+    /**
+     * @return string|bool
+     */
+    protected function getOrderId()
+    {
+        $currentUrl = $this->getResponse()->getHeader('Location');
+        $orderId = false;
+
+        if (preg_match('/order_id\/(?<order_id>\d+)/', $currentUrl, $matches)) {
+            $orderId = $matches['order_id'] ?? '';
+        }
+
+        return $orderId;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php
new file mode 100644
index 0000000000000..2a7731715021b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AbstractCreditmemoControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Sales\Api\Data\CreditmemoInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Abstract backend creditmemo test.
+ */
+class AbstractCreditmemoControllerTest extends AbstractBackendController
+{
+    /**
+     * @var TransportBuilderMock
+     */
+    protected $transportBuilder;
+
+    /**
+     * @var OrderRepository
+     */
+    protected $orderRepository;
+
+    /**
+     * @var FormKey
+     */
+    protected $formKey;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::sales_creditmemo';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
+    /**
+     * @param string $incrementalId
+     * @return OrderInterface|null
+     */
+    protected function getOrder(string $incrementalId)
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+            ->create();
+
+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+        /** @var OrderInterface|null $order */
+        $order = reset($orders);
+
+        return $order;
+    }
+
+    /**
+     * @param OrderInterface $order
+     * @return CreditmemoInterface
+     */
+    protected function getCreditMemo(OrderInterface $order): CreditmemoInterface
+    {
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection $creditMemoCollection */
+        $creditMemoCollection = $this->_objectManager->create(
+            \Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory::class
+        )->create();
+
+        /** @var CreditmemoInterface $creditMemo */
+        $creditMemo = $creditMemoCollection
+            ->setOrderFilter($order)
+            ->setPageSize(1)
+            ->getFirstItem();
+
+        return $creditMemo;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
new file mode 100644
index 0000000000000..2f23da8b3db87
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
+
+use PHPUnit\Framework\Constraint\RegularExpression;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies creditmemo add comment functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/creditmemo_for_get.php
+ */
+class AddCommentTest extends AbstractCreditmemoControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_creditmemo/addComment';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnAddCreditmemoComment(): void
+    {
+        $comment = 'Test Credit Memo Comment';
+        $order = $this->prepareRequest(
+            [
+                'comment' => ['comment' => $comment, 'is_customer_notified' => true],
+            ]
+        );
+        $this->dispatch('backend/sales/order_creditmemo/addComment');
+        $html = $this->getResponse()->getBody();
+        $this->assertContains($comment, $html);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject =__('Update to your %1 credit memo', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new RegularExpression(
+                sprintf(
+                    "/Your order #%s has been updated with a status of.*%s/",
+                    $order->getIncrementId(),
+                    $order->getFrontendStatusLabel()
+                )
+            ),
+            new StringContains($comment)
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $creditmemo = $this->getCreditMemo($order);
+
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'id' => $creditmemo->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
new file mode 100644
index 0000000000000..fa5da2e0e50d1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/SaveTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
+
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class tests creditmemo creation in backend.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/invoice.php
+ */
+class SaveTest extends AbstractCreditmemoControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_creditmemo/save';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnCreditmemoSave(): void
+    {
+        $order = $this->prepareRequest(['creditmemo' => ['send_email' => true]]);
+        $this->dispatch('backend/sales/order_creditmemo/save');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You created the credit memo.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
+
+        $creditMemo = $this->getCreditMemo($order);
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Credit memo for your %1 order', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $creditMemo->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Credit Memo #{$creditMemo->getIncrementId()} for Order #{$order->getIncrementId()}"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'order_id' => $order->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = ['creditmemo' => ['do_offline' => true]];
+        $data = array_replace_recursive($data, $params);
+
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
new file mode 100644
index 0000000000000..4d19106ad8e51
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/EmailTest.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies order send email functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+class EmailTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+{
+    /**
+     * @var OrderRepository
+     */
+    private $orderRepository;
+
+    /**
+     * @var TransportBuilderMock
+     */
+    private $transportBuilder;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::email';
+
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order/email';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+    }
+
+    /**
+     * @return void
+     */
+    public function testSendOrderEmail(): void
+    {
+        $order = $this->prepareRequest();
+        $this->dispatch('backend/sales/order/email');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You sent the order email.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+
+        $redirectUrl = 'sales/order/view/order_id/' . $order->getEntityId();
+        $this->assertRedirect($this->stringContains($redirectUrl));
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
+        $assert = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $order->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Order <span class=\"no-link\">#{$order->getIncrementId()}</span>"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $assert);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param string $incrementalId
+     * @return OrderInterface|null
+     */
+    private function getOrder(string $incrementalId)
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+            ->create();
+
+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+        /** @var OrderInterface|null $order */
+        $order = reset($orders);
+
+        return $order;
+    }
+
+    /**
+     * @return OrderInterface|null
+     */
+    private function prepareRequest()
+    {
+        $order = $this->getOrder('100000001');
+        $this->getRequest()->setParams(['order_id' => $order->getEntityId()]);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php
new file mode 100644
index 0000000000000..3ba54418b6c26
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AbstractInvoiceControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Sales\Api\Data\InvoiceInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Abstract backend invoice test.
+ */
+class AbstractInvoiceControllerTest extends AbstractBackendController
+{
+    /**
+     * @var TransportBuilderMock
+     */
+    protected $transportBuilder;
+
+    /**
+     * @var OrderRepository
+     */
+    protected $orderRepository;
+
+    /**
+     * @var FormKey
+     */
+    protected $formKey;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::sales_invoice';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
+    /**
+     * @param string $incrementalId
+     * @return OrderInterface|null
+     */
+    protected function getOrder(string $incrementalId)
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+            ->create();
+
+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+        /** @var OrderInterface $order */
+        $order = reset($orders);
+
+        return $order;
+    }
+
+    /**
+     * @param OrderInterface $order
+     * @return InvoiceInterface
+     */
+    protected function getInvoiceByOrder(OrderInterface $order): InvoiceInterface
+    {
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Invoice\Collection $invoiceCollection */
+        $invoiceCollection = $this->_objectManager->create(
+            \Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory::class
+        )->create();
+
+        /** @var InvoiceInterface $invoice */
+        $invoice = $invoiceCollection
+            ->setOrderFilter($order)
+            ->setPageSize(1)
+            ->getFirstItem();
+
+        return $invoice;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
new file mode 100644
index 0000000000000..81e1dd7afc496
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
+
+use PHPUnit\Framework\Constraint\RegularExpression;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies invoice add comment functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/invoice.php
+ */
+class AddCommentTest extends AbstractInvoiceControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_invoice/addComment';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnAddInvoiceComment(): void
+    {
+        $comment = 'Test Invoice Comment';
+        $order = $this->prepareRequest(
+            [
+                'comment' => ['comment' => $comment, 'is_customer_notified' => true],
+            ]
+        );
+        $this->dispatch('backend/sales/order_invoice/addComment');
+
+        $html = $this->getResponse()->getBody();
+        $this->assertContains($comment, $html);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Update to your %1 invoice', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new RegularExpression(
+                sprintf(
+                    "/Your order #%s has been updated with a status of.*%s/",
+                    $order->getIncrementId(),
+                    $order->getFrontendStatusLabel()
+                )
+            ),
+            new StringContains($comment)
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest(['comment' => ['comment' => 'Comment']]);
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $invoice = $this->getInvoiceByOrder($order);
+
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'id' => $invoice->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php
new file mode 100644
index 0000000000000..85223528ec82a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/EmailTest.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
+
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies invoice send email functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/invoice.php
+ */
+class EmailTest extends AbstractInvoiceControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_invoice/email';
+
+    /**
+     * @return void
+     */
+    public function testSendInvoiceEmail(): void
+    {
+        $order = $this->getOrder('100000001');
+        $invoice = $this->getInvoiceByOrder($order);
+
+        $this->getRequest()->setParams(['invoice_id' => $invoice->getEntityId()]);
+        $this->dispatch('backend/sales/order_invoice/email');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('You sent the message.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+
+        $redirectUrl = sprintf(
+            'sales/invoice/view/order_id/%s/invoice_id/%s',
+            $order->getEntityId(),
+            $invoice->getEntityId()
+        );
+        $this->assertRedirect($this->stringContains($redirectUrl));
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Invoice for your %1 order', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($invoice->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $invoice->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Invoice #{$invoice->getIncrementId()} for Order #{$order->getIncrementId()}"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $order = $this->getOrder('100000001');
+        $invoice = $this->getInvoiceByOrder($order);
+        $this->uri .= '/invoice_id/' . $invoice->getEntityId();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $order = $this->getOrder('100000001');
+        $invoice = $this->getInvoiceByOrder($order);
+        $this->uri .= '/invoice_id/' . $invoice->getEntityId();
+
+        parent::testAclNoAccess();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
new file mode 100644
index 0000000000000..68074e38d9a39
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
+
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class tests invoice creation in backend.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+class SaveTest extends AbstractInvoiceControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/sales/order_invoice/save';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnInvoiceSave(): void
+    {
+        $order = $this->prepareRequest(['invoice' => ['send_email' => true]]);
+        $this->dispatch('backend/sales/order_invoice/save');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('The invoice has been created.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
+
+        $invoice = $this->getInvoiceByOrder($order);
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Invoice for your %1 order', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($invoice->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $invoice->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Invoice #{$invoice->getIncrementId()} for Order #{$order->getIncrementId()}"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'order_id' => $order->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php
new file mode 100644
index 0000000000000..1035ce1592314
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/CreateTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\Order;
+
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\GuestCartManagementInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies order creation.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea frontend
+ */
+class CreateTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var TransportBuilderMock
+     */
+    private $transportBuilder;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->transportBuilder = $this->objectManager->get(TransportBuilderMock::class);
+        $this->quoteIdMaskFactory = $this->objectManager->get(QuoteIdMaskFactory::class);
+        $this->formKey = $this->objectManager->get(FormKey::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     * @return void
+     */
+    public function testSendEmailOnOrderPlace(): void
+    {
+        /** @var Quote $quote */
+        $quote = $this->objectManager->create(Quote::class);
+        $quote->load('guest_quote', 'reserved_order_id');
+
+        $checkoutSession = $this->objectManager->get(CheckoutSession::class);
+        $checkoutSession->setQuoteId($quote->getId());
+
+        /** @var QuoteIdMask $quoteIdMask */
+        $quoteIdMask = $this->quoteIdMaskFactory->create();
+        $quoteIdMask->load($quote->getId(), 'quote_id');
+        $cartId = $quoteIdMask->getMaskedId();
+
+        /** @var GuestCartManagementInterface $cartManagement */
+        $cartManagement = $this->objectManager->get(GuestCartManagementInterface::class);
+        $orderId = $cartManagement->placeOrder($cartId);
+        $order = $this->objectManager->get(OrderRepository::class)->get($orderId);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Your %1 order confirmation', $order->getStore()->getFrontendName())->render();
+        $assert = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $order->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Order <span class=\"no-link\">#{$order->getIncrementId()}</span>"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $assert);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php
new file mode 100644
index 0000000000000..b8f2ca38e2489
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/address_list.php';
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Model\Product $product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId('simple')
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setName('Simple Product')
+    ->setSku('simple-product-guest-quote')
+    ->setPrice(10)
+    ->setTaxClassId(0)
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'qty' => 100,
+            'is_in_stock' => 1,
+        ]
+    )->save();
+
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$product = $productRepository->get('simple-product-guest-quote');
+
+$addressData = reset($addresses);
+
+$billingAddress = $objectManager->create(
+    \Magento\Quote\Model\Quote\Address::class,
+    ['data' => $addressData]
+);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+$store = $objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore();
+
+/** @var \Magento\Quote\Model\Quote $quote */
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->setCustomerIsGuest(true)
+    ->setStoreId($store->getId())
+    ->setReservedOrderId('guest_quote')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->addProduct($product);
+$quote->getPayment()->setMethod('checkmo');
+$quote->getShippingAddress()->setShippingMethod('flatrate_flatrate')->setCollectShippingRates(true);
+$quote->collectTotals();
+
+$quoteRepository = $objectManager->create(\Magento\Quote\Api\CartRepositoryInterface::class);
+$quoteRepository->save($quote);
+
+/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+$quoteIdMask = $objectManager->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php
new file mode 100644
index 0000000000000..02c42153b72c3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses_rollback.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var \Magento\Framework\Registry $registry */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var $quote \Magento\Quote\Model\Quote */
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+$quote->load('guest_quote', 'reserved_order_id');
+if ($quote->getId()) {
+    $quote->delete();
+}
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('simple-product-guest-quote', false, null, true);
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php
new file mode 100644
index 0000000000000..0a1926d58624c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AbstractShipmentControllerTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
+
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Model\OrderRepository;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Abstract backend shipment test.
+ */
+class AbstractShipmentControllerTest extends AbstractBackendController
+{
+    /**
+     * @var TransportBuilderMock
+     */
+    protected $transportBuilder;
+
+    /**
+     * @var OrderRepository
+     */
+    protected $orderRepository;
+
+    /**
+     * @var FormKey
+     */
+    protected $formKey;
+
+    /**
+     * @var string
+     */
+    protected $resource = 'Magento_Sales::shipment';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
+        $this->orderRepository = $this->_objectManager->get(OrderRepository::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
+    /**
+     * @param string $incrementalId
+     * @return OrderInterface|null
+     */
+    protected function getOrder(string $incrementalId)
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->_objectManager->create(SearchCriteriaBuilder::class)
+            ->addFilter(OrderInterface::INCREMENT_ID, $incrementalId)
+            ->create();
+
+        $orders = $this->orderRepository->getList($searchCriteria)->getItems();
+        /** @var OrderInterface|null $order */
+        $order = reset($orders);
+
+        return $order;
+    }
+
+    /**
+     * @param OrderInterface $order
+     * @return ShipmentInterface
+     */
+    protected function getShipment(OrderInterface $order): ShipmentInterface
+    {
+        /** @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Collection $shipmentCollection */
+        $shipmentCollection = $this->_objectManager->create(
+            \Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory::class
+        )->create();
+
+        /** @var ShipmentInterface $shipment */
+        $shipment = $shipmentCollection
+            ->setOrderFilter($order)
+            ->setPageSize(1)
+            ->getFirstItem();
+
+        return $shipment;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
new file mode 100644
index 0000000000000..25a44bab62994
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
+
+use PHPUnit\Framework\Constraint\RegularExpression;
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies shipment add comment functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/shipment.php
+ */
+class AddCommentTest extends AbstractShipmentControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/admin/order_shipment/addComment';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnShipmentCommentAdd(): void
+    {
+        $comment = 'Test Shipment Comment';
+        $order = $this->prepareRequest(
+            [
+                'comment' => ['comment' => $comment, 'is_customer_notified' => true],
+            ]
+        );
+        $this->dispatch('backend/admin/order_shipment/addComment');
+        $html = $this->getResponse()->getBody();
+        $this->assertContains($comment, $html);
+
+        $message = $this->transportBuilder->getSentMessage();
+        $subject =__('Update to your %1 shipment', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new RegularExpression(
+                sprintf(
+                    "/Your order #%s has been updated with a status of.*%s/",
+                    $order->getIncrementId(),
+                    $order->getFrontendStatusLabel()
+                )
+            ),
+            new StringContains($comment)
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest(['comment', ['comment' => 'Comment']]);
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest(['comment', ['comment' => 'Comment']]);
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $shipment = $this->getShipment($order);
+
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'id' => $shipment->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
new file mode 100644
index 0000000000000..27b5bb02d4b22
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
+
+use PHPUnit\Framework\Constraint\StringContains;
+
+/**
+ * Class verifies shipment creation functionality.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ * @magentoDataFixture Magento/Sales/_files/order.php
+ */
+class SaveTest extends AbstractShipmentControllerTest
+{
+    /**
+     * @var string
+     */
+    protected $uri = 'backend/admin/order_shipment/save';
+
+    /**
+     * @return void
+     */
+    public function testSendEmailOnShipmentSave(): void
+    {
+        $order = $this->prepareRequest(['shipment' => ['send_email' => true]]);
+        $this->dispatch('backend/admin/order_shipment/save');
+
+        $this->assertSessionMessages(
+            $this->equalTo([(string)__('The shipment has been created.')]),
+            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertRedirect($this->stringContains('sales/order/view/order_id/' . $order->getEntityId()));
+
+        $shipment = $this->getShipment($order);
+        $message = $this->transportBuilder->getSentMessage();
+        $subject = __('Your %1 order has shipped', $order->getStore()->getFrontendName())->render();
+        $messageConstraint = $this->logicalAnd(
+            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains(
+                'Thank you for your order from ' . $shipment->getStore()->getFrontendName()
+            ),
+            new StringContains(
+                "Your Shipment #{$shipment->getIncrementId()} for Order #{$order->getIncrementId()}"
+            )
+        );
+
+        $this->assertEquals($message->getSubject(), $subject);
+        $this->assertThat($message->getRawMessage(), $messageConstraint);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclHasAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclHasAccess();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function testAclNoAccess()
+    {
+        $this->prepareRequest();
+
+        parent::testAclNoAccess();
+    }
+
+    /**
+     * @param array $params
+     * @return \Magento\Sales\Api\Data\OrderInterface|null
+     */
+    private function prepareRequest(array $params = [])
+    {
+        $order = $this->getOrder('100000001');
+        $this->getRequest()->setMethod('POST');
+        $this->getRequest()->setParams(
+            [
+                'order_id' => $order->getEntityId(),
+                'form_key' => $this->formKey->getFormKey(),
+            ]
+        );
+
+        $data = $params ?? [];
+        $this->getRequest()->setPostValue($data);
+
+        return $order;
+    }
+}

From 0f20ecc3021e8e7a39ecdfbac4da5314a5d314e5 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Tue, 29 Jan 2019 10:58:48 -0600
Subject: [PATCH 887/932] Fixed code style

---
 .../Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
index 291792a61d8ba..9e13e9424d1fd 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -8,6 +8,8 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
+ * Credit memo adjustmets block
+ *
  * @api
  * @since 100.0.2
  */

From 5e83478ae73ed965eed2a118d0926e34155861ba Mon Sep 17 00:00:00 2001
From: pganapat <prabhuramgr28493@gmail.com>
Date: Tue, 29 Jan 2019 11:41:49 -0600
Subject: [PATCH 888/932] MC-11034: Enable Paypal Credit option should be
 disabled/greyed out when a non-US merchant is chosen - Unit and static test
 fixes

---
 .../System/Config/Multiselect/DisabledFundingOptionsTest.php  | 4 ++--
 .../Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
index 507edf7ef306a..2c9a33ce43854 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Multiselect/DisabledFundingOptionsTest.php
@@ -11,7 +11,7 @@
 use \Magento\Framework\App\RequestInterface;
 use \Magento\Framework\View\Helper\Js;
 use \Magento\Paypal\Model\Config;
-use \Magento\Paypal\Block\Adminhtml\System\Config\Multiselect\DisabledFundingOptions;
+use \Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect\DisabledFundingOptions;
 use \Magento\Paypal\Model\Config\StructurePlugin;
 use \PHPUnit\Framework\TestCase;
 
@@ -139,4 +139,4 @@ private function getDefaultFundingOptions(): array
             ]
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
index 98a846ca56604..6bb2173e06f8d 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -293,7 +293,6 @@ public function testIsMethodActive()
         $this->config->isMethodActive('method');
     }
 
-
     /**
      * Check bill me later active setting uses disable funding options
      *

From 4c56bf0d06f43b5bb9aee51b5b4f3b9ed956c6a2 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Tue, 29 Jan 2019 11:53:28 -0600
Subject: [PATCH 889/932] MC-13747: Update ShipmentValidationRequest to DHL 6.0
 version

---
 app/code/Magento/Dhl/Model/Carrier.php                    | 8 ++------
 .../Dhl/Test/Unit/Model/_files/shipment_request.xml       | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 685831138831c..42716d73373a2 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1418,8 +1418,8 @@ protected function _doRequest()
             '<req:ShipmentRequest' .
             ' xmlns:req="http://www.dhl.com"' .
             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-            ' xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.2.xsd"' .
-            ' schemaVersion="6.2" />';
+            ' xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd"' .
+            ' schemaVersion="6.0" />';
         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
 
         $nodeRequest = $xml->addChild('Request', '', '');
@@ -1433,10 +1433,6 @@ protected function _doRequest()
         $nodeServiceHeader->addChild('SiteID', (string)$this->getConfigData('id'));
         $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
 
-        $nodeMetaData = $nodeRequest->addChild('MetaData');
-        $nodeMetaData->addChild('SoftwareName', $this->buildSoftwareName());
-        $nodeMetaData->addChild('SoftwareVersion', $this->buildSoftwareVersion());
-
         $originRegion = $this->getCountryParams(
             $this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_COUNTRY_ID,
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
index e93753368f834..d411041c96072 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
+++ b/app/code/Magento/Dhl/Test/Unit/Model/_files/shipment_request.xml
@@ -6,7 +6,7 @@
  */
 -->
 <req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.2.xsd" schemaVersion="6.2">
+                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd" schemaVersion="6.0">
     <Request xmlns="">
         <ServiceHeader>
             <MessageTime>currentTime</MessageTime>
@@ -14,10 +14,6 @@
             <SiteID>some ID</SiteID>
             <Password>some password</Password>
         </ServiceHeader>
-        <MetaData>
-            <SoftwareName>Software_Product_Name_30_Char_</SoftwareName>
-            <SoftwareVersion>10Char_Ver</SoftwareVersion>
-        </MetaData>
     </Request>
     <RegionCode xmlns="">CHECKED</RegionCode>
     <RequestedPickupTime xmlns="">N</RequestedPickupTime>

From 13794ebb2387b666b7de61aaa4b15f75a587d374 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Tue, 29 Jan 2019 12:29:22 -0600
Subject: [PATCH 890/932] MC-11006: Build stabilization

---
 .../Model/Config/Structure/Reader/_files/expected/config.xml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index 30756aa0c9829..bc36bd1114cf1 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -1232,7 +1232,6 @@
                                     <label>Label</label>
                                     <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
                                     <config_path>paypal/style/checkout_page_button_label</config_path>
-                                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\ButtonStylesLabel</frontend_model>
                                     <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>

From e07214f886a2d0dc58601bfef58b480e03bf67d8 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Tue, 29 Jan 2019 12:44:54 -0600
Subject: [PATCH 891/932] MQE-1420: Bump MFTF version in Magento

- MFTF version bump
---
 composer.json |  2 +-
 composer.lock | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 62b3c95135669..3222de2d1fe0f 100644
--- a/composer.json
+++ b/composer.json
@@ -84,7 +84,7 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.13.0",
         "lusitanian/oauth": "~0.8.10",
-        "magento/magento2-functional-testing-framework": "~2.3.12",
+        "magento/magento2-functional-testing-framework": "~2.3.13",
         "pdepend/pdepend": "2.5.2",
         "phpmd/phpmd": "@stable",
         "phpunit/phpunit": "~6.5.0",
diff --git a/composer.lock b/composer.lock
index d24dfd2b612fc..697e7df3e19aa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e2fcf8723503311ee9fea99dece55225",
+    "content-hash": "3f58ddc5609e6a934ee3706006357646",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -2165,7 +2165,7 @@
                 },
                 {
                     "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
+                    "email": "backendtea@gmail.com"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -6503,23 +6503,24 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "2.3.12",
+            "version": "2.3.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "599004be3e14ebbe6fac77de2edbab934d70f19c"
+                "reference": "2c8a4c3557c9a8412eb2ea50ce3f69abc2f47ba1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/599004be3e14ebbe6fac77de2edbab934d70f19c",
-                "reference": "599004be3e14ebbe6fac77de2edbab934d70f19c",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/2c8a4c3557c9a8412eb2ea50ce3f69abc2f47ba1",
+                "reference": "2c8a4c3557c9a8412eb2ea50ce3f69abc2f47ba1",
                 "shasum": ""
             },
             "require": {
                 "allure-framework/allure-codeception": "~1.3.0",
-                "codeception/codeception": "~2.3.4",
+                "codeception/codeception": "~2.3.4 || ~2.4.0 ",
                 "consolidation/robo": "^1.0.0",
                 "epfremme/swagger-php": "^2.0",
+                "ext-curl": "*",
                 "flow/jsonpath": ">0.2",
                 "fzaninotto/faker": "^1.6",
                 "monolog/monolog": "^1.0",
@@ -6536,6 +6537,7 @@
                 "goaop/framework": "2.2.0",
                 "php-coveralls/php-coveralls": "^1.0",
                 "phpmd/phpmd": "^2.6.0",
+                "phpunit/phpunit": "~6.5.0 || ~7.0.0",
                 "rregeer/phpunit-coverage-check": "^0.1.4",
                 "sebastian/phpcpd": "~3.0 || ~4.0",
                 "squizlabs/php_codesniffer": "~3.2",
@@ -6570,7 +6572,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2018-12-19T17:04:11+00:00"
+            "time": "2019-01-29T15:31:14+00:00"
         },
         {
             "name": "mikey179/vfsStream",

From cb94c1391eba420f73e6c9ca9ffea1fba18d343b Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 29 Jan 2019 13:10:23 -0600
Subject: [PATCH 892/932] MC-13710: PayPal label "Credit" should be removed
 from label configuration when PayPal Credit is disabled from Disable Funding
 Options multi-select

---
 .../Field/Depends/ButtonStylesLabel.php       | 26 ++++++++++++
 .../MultiSelect/DisabledFundingOptions.php    | 14 ++++++-
 .../Paypal/Model/Config/Rules/Converter.php   |  1 +
 .../System/Config/Source/ButtonStyles.php     |  4 +-
 .../Unit/Model/Config/Rules/ConverterTest.php |  4 ++
 .../Paypal/etc/adminhtml/rules/payment_au.xml |  1 +
 .../Paypal/etc/adminhtml/rules/payment_ca.xml |  1 +
 .../Paypal/etc/adminhtml/rules/payment_de.xml |  1 +
 .../Paypal/etc/adminhtml/rules/payment_es.xml |  1 +
 .../Paypal/etc/adminhtml/rules/payment_fr.xml |  1 +
 .../Paypal/etc/adminhtml/rules/payment_gb.xml |  1 +
 .../Paypal/etc/adminhtml/rules/payment_hk.xml |  1 +
 .../Paypal/etc/adminhtml/rules/payment_it.xml |  1 +
 .../Paypal/etc/adminhtml/rules/payment_jp.xml |  1 +
 .../Paypal/etc/adminhtml/rules/payment_nz.xml |  1 +
 .../etc/adminhtml/rules/payment_other.xml     |  1 +
 .../Paypal/etc/adminhtml/rules/payment_us.xml |  7 ++++
 .../etc/adminhtml/system/express_checkout.xml |  1 +
 app/code/Magento/Paypal/etc/rules.xsd         |  1 +
 .../Paypal/view/adminhtml/web/js/rules.js     | 37 ++++++++++++++++-
 .../Paypal/view/adminhtml/web/js/solution.js  | 41 ++++++++++++++++++-
 .../Reader/_files/expected/config.xml         |  1 +
 22 files changed, 142 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php
new file mode 100644
index 0000000000000..94c3f5805d824
--- /dev/null
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends;
+
+use Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable;
+
+/**
+ * Class ButtonStylesLabel
+ */
+class ButtonStylesLabel extends AbstractEnable
+{
+    /**
+     * Getting the name of a UI attribute
+     *
+     * @return string
+     */
+    protected function getDataAttributeName(): string
+    {
+        return 'button-label';
+    }
+}
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
index 2b47a3b000a45..bad4dad4c0955 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php
@@ -7,16 +7,16 @@
 
 namespace Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect;
 
+use Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable;
 use Magento\Paypal\Model\Config\StructurePlugin;
 use Magento\Backend\Block\Template\Context;
 use Magento\Paypal\Model\Config;
 use Magento\Framework\Data\Form\Element\AbstractElement;
-use Magento\Config\Block\System\Config\Form\Field;
 
 /**
  * Class DisabledFundingOptions
  */
-class DisabledFundingOptions extends Field
+class DisabledFundingOptions extends AbstractEnable
 {
     /**
      * @var Config
@@ -53,6 +53,16 @@ public function render(AbstractElement $element)
         return parent::render($element);
     }
 
+    /**
+     * Getting the name of a UI attribute
+     *
+     * @return string
+     */
+    protected function getDataAttributeName(): string
+    {
+        return 'disable-funding-options';
+    }
+
     /**
      * Filters array for CREDIT
      *
diff --git a/app/code/Magento/Paypal/Model/Config/Rules/Converter.php b/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
index 2bae810a5fde1..2baedaa38f5a5 100644
--- a/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
+++ b/app/code/Magento/Paypal/Model/Config/Rules/Converter.php
@@ -63,6 +63,7 @@ protected function createEvents(\DOMElement $node)
             if ($this->hasNodeElement($child)) {
                 $result[$child->getAttribute('name')] = [
                     'value' => $child->getAttribute('value'),
+                    'include' => $child->getAttribute('include'),
                     'predicate' => $this->createPredicate($child),
                 ];
             }
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
index 15db3c5603328..8ad55d045ff1a 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Source/ButtonStyles.php
@@ -76,11 +76,11 @@ public function getLabel(): array
     {
         return [
             'checkout' => __('Checkout'),
-            'credit' => __('Credit'),
             'pay' => __('Pay'),
             'buynow' => __('Buy Now'),
             'paypal' => __('PayPal'),
-            'installment' => __('Installment')
+            'installment' => __('Installment'),
+            'credit' => __('Credit')
         ];
     }
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php
index c1a3a5d5bd999..e7e723f1f3a5f 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/Rules/ConverterTest.php
@@ -60,6 +60,7 @@ public function dataProviderExpectedData()
                                     'value' => '0',
                                     'predicate' => [
                                     ],
+                                    'include' => '',
                                 ],
                                 'event1' => [
                                     'value' => '1',
@@ -72,6 +73,7 @@ public function dataProviderExpectedData()
                                             'argument2' => 'argument2',
                                         ],
                                     ],
+                                    'include' => '',
                                 ],
                             ],
                         ],
@@ -109,6 +111,7 @@ public function dataProviderExpectedData()
                                 'event0' => [
                                     'value' => '0',
                                     'predicate' => [],
+                                    'include' => '',
                                 ],
                                 'event1' => [
                                     'value' => '1',
@@ -121,6 +124,7 @@ public function dataProviderExpectedData()
                                             'argument2' => 'argument2',
                                         ],
                                     ],
+                                    'include' => '',
                                 ],
                             ],
                         ],
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
index 99a6668c0153f..cbb95e376c9f4 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
@@ -132,6 +132,7 @@
             <rule type="conflict" event=":load">
                 <argument name="wps_other">wps_other</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
index a8aac92fccd6a..51297a96438d2 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
@@ -207,6 +207,7 @@
             <rule type="paypalExpressLockConfigurationConditional" event=":load">
                 <argument name="payflow_link_ca">payflow_link_ca</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml
index fd570c9822f25..46c61b52b75dc 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_de.xml
@@ -26,6 +26,7 @@
             <rule type="inContextActivate" event="activate-in-context-api"/>
             <rule type="inContextDeactivate" event="deactivate-in-context-api"/>
             <rule type="inContextDisableConditional" event=":load"/>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
index fd2bcb266763c..28cc075e0c619 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_es.xml
@@ -95,6 +95,7 @@
             <rule type="conflict" event=":load">
                 <argument name="wps_other">wps_other</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
index da0c1bd635347..7f1fcc08334fe 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_fr.xml
@@ -95,6 +95,7 @@
             <rule type="conflict" event=":load">
                 <argument name="wps_other">wps_other</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
index a809817fe9b3d..565962518881b 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_gb.xml
@@ -95,6 +95,7 @@
             <rule type="conflict" event=":load">
                 <argument name="wps_express">wps_express</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
index 1c5dbaf22f977..50ce14e66ee0c 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_hk.xml
@@ -95,6 +95,7 @@
             <rule type="conflict" event=":load">
                 <argument name="wps_other">wps_other</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
index 2fe4ad78d4bff..de059dcc59c39 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_it.xml
@@ -95,6 +95,7 @@
             <rule type="conflict" event=":load">
                 <argument name="wps_other">wps_other</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
index e6fe55aa90493..d9fc7ef3f201c 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_jp.xml
@@ -95,6 +95,7 @@
             <rule type="conflict" event=":load">
                 <argument name="wps_other">wps_other</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
index 79309bcee7015..c5b8b09c3a2cf 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_nz.xml
@@ -95,6 +95,7 @@
             <rule type="conflict" event=":load">
                 <argument name="wps_other">wps_other</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
index a4118cc964fc6..972cc45505ecb 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_other.xml
@@ -64,6 +64,7 @@
             <rule type="conflict" event=":load">
                 <argument name="wps_other">wps_other</argument>
             </rule>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
index 02cb608c07c8a..b7924e770aa22 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/rules/payment_us.xml
@@ -396,6 +396,10 @@
             <event value="0" name="deactivate-in-context-api"/>
             <event value="1" name="activate-in-context-api"/>
         </events>
+        <events selector="[data-enable='disable-funding-options']">
+            <event value="CREDIT" include="true" name="remove-option"/>
+            <event value="CREDIT" include="false" name="add-option"/>
+        </events>
         <relation target="wps_express">
             <rule type="disable" event="activate-rule"/>
         </relation>
@@ -433,6 +437,9 @@
                 <argument name="paypal_payflowpro_with_express_checkout">paypal_payflowpro_with_express_checkout</argument>
                 <argument name="payflow_link_us">payflow_link_us</argument>
             </rule>
+            <rule type="removeCreditOption" event="remove-option"/>
+            <rule type="addCreditOption" event="add-option"/>
+            <rule type="removeCreditOptionConditional" event=":load"/>
         </relation>
     </payment>
 </rules>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 1d25a664bb1df..7abefbe1a674e 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -662,6 +662,7 @@
                             <label>Label</label>
                             <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
                             <config_path>paypal/style/checkout_page_button_label</config_path>
+                            <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\ButtonStylesLabel</frontend_model>
                             <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
                             <depends>
                                 <field id="checkout_page_button_customize">1</field>
diff --git a/app/code/Magento/Paypal/etc/rules.xsd b/app/code/Magento/Paypal/etc/rules.xsd
index 9a274a2dbd1cc..c4385396cc0c9 100644
--- a/app/code/Magento/Paypal/etc/rules.xsd
+++ b/app/code/Magento/Paypal/etc/rules.xsd
@@ -31,6 +31,7 @@
         </xs:sequence>
         <xs:attribute type="xs:string" name="value" use="required"/>
         <xs:attribute type="xs:string" name="name" use="required"/>
+        <xs:attribute type="xs:boolean" name="include" use="optional"/>
     </xs:complexType>
     <xs:complexType name="predicate">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
index 4a5248cb87587..255f2ea3cf9fa 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
@@ -585,6 +585,41 @@ define([
                     'Please re-enable the previously enabled payment solutions.'
                 });
             }
-        }
+        },
+
+        /**
+         * @param {*} $target
+         * @param {*} $owner
+         * @param {Object} data
+         */
+        removeCreditOption: function ($target, $owner, data) {
+            if ($target.find(data.dependsButtonLabel + ' option[value="credit"]').length > 0) {
+                $target.find(data.dependsButtonLabel + ' option[value="credit"]').remove();
+            }
+        },
+
+        /**
+         * @param {*} $target
+         * @param {*} $owner
+         * @param {Object} data
+         */
+        addCreditOption: function ($target, $owner, data) {
+            if ($target.find(data.dependsButtonLabel + ' option[value="credit"]').length === 0) {
+                $target.find(data.dependsButtonLabel).append('<option value="credit">Credit</option>');
+            }
+        },
+
+        /**
+         * @param {*} $target
+         * @param {*} $owner
+         * @param {Object} data
+         */
+        removeCreditOptionConditional: function ($target, $owner, data) {
+            if ($target.find(data.dependsDisableFundingOptions + ' option[value="CREDIT"]').length === 0 ||
+                $target.find(data.dependsDisableFundingOptions + ' option[value="CREDIT"]:selected').length > 0
+            ) {
+                this.removeCreditOption($target, $owner, data);
+            }
+        },
     });
 });
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
index 3d832db09aa87..14643f45124cb 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
@@ -65,6 +65,18 @@ define([
              */
             dependsBmlApiSortOrder:    '[data-enable="bml-api-sort-order"]',
 
+            /**
+             * An attribute of the element responsible for the visibility of the
+             * button Label credit option (data attribute)
+             */
+            dependsButtonLabel: '[data-enable="button-label"]',
+
+            /**
+             * An attribute of the element responsible for the visibility of the
+             * button Label credit option on load (data attribute)
+             */
+            dependsDisableFundingOptions: '[data-enable="disable-funding-options"]',
+
             /**
              * Templates element selectors
              */
@@ -119,7 +131,9 @@ define([
                                 }
                             };
 
-                        if (solution.getValue($(this)) === elementEvent.value) {
+                        if (solution.getValue($(this)) === elementEvent.value ||
+                            solution.getMultiselectValue($(this), elementEvent)
+                        ) {
                             if (predicate.name) {
                                 require([
                                     'Magento_Paypal/js/predicate/' + predicate.name
@@ -147,6 +161,29 @@ define([
             return $element.val();
         },
 
+        /**
+         * Get multiselect value
+         *
+         * @param {Object} $element
+         * @param {Object} elementEvent
+         * @returns {boolean}
+         */
+        getMultiselectValue: function($element, elementEvent) {
+            var value;
+
+            if (!$element.prop('multiple')) {
+                return false;
+            }
+
+            value = $.inArray(elementEvent.value, $element.val()) >= 0;
+
+            if (elementEvent.include) {
+                value = (value ? 'true' : 'false') === elementEvent.include;
+            }
+
+            return value;
+        },
+
         /**
          * Adding event listeners
          *
@@ -175,6 +212,8 @@ define([
                                 dependsMerchantId: this.dependsMerchantId,
                                 dependsBmlSortOrder: this.dependsBmlSortOrder,
                                 dependsBmlApiSortOrder: this.dependsBmlApiSortOrder,
+                                dependsButtonLabel: this.dependsButtonLabel,
+                                dependsDisableFundingOptions: this.dependsDisableFundingOptions,
                                 solutionsElements: this.solutionsElements,
                                 argument: instance.argument
                             }
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
index bc36bd1114cf1..222b9974177de 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml
@@ -1232,6 +1232,7 @@
                                     <label>Label</label>
                                     <comment><![CDATA[The installment feature is available only in these locales: en_MX, es_MX, en_BR, pt_BR.]]></comment>
                                     <config_path>paypal/style/checkout_page_button_label</config_path>
+                                    <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends\ButtonStylesLabel</frontend_model>
                                     <source_model>Magento\Paypal\Model\System\Config\Source\ButtonStyles::getLabel</source_model>
                                     <depends>
                                         <field id="checkout_page_button_customize">1</field>

From 5916ec0d184a0132661b7d3d4f3ccc4d300e7f6f Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 29 Jan 2019 13:25:00 -0600
Subject: [PATCH 893/932] MC-11006: Build stabilization

---
 app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
index fd90e774fb377..dd3cf11b87ebe 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ConfigTest.php
@@ -246,7 +246,7 @@ public function testGetSpecificConfigPathPayPalStyles($name, $expectedValue, $ex
     {
         // _mapGenericStyleFieldset
         $this->scopeConfig->method('getValue')
-            ->with("paypal/style/{$name}")
+            ->with('paypal/style/' . $name)
             ->willReturn($expectedValue);
 
         $this->assertEquals($expectedResult, $this->model->getValue($name));
@@ -255,7 +255,7 @@ public function testGetSpecificConfigPathPayPalStyles($name, $expectedValue, $ex
     /**
      * @return array
      */
-    public function payPalStylesDataProvider()
+    public function payPalStylesDataProvider(): array
     {
         return [
             ['checkout_page_button_customize', 'value', 'value'],

From 7c0e94d33dc2c029eb352a3a075ab1530fce5b28 Mon Sep 17 00:00:00 2001
From: Tom Reece <treece@adobe.com>
Date: Tue, 29 Jan 2019 13:51:40 -0600
Subject: [PATCH 894/932] MC-4389: Convert UpdateVirtualProductEntityTest to
 MFTF

- Fix for stale element errors
---
 ...ProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml | 3 +--
 ...oductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml | 3 +--
 ...ualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml | 3 +--
 ...ctWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index 9bdc93e61e499..ce23c311006e1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -63,9 +63,8 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$categoryEntity.name$$]" requiredAction="true" stepKey="selectCategory"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
index d4ec5e410d9ff..1b0aa36189816 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -63,9 +63,8 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$categoryEntity.name$$]" requiredAction="true" stepKey="selectCategory"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 717d710b4a288..921ca06cfbeda 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -63,9 +63,8 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$categoryEntity.name$$]" requiredAction="true" stepKey="selectCategory"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 703a4e24cdca9..532214c897f82 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -63,9 +63,8 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
-        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
-        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$categoryEntity.name$$]" requiredAction="true" stepKey="selectCategory"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualTierPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>

From 47b2a9d25a8cc4ecb2be66797d5abe18e134d28b Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Tue, 29 Jan 2019 14:50:06 -0600
Subject: [PATCH 895/932] MC-13758: For product PayPal smart buttons displayed
 twice.

---
 .../Paypal/Block/Express/InContext/Minicart/SmartButton.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
index 5ce80813dd0e2..c6a17fa5efb9f 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
@@ -126,7 +126,8 @@ private function shouldRender(): bool
         return $this->payment->isAvailable($this->session->getQuote())
             && $this->isInContext()
             && $this->isVisibleOnCart()
-            && $this->getQuoteId();
+            && $this->getQuoteId()
+            && !$this->getIsInCatalogProduct();
     }
 
     /**

From 3bde66a9d2ea1d4938af23abfade4c1320ed68e6 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 29 Jan 2019 15:30:41 -0600
Subject: [PATCH 896/932] MC-13710: PayPal label "Credit" should be removed
 from label configuration when PayPal Credit is disabled from Disable Funding
 Options multi-select

---
 .../Field/Depends/ButtonStylesLabel.php       |  2 +-
 .../Paypal/view/adminhtml/web/js/rules.js     |  2 +-
 .../Paypal/view/adminhtml/web/js/solution.js  | 20 +++++++------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php
index 94c3f5805d824..82e0e55660638 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php
@@ -19,7 +19,7 @@ class ButtonStylesLabel extends AbstractEnable
      *
      * @return string
      */
-    protected function getDataAttributeName(): string
+    protected function getDataAttributeName()
     {
         return 'button-label';
     }
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js b/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
index 255f2ea3cf9fa..555d2a80a8610 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/rules.js
@@ -620,6 +620,6 @@ define([
             ) {
                 this.removeCreditOption($target, $owner, data);
             }
-        },
+        }
     });
 });
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
index 14643f45124cb..f828073a44faf 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
@@ -132,7 +132,7 @@ define([
                             };
 
                         if (solution.getValue($(this)) === elementEvent.value ||
-                            solution.getMultiselectValue($(this), elementEvent)
+                            ($(this).prop('multiple') && solution.checkMultiselectValue($(this), elementEvent))
                         ) {
                             if (predicate.name) {
                                 require([
@@ -162,26 +162,20 @@ define([
         },
 
         /**
-         * Get multiselect value
+         * Check multiselect value based on include value
          *
          * @param {Object} $element
          * @param {Object} elementEvent
-         * @returns {boolean}
+         * @returns {Boolean}
          */
-        getMultiselectValue: function($element, elementEvent) {
-            var value;
-
-            if (!$element.prop('multiple')) {
-                return false;
-            }
-
-            value = $.inArray(elementEvent.value, $element.val()) >= 0;
+        checkMultiselectValue: function($element, elementEvent) {
+            var isValueSelected = $.inArray(elementEvent.value, $element.val()) >= 0;
 
             if (elementEvent.include) {
-                value = (value ? 'true' : 'false') === elementEvent.include;
+                isValueSelected = (isValueSelected ? 'true' : 'false') === elementEvent.include;
             }
 
-            return value;
+            return isValueSelected;
         },
 
         /**

From 273d2dbd9fff141108ba9fb21e6b1fe56e91a01d Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Tue, 29 Jan 2019 21:50:18 -0600
Subject: [PATCH 897/932] MC-11006: Build stabilization

---
 .../Test/Unit/Model/SmartButtonConfigTest.php | 117 ++++++++++++++
 .../Unit/Model/_files/allowed_fundings.php    |  24 +++
 .../Test/Unit/Model/_files/default_styles.php |  37 +++++
 .../Unit/Model/_files/expected_config.php     | 146 ++++++++++++++++++
 .../Paypal/view/adminhtml/web/js/solution.js  |   4 +-
 5 files changed, 326 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
 create mode 100644 app/code/Magento/Paypal/Test/Unit/Model/_files/allowed_fundings.php
 create mode 100644 app/code/Magento/Paypal/Test/Unit/Model/_files/default_styles.php
 create mode 100644 app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
new file mode 100644
index 0000000000000..ed62efe36c472
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Test\Unit\Model;
+
+use Magento\Paypal\Model\SmartButtonConfig;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Paypal\Model\ConfigFactory;
+
+class SmartButtonConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Paypal\Model\SmartButtonConfig
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeResolverMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    protected function setUp()
+    {
+        $this->localeResolverMock = $this->getMockForAbstractClass(ResolverInterface::class);
+        $this->configMock = $this->getMockBuilder(\Magento\Paypal\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var \PHPUnit_Framework_MockObject_MockObject $configFactoryMock */
+        $configFactoryMock = $this->getMockBuilder(ConfigFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $configFactoryMock->expects($this->once())->method('create')->willReturn($this->configMock);
+        $this->model = new SmartButtonConfig(
+            $this->localeResolverMock,
+            $configFactoryMock,
+            $this->getDefaultStyles(),
+            $this->getAllowedFundings()
+        );
+    }
+
+    /**
+     * @param string $page
+     * @param string $locale
+     * @param string $disallowedFundings
+     * @param string $layout
+     * @param string $size
+     * @param string $shape
+     * @param string $label
+     * @param string $color
+     * @param string $installmentPeriodLabel
+     * @param string $installmentPeriodLocale
+     * @param array $expected
+     * @dataProvider getConfigDataProvider
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function testGetConfig(
+        string $page,
+        string $locale,
+        bool $isCustomize,
+        ?string $disallowedFundings,
+        string $layout,
+        string $size,
+        string $shape,
+        string $label,
+        string $color,
+        string $installmentPeriodLabel,
+        string $installmentPeriodLocale,
+        array $expected = []
+    ) {
+        $this->localeResolverMock->expects($this->any())->method('getLocale')->willReturn($locale);
+        $this->configMock->expects($this->any())->method('getValue')->will($this->returnValueMap([
+            ['merchant_id', null, 'merchant'],
+            ['sandbox_flag', null, true],
+            ['disable_funding_options', null, $disallowedFundings],
+            ["{$page}_page_button_customize", null, $isCustomize],
+            ["{$page}_page_button_layout", null, $layout],
+            ["{$page}_page_button_size", null, $size],
+            ["{$page}_page_button_color", null, $color],
+            ["{$page}_page_button_shape", null, $shape],
+            ["{$page}_page_button_label", null, $label],
+            [$page . '_page_button_' . $installmentPeriodLocale . '_installment_period', null, $installmentPeriodLabel]
+        ]));
+
+        self::assertEquals($expected, $this->model->getConfig($page));
+    }
+
+    public function getConfigDataProvider()
+    {
+        return include __DIR__ . '/_files/expected_config.php';
+    }
+
+    /**
+     * @return array
+     */
+    private function getDefaultStyles()
+    {
+        return include __DIR__ . '/_files/default_styles.php';
+    }
+
+    /**
+     * @return array
+     */
+    private function getAllowedFundings()
+    {
+        return include __DIR__ . '/_files/allowed_fundings.php';
+    }
+}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/allowed_fundings.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/allowed_fundings.php
new file mode 100644
index 0000000000000..6b6f8ccb87e14
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/allowed_fundings.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    'checkout' => [
+        'CREDIT',
+        'ELV'
+    ],
+    'cart' => [
+        'CREDIT',
+        'ELV'
+    ],
+    'mini_cart' => [
+        'CREDIT',
+        'ELV'
+    ],
+    'product' => [
+        'CREDIT'
+    ]
+];
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/default_styles.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/default_styles.php
new file mode 100644
index 0000000000000..87da99ed2e178
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/default_styles.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    'checkout' => [
+        'layout' => 'vertical',
+        'size' => 'responsive',
+        'color' => 'gold',
+        'shape' => 'rect',
+        'label' =>'paypal'
+    ],
+    'cart' => [
+        'layout' => 'vertical',
+        'size' => 'responsive',
+        'color' => 'gold',
+        'shape' => 'rect',
+        'label' =>'paypal'
+    ],
+    'mini_cart' => [
+        'layout' => 'vertical',
+        'size' => 'responsive',
+        'color' => 'gold',
+        'shape' => 'rect',
+        'label' =>'paypal'
+    ],
+    'product' => [
+        'layout' => 'horizontal',
+        'size' => 'responsive',
+        'color' => 'gold',
+        'shape' => 'pill',
+        'label' =>'buynow'
+    ]
+];
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
new file mode 100644
index 0000000000000..3a76d11e51374
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+return [
+    'cart' => [
+        'cart',
+        'es_MX',
+        true,
+        'CREDIT',
+        'horizontal',
+        'small',
+        'pillow',
+        'installment',
+        'blue',
+        'my_label',
+        'mx',
+        [
+            'merchantId' => 'merchant',
+            'environment' => 'sandbox',
+            'locale' => 'es_MX',
+            'allowedFunding' => ['ELV'],
+            'disallowedFunding' => ['CREDIT'],
+            'styles' => [
+                'layout' => 'horizontal',
+                'size' => 'small',
+                'color' => 'blue',
+                'shape' => 'pillow',
+                'label' => 'installment',
+                'installmentperiod' => 0
+            ]
+        ]
+    ],
+    'checkout' => [
+        'cart',
+        'en_BR',
+        true,
+        null,
+        'horizontal',
+        'small',
+        'pillow',
+        'installment',
+        'blue',
+        'my_label',
+        'br',
+        [
+            'merchantId' => 'merchant',
+            'environment' => 'sandbox',
+            'locale' => 'en_BR',
+            'allowedFunding' => ['CREDIT', 'ELV'],
+            'disallowedFunding' => [],
+            'styles' => [
+                'layout' => 'horizontal',
+                'size' => 'small',
+                'color' => 'blue',
+                'shape' => 'pillow',
+                'label' => 'installment',
+                'installmentperiod' => 0
+            ]
+        ]
+    ],
+    'mini_cart' => [
+        'cart',
+        'en',
+        false,
+        null,
+        'horizontal',
+        'small',
+        'pillow',
+        'installment',
+        'blue',
+        'my_label',
+        'br',
+        [
+            'merchantId' => 'merchant',
+            'environment' => 'sandbox',
+            'locale' => 'en',
+            'allowedFunding' => ['CREDIT', 'ELV'],
+            'disallowedFunding' => [],
+            'styles' => [
+                'layout' => 'vertical',
+                'size' => 'responsive',
+                'color' => 'gold',
+                'shape' => 'rect',
+                'label' => 'paypal'
+            ]
+        ]
+    ],
+    'mini_cart' => [
+        'cart',
+        'en',
+        false,
+        null,
+        'horizontal',
+        'small',
+        'pillow',
+        'installment',
+        'blue',
+        'my_label',
+        'br',
+        [
+            'merchantId' => 'merchant',
+            'environment' => 'sandbox',
+            'locale' => 'en',
+            'allowedFunding' => ['CREDIT', 'ELV'],
+            'disallowedFunding' => [],
+            'styles' => [
+                'layout' => 'vertical',
+                'size' => 'responsive',
+                'color' => 'gold',
+                'shape' => 'rect',
+                'label' => 'paypal'
+            ]
+        ]
+    ],
+    'product' => [
+        'cart',
+        'en',
+        false,
+        'CREDIT',
+        'horizontal',
+        'small',
+        'pillow',
+        'installment',
+        'blue',
+        'my_label',
+        'br',
+        [
+            'merchantId' => 'merchant',
+            'environment' => 'sandbox',
+            'locale' => 'en',
+            'allowedFunding' => ['ELV'],
+            'disallowedFunding' => ['CREDIT'],
+            'styles' => [
+                'layout' => 'vertical',
+                'size' => 'responsive',
+                'color' => 'gold',
+                'shape' => 'rect',
+                'label' => 'paypal',
+            ]
+        ]
+    ]
+];
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
index f828073a44faf..3e4a1ab0ccc75 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
+++ b/app/code/Magento/Paypal/view/adminhtml/web/js/solution.js
@@ -132,7 +132,7 @@ define([
                             };
 
                         if (solution.getValue($(this)) === elementEvent.value ||
-                            ($(this).prop('multiple') && solution.checkMultiselectValue($(this), elementEvent))
+                            $(this).prop('multiple') && solution.checkMultiselectValue($(this), elementEvent)
                         ) {
                             if (predicate.name) {
                                 require([
@@ -168,7 +168,7 @@ define([
          * @param {Object} elementEvent
          * @returns {Boolean}
          */
-        checkMultiselectValue: function($element, elementEvent) {
+        checkMultiselectValue: function ($element, elementEvent) {
             var isValueSelected = $.inArray(elementEvent.value, $element.val()) >= 0;
 
             if (elementEvent.include) {

From 6e2f29c2946806478586b8f94ef37d63d392715f Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 30 Jan 2019 15:38:56 +0100
Subject: [PATCH 898/932] Removed unnecessary annotation

---
 .../testsuite/Magento/GraphQl/Quote/GetCartTest.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
index 2cd100fc0f758..e837afc65481e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
@@ -1,4 +1,4 @@
-<?php /** @noinspection SpellCheckingInspection */
+<?php
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.

From 99ea949d923dd0fc3bdb02058d2375fcf472b595 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Wed, 30 Jan 2019 10:30:26 -0600
Subject: [PATCH 899/932] magento-engcom/magento2ce#2518: Fixed code style
 issue

---
 .../base/web/js/form/element/post-code.js     |  4 +-
 .../blank/web/css/source/_sections.less       | 17 ++++----
 .../luma/web/css/source/_sections.less        | 39 ++++++++++---------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
index b8bab2f72f38a..1b6dd9f1c57ec 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/post-code.js
@@ -33,11 +33,11 @@ define([
             }
 
             option = options[value];
-            
+
             if (!option) {
                 return;
             }
-            
+
             if (option['is_zipcode_optional']) {
                 this.error(false);
                 this.validation = _.omit(this.validation, 'required-entry');
diff --git a/app/design/frontend/Magento/blank/web/css/source/_sections.less b/app/design/frontend/Magento/blank/web/css/source/_sections.less
index 25f8c71f22dd5..1eee47bda817c 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_sections.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_sections.less
@@ -31,16 +31,19 @@
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .product.data.items {
         .lib-data-accordion();
+
         .data.item {
             display: block;
         }
-      .item.title {
-        >.switch{
-          padding: 1px 15px 1px;
+
+        .item.title {
+            > .switch {
+                padding: 1px 15px 1px;
+            }
+        }
+
+        > .item.content {
+            padding: 10px 15px 30px;
         }
-      }
-      >.item.content{
-        padding: 10px 15px 30px;
-      }
     }
 }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_sections.less b/app/design/frontend/Magento/luma/web/css/source/_sections.less
index 38b936c83cb95..95769c4f4b6ba 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_sections.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_sections.less
@@ -19,16 +19,16 @@
             a {
                 position: relative;
                 .lib-icon-font(
-                @_icon-font-content: @icon-down,
-                @_icon-font-size: @font-size__base,
-                @_icon-font-line-height: @icon-font__line-height,
-                @_icon-font-color: @icon-font__color,
-                @_icon-font-color-hover: @icon-font__color-hover,
-                @_icon-font-color-active: @icon-font__color-active,
-                @_icon-font-margin: @icon-font__margin,
-                @_icon-font-vertical-align: @icon-font__vertical-align,
-                @_icon-font-position: after,
-                @_icon-font-display: false
+                    @_icon-font-content: @icon-down,
+                    @_icon-font-size: @font-size__base,
+                    @_icon-font-line-height: @icon-font__line-height,
+                    @_icon-font-color: @icon-font__color,
+                    @_icon-font-color-hover: @icon-font__color-hover,
+                    @_icon-font-color-active: @icon-font__color-active,
+                    @_icon-font-margin: @icon-font__margin,
+                    @_icon-font-vertical-align: @icon-font__vertical-align,
+                    @_icon-font-position: after,
+                    @_icon-font-display: false
                 );
 
                 &:after {
@@ -77,14 +77,15 @@
 }
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
-  .product.data.items{
-    .item.title {
-      >.switch{
-        padding: 1px 15px 1px;
-      }
-    }
-    >.item.content{
-      padding: 10px 15px 30px;
+    .product.data.items {
+        .item.title {
+            > .switch {
+                padding: 1px 15px 1px;
+            }
+        }
+
+        > .item.content {
+            padding: 10px 15px 30px;
+        }
     }
-  }
 }

From 69308c00554bba262883763d4ccbe180b10c0719 Mon Sep 17 00:00:00 2001
From: Oleksandr Miroshnichenko <omiroshnichenko@magento.com>
Date: Wed, 30 Jan 2019 16:40:30 -0600
Subject: [PATCH 900/932] MC-11043: Flaky MFTF Test - MAGETWO-93767: Use saved
 for Braintree credit card on checkout with selecting billing address

---
 .../Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
index bc6d6c2b46dc9..bf06bc7df5201 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml
@@ -6,24 +6,27 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontFillCartDataActionGroup">
         <arguments>
             <argument name="cartData" defaultValue="PaymentAndShippingInfo"/>
         </arguments>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.cartFrame}}" stepKey="switchToIframe"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.cartCode}}" stepKey="waitCartCodeElement"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.cartCode}}" userInput="{{cartData.cardNumber}}" stepKey="setCartCode"/>
         <switchToIFrame stepKey="switchBack"/>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.monthFrame}}" stepKey="switchToIframe1"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.month}}" stepKey="waitMonthElement"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.month}}" userInput="{{cartData.month}}" stepKey="setMonth"/>
         <switchToIFrame stepKey="switchBack1"/>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.yearFrame}}" stepKey="switchToIframe2"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.year}}" stepKey="waitYearElement"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.year}}" userInput="{{cartData.year}}" stepKey="setYear"/>
         <switchToIFrame stepKey="switchBack2"/>
         <switchToIFrame selector="{{BraintreeConfigurationPaymentSection.codeFrame}}" stepKey="switchToIframe3"/>
+        <waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" stepKey="waitVerificationNumber"/>
         <fillField selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" userInput="{{cartData.cvv}}" stepKey="setVerificationNumber"/>
         <switchToIFrame stepKey="SwitchBackToWindow"/>
-
     </actionGroup>
 
 </actionGroups>
\ No newline at end of file

From 73e762c8b08fb04dff3abdabbfdc58a717fdc258 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 30 Jan 2019 22:10:04 -0600
Subject: [PATCH 901/932] GraphQL-232: GraphQL tools cannot perform "standard
 introspection query" in production mode

---
 .../Framework/GraphQl/Query/QueryComplexityLimiter.php        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
index ba6439fc9b652..2b9ce9b01b5c4 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/QueryComplexityLimiter.php
@@ -61,7 +61,9 @@ public function __construct(
     public function execute(): void
     {
         DocumentValidator::addRule(new QueryComplexity($this->queryComplexity));
-        DocumentValidator::addRule(new DisableIntrospection((int) $this->introspectionConfig->isIntrospectionDisabled()));
+        DocumentValidator::addRule(
+            new DisableIntrospection((int) $this->introspectionConfig->isIntrospectionDisabled())
+        );
         DocumentValidator::addRule(new QueryDepth($this->queryDepth));
     }
 }

From d6a23379f7594e5189f93671181672c5add3e02d Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Wed, 30 Jan 2019 17:29:05 +0300
Subject: [PATCH 902/932] MAGETWO-96411: [2.3.x] Default addresses not selected
 when checking out from cart

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

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
index 2cc21df85ab67..4b3e18fb31877 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml
@@ -36,7 +36,6 @@
             <createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
             <createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
             <createData entity="DisablePaymentMethodsSettingConfig" stepKey="disablePaymentMethodsSettingConfig"/>
-            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
             <actionGroup ref="logout" stepKey="logout"/>
             <deleteData createDataKey="simpleproduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="simplecategory" stepKey="deleteCategory"/>
@@ -99,5 +98,6 @@
 
         <!--Verify that Created order is in Processing status-->
         <see selector="{{AdminShipmentOrderInformationSection.orderStatus}}" userInput="Processing" stepKey="seeShipmentOrderStatus"/>
+        <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
     </test>
 </tests>

From 21fb25a6ee34e5842c0d05997c6e2054a87ebb83 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Fri, 28 Sep 2018 14:03:50 +0300
Subject: [PATCH 903/932] MAGETWO-91676: Model related data missing in order
 rest api

- Fix added
- Fix unit tests added
---
 app/code/Magento/Sales/Model/Order.php        |  31 ++++-
 .../Sales/Test/Unit/Model/OrderTest.php       | 116 +++++++++++++++++-
 2 files changed, 137 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index a9c14be8675ab..e71b60427e9f2 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -23,6 +23,8 @@
 use Magento\Sales\Model\ResourceModel\Order\Shipment\Collection as ShipmentCollection;
 use Magento\Sales\Model\ResourceModel\Order\Shipment\Track\Collection as TrackCollection;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\Collection as HistoryCollection;
+use Magento\Sales\Api\OrderItemRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 
 /**
  * Order model
@@ -286,6 +288,16 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      */
     private $productOption;
 
+    /**
+     * @var OrderItemRepositoryInterface
+     */
+    private $itemRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -316,6 +328,8 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      * @param array $data
      * @param ResolverInterface $localeResolver
      * @param ProductOption|null $productOption
+     * @param OrderItemRepositoryInterface $itemRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -347,7 +361,9 @@ public function __construct(
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
         ResolverInterface $localeResolver = null,
-        ProductOption $productOption = null
+        ProductOption $productOption = null,
+        OrderItemRepositoryInterface $itemRepository = null,
+        SearchCriteriaBuilder $searchCriteriaBuilder = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_orderConfig = $orderConfig;
@@ -371,6 +387,10 @@ public function __construct(
         $this->priceCurrency = $priceCurrency;
         $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()->get(ResolverInterface::class);
         $this->productOption = $productOption ?: ObjectManager::getInstance()->get(ProductOption::class);
+        $this->itemRepository = $itemRepository ?: ObjectManager::getInstance()
+            ->get(OrderItemRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
+            ->get(SearchCriteriaBuilder::class);
 
         parent::__construct(
             $context,
@@ -668,7 +688,7 @@ private function canCreditmemoForZeroTotalRefunded($totalRefunded)
 
         return true;
     }
-    
+
     /**
      * Retrieve credit memo for zero total availability.
      *
@@ -2076,9 +2096,12 @@ public function getIncrementId()
     public function getItems()
     {
         if ($this->getData(OrderInterface::ITEMS) == null) {
+            $this->searchCriteriaBuilder->addFilter(OrderItemInterface::ORDER_ID, $this->getId());
+
+            $searchCriteria = $this->searchCriteriaBuilder->create();
             $this->setData(
                 OrderInterface::ITEMS,
-                $this->getItemsCollection()->getItems()
+                $this->itemRepository->getList($searchCriteria)->getItems()
             );
         }
         return $this->getData(OrderInterface::ITEMS);
@@ -2919,7 +2942,7 @@ public function getDiscountTaxCompensationRefunded()
     }
 
     /**
-     * Return hold_before_state
+     * Returns hold_before_state
      *
      * @return string|null
      */
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
index f724136eb5154..faee759273295 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -12,6 +12,10 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory as HistoryCollectionFactory;
+use Magento\Sales\Api\OrderItemRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Sales\Api\Data\OrderItemSearchResultInterface;
 
 /**
  * Test class for \Magento\Sales\Model\Order
@@ -87,6 +91,16 @@ class OrderTest extends \PHPUnit\Framework\TestCase
      */
     private $timezone;
 
+    /**
+     * @var OrderItemRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemRepository;
+
+    /**
+     * @var SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $searchCriteriaBuilder;
+
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -144,6 +158,15 @@ protected function setUp()
         $this->eventManager = $this->createMock(\Magento\Framework\Event\Manager::class);
         $context = $this->createPartialMock(\Magento\Framework\Model\Context::class, ['getEventDispatcher']);
         $context->expects($this->any())->method('getEventDispatcher')->willReturn($this->eventManager);
+
+        $this->itemRepository = $this->getMockBuilder(OrderItemRepositoryInterface::class)
+            ->setMethods(['getList'])
+            ->disableOriginalConstructor()->getMockForAbstractClass();
+
+        $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
+            ->setMethods(['addFilter', 'create'])
+            ->disableOriginalConstructor()->getMockForAbstractClass();
+
         $this->order = $helper->getObject(
             \Magento\Sales\Model\Order::class,
             [
@@ -157,37 +180,80 @@ protected function setUp()
                 'productListFactory' => $this->productCollectionFactoryMock,
                 'localeResolver' => $this->localeResolver,
                 'timezone' => $this->timezone,
+                'itemRepository' => $this->itemRepository,
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilder
             ]
         );
     }
 
-    public function testGetItemById()
+    /**
+     * Test testGetItems method.
+     */
+    public function testGetItems()
     {
-        $realOrderItemId = 1;
-        $fakeOrderItemId = 2;
+        $orderItems = [$this->item];
+
+        $this->searchCriteriaBuilder->expects($this->once())->method('addFilter')->willReturnSelf();
+
+        $searchCriteria = $this->getMockBuilder(SearchCriteria::class)
+            ->disableOriginalConstructor()->getMockForAbstractClass();
+        $this->searchCriteriaBuilder->expects($this->once())->method('create')->willReturn($searchCriteria);
 
-        $orderItem = $this->createMock(\Magento\Sales\Model\Order\Item::class);
+        $itemsCollection = $this->getMockBuilder(OrderItemSearchResultInterface::class)
+            ->setMethods(['getItems'])
+            ->disableOriginalConstructor()->getMockForAbstractClass();
+        $itemsCollection->expects($this->once())->method('getItems')->willReturn($orderItems);
+        $this->itemRepository->expects($this->once())->method('getList')->willReturn($itemsCollection);
 
+        $this->assertEquals($orderItems, $this->order->getItems());
+    }
+
+    /**
+     * Prepare order item mock.
+     *
+     * @param int $orderId
+     * @return void
+     */
+    private function prepareOrderItem(int $orderId = 0)
+    {
         $this->order->setData(
             \Magento\Sales\Api\Data\OrderInterface::ITEMS,
             [
-                $realOrderItemId => $orderItem
+                $orderId => $this->item
             ]
         );
+    }
 
-        $this->assertEquals($orderItem, $this->order->getItemById($realOrderItemId));
+    /**
+     * Test GetItemById method.
+     *
+     * @return void
+     */
+    public function testGetItemById()
+    {
+        $realOrderItemId = 1;
+        $fakeOrderItemId = 2;
+
+        $this->prepareOrderItem($realOrderItemId);
+
+        $this->assertEquals($this->item, $this->order->getItemById($realOrderItemId));
         $this->assertEquals(null, $this->order->getItemById($fakeOrderItemId));
     }
 
     /**
+     * Test GetItemByQuoteItemId method.
+     *
      * @param int|null $gettingQuoteItemId
      * @param int|null $quoteItemId
      * @param string|null $result
      *
      * @dataProvider dataProviderGetItemByQuoteItemId
+     * @return void
      */
     public function testGetItemByQuoteItemId($gettingQuoteItemId, $quoteItemId, $result)
     {
+        $this->prepareOrderItem();
+
         $this->item->expects($this->any())
             ->method('getQuoteItemId')
             ->willReturn($gettingQuoteItemId);
@@ -212,14 +278,19 @@ public function dataProviderGetItemByQuoteItemId()
     }
 
     /**
+     * Test getAllVisibleItems method.
+     *
      * @param bool $isDeleted
      * @param int|null $parentItemId
      * @param array $result
      *
      * @dataProvider dataProviderGetAllVisibleItems
+     * @return void
      */
     public function testGetAllVisibleItems($isDeleted, $parentItemId, array $result)
     {
+        $this->prepareOrderItem();
+
         $this->item->expects($this->once())
             ->method('isDeleted')
             ->willReturn($isDeleted);
@@ -263,8 +334,15 @@ public function testCanCancelIsPaymentReview()
         $this->assertFalse($this->order->canCancel());
     }
 
+    /**
+     * Test CanInvoice method.
+     *
+     * @return void
+     */
     public function testCanInvoice()
     {
+        $this->prepareOrderItem();
+
         $this->item->expects($this->any())
             ->method('getQtyToInvoice')
             ->willReturn(42);
@@ -304,8 +382,15 @@ public function testCanNotInvoiceWhenActionInvoiceFlagIsFalse()
         $this->assertFalse($this->order->canInvoice());
     }
 
+    /**
+     * Test CanNotInvoice method when invoice is locked.
+     *
+     * @return void
+     */
     public function testCanNotInvoiceWhenLockedInvoice()
     {
+        $this->prepareOrderItem();
+
         $this->item->expects($this->any())
             ->method('getQtyToInvoice')
             ->willReturn(42);
@@ -315,8 +400,15 @@ public function testCanNotInvoiceWhenLockedInvoice()
         $this->assertFalse($this->order->canInvoice());
     }
 
+    /**
+     * Test CanNotInvoice method when didn't have qty to invoice.
+     *
+     * @return void
+     */
     public function testCanNotInvoiceWhenDidNotHaveQtyToInvoice()
     {
+        $this->prepareOrderItem();
+
         $this->item->expects($this->any())
             ->method('getQtyToInvoice')
             ->willReturn(0);
@@ -601,8 +693,15 @@ public function testCanCancelCanReviewPayment()
         $this->assertFalse($this->order->canCancel());
     }
 
+    /**
+     * Test CanCancelAllInvoiced method.
+     *
+     * @return void
+     */
     public function testCanCancelAllInvoiced()
     {
+        $this->prepareOrderItem();
+
         $paymentMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Payment::class)
             ->disableOriginalConstructor()
             ->setMethods(['isDeleted', 'canReviewPayment', 'canFetchTransactionInfo', '__wakeUp'])
@@ -662,11 +761,16 @@ public function testCanCancelState()
     }
 
     /**
+     * Test CanCancelActionFlag method.
+     *
      * @param bool $cancelActionFlag
      * @dataProvider dataProviderActionFlag
+     * @return void
      */
     public function testCanCancelActionFlag($cancelActionFlag)
     {
+        $this->prepareOrderItem();
+
         $paymentMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Payment::class)
             ->disableOriginalConstructor()
             ->setMethods(['isDeleted', 'canReviewPayment', 'canFetchTransactionInfo', '__wakeUp'])

From d17a99f22f274af0136530227b77b1ec8829d3ef Mon Sep 17 00:00:00 2001
From: Oksana_Kremen <Oksana_Kremen@epam.com>
Date: Thu, 24 Jan 2019 19:04:08 +0200
Subject: [PATCH 904/932] MAGETWO-91676: Model related data missing in order
 rest api

- Fix for unit tests
---
 app/code/Magento/Sales/Test/Unit/Model/OrderTest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
index faee759273295..61ae9ae45e12f 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\ResourceModel\Order\Item\Collection;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory as HistoryCollectionFactory;
 use Magento\Sales\Api\OrderItemRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -421,6 +422,7 @@ public function testCanNotInvoiceWhenDidNotHaveQtyToInvoice()
     public function testCanCreditMemo()
     {
         $totalPaid = 10;
+        $this->prepareOrderItem();
         $this->order->setTotalPaid($totalPaid);
         $this->priceCurrency->expects($this->once())->method('round')->with($totalPaid)->willReturnArgument(0);
         $this->assertTrue($this->order->canCreditmemo());
@@ -436,6 +438,7 @@ public function testCanCreditMemoForZeroTotal()
         $grandTotal = 0;
         $totalPaid = 0;
         $totalRefunded = 0;
+        $this->prepareOrderItem();
         $this->order->setGrandTotal($grandTotal);
         $this->order->setTotalPaid($totalPaid);
         $this->assertFalse($this->order->canCreditmemoForZeroTotal($totalRefunded));
@@ -444,6 +447,7 @@ public function testCanCreditMemoForZeroTotal()
     public function testCanNotCreditMemoWithTotalNull()
     {
         $totalPaid = 0;
+        $this->prepareOrderItem();
         $this->order->setTotalPaid($totalPaid);
         $this->priceCurrency->expects($this->once())->method('round')->with($totalPaid)->willReturnArgument(0);
         $this->assertFalse($this->order->canCreditmemo());
@@ -455,6 +459,7 @@ public function testCanNotCreditMemoWithAdjustmentNegative()
         $adjustmentNegative = 10;
         $totalRefunded = 90;
 
+        $this->prepareOrderItem();
         $this->order->setTotalPaid($totalPaid);
         $this->order->setTotalRefunded($totalRefunded);
         $this->order->setAdjustmentNegative($adjustmentNegative);
@@ -469,6 +474,7 @@ public function testCanCreditMemoWithAdjustmentNegativeLowerThanTotalPaid()
         $adjustmentNegative = 9;
         $totalRefunded = 90;
 
+        $this->prepareOrderItem();
         $this->order->setTotalPaid($totalPaid);
         $this->order->setTotalRefunded($totalRefunded);
         $this->order->setAdjustmentNegative($adjustmentNegative);

From 230e0840eae8832d65f6ef5c9a39cdc8f3c91c6d Mon Sep 17 00:00:00 2001
From: RomanKis <roman.kis.y@gmail.com>
Date: Thu, 31 Jan 2019 17:19:30 +0200
Subject: [PATCH 905/932] graphQl-336:
 Magento/CatalogGraphQl/Model/Category/LevelCalculator class has fields
 declared dynamically

---
 .../CatalogGraphQl/Model/Category/LevelCalculator.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
index 0401e1c42331e..f587be245c99d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php
@@ -15,6 +15,16 @@
  */
 class LevelCalculator
 {
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var Category
+     */
+    private $resourceCategory;
+
     /**
      * @param ResourceConnection $resourceConnection
      * @param Category $resourceCategory
@@ -39,6 +49,7 @@ public function calculate(int $rootCategoryId) : int
         $select = $connection->select()
             ->from($this->resourceConnection->getTableName('catalog_category_entity'), 'level')
             ->where($this->resourceCategory->getLinkField() . " = ?", $rootCategoryId);
+
         return (int) $connection->fetchOne($select);
     }
 }

From 13aad1f9000b7b004662ee64ab5bc24d486c32f8 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 31 Jan 2019 09:27:18 -0600
Subject: [PATCH 906/932] MQE-1421: Updating EndToEnd Tests

---
 .../Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
index 4228311d3b904..3e55eb4f26607 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontSalesRuleActionGroup.xml
@@ -32,8 +32,8 @@
     <!-- Check applied discount in cart summary -->
     <actionGroup name="StorefrontCheckCouponAppliedActionGroup">
         <arguments>
-            <argument name="rule"/>
-            <argument name="discount"/>
+            <argument name="rule" />
+            <argument name="discount" type="string" />
         </arguments>
         <waitForElementVisible selector="{{CheckoutCartSummarySection.discountTotal}}" stepKey="waitForDiscountTotal"/>
         <see userInput="{{rule.store_labels[1][store_label]}}" selector="{{CheckoutCartSummarySection.discountLabel}}" stepKey="assertDiscountLabel"/>

From ae82f440470f39bfb0f30d4f35a3a6f7ac7eb90f Mon Sep 17 00:00:00 2001
From: Kieu Phan <kphan@adobe.com>
Date: Thu, 31 Jan 2019 10:15:23 -0600
Subject: [PATCH 907/932] MC-10985: Create MFTF Tests Added tests for PayPal

---
 ...penPayPalButtonCheckoutPageActionGroup.xml |  19 ++
 ...xpressCheckoutConfigurationActionGroup.xml |  69 +++++++
 .../Paypal/Test/Mftf/Data/PaypalData.xml      |  31 ++++
 .../PayPalExpressCheckoutConfigSection.xml    |  58 ++++++
 .../Magento/Paypal/Test/Mftf/Suite/suite.xml  |  16 ++
 .../Test/AdminConfigPaymentsSectionState.xml  |   2 +-
 .../Test/PayPalSmartButtonInCheckoutPage.xml  | 170 ++++++++++++++++++
 .../CreateOrderToPrintPageActionGroup.xml     |   1 +
 8 files changed, 365 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/Suite/suite.xml
 create mode 100644 app/code/Magento/Paypal/Test/Mftf/Test/PayPalSmartButtonInCheckoutPage.xml

diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
new file mode 100644
index 0000000000000..97c7fbc471e97
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/OpenPayPalButtonCheckoutPageActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="OpenPayPalButtonCheckoutPage">
+        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn}}" stepKey="clickPayPalConfigureBtn"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab}}" stepKey="waitForAdvancedSettingTab"/>
+        <click selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab}}" stepKey="openAdvancedSettingTab"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab}}" stepKey="waitForFrontendExperienceSettingsTab"/>
+        <click selector="{{PayPalAdvancedSettingConfigSection.frontendExperienceSettingsTab}}" stepKey="openFrontendExperienceSettingsTab"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab}}" stepKey="waitForCheckoutPageTab"/>
+        <click selector="{{PayPalAdvancedSettingConfigSection.checkoutPageTab}}" stepKey="openCheckoutPageTab"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
new file mode 100644
index 0000000000000..7bf26aceb316a
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayPalExpressCheckoutConfigurationActionGroup.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ConfigPayPalExpressCheckout">
+        <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click selector="{{PayPalExpressCheckoutConfigSection.configureBtn}}" stepKey="clickPayPalConfigureBtn"/>
+        <waitForElementVisible selector="{{PayPalAdvancedSettingConfigSection.advancedSettingTab}}" stepKey="waitForAdvancedSettingTab"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.email}}" userInput="{{_CREDS.paypal_express_email}}" stepKey="inputEmailAssociatedWithPayPalMerchantAccount"/>
+        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.apiMethod}}" userInput="API Signature" stepKey="inputAPIAuthenticationMethods"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.username}}" userInput="{{_CREDS.paypal_express_api_username}}" stepKey="inputAPIUsername"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.password}}" userInput="{{_CREDS.paypal_express_api_password}}" stepKey="inputAPIPassword"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.signature}}" userInput="{{_CREDS.paypal_express_api_signature}}" stepKey="inputAPISignature"/>
+        <selectOption selector ="{{PayPalExpressCheckoutConfigSection.sandboxMode}}" userInput="Yes" stepKey="enableSandboxMode"/>
+        <selectOption selector="{{PayPalExpressCheckoutConfigSection.enableSolution}}" userInput="Yes" stepKey="enableSolution"/>
+        <fillField selector ="{{PayPalExpressCheckoutConfigSection.merchantID}}" userInput="{{_CREDS.paypal_express_merchantID}}" stepKey="inputMerchantID"/>
+        <!--Save configuration-->
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
+    </actionGroup>
+    <actionGroup name="CreatePayPalOrderWithSelectedPaymentMethodActionGroup" extends="CreateOrderToPrintPageActionGroup">
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="clickPlaceOrder"/>
+        <!--set ID for iframe of PayPal group button-->
+        <executeJS function="jQuery('.zoid-component-frame.zoid-visible').attr('id', 'myIframe')" stepKey="clickOrderLink"/>
+        <!--switch to iframe of PayPal group button-->
+        <comment userInput="switch to iframe of PayPal group button" stepKey="commentSwitchToIframe"/>
+        <switchToIFrame userInput="myIframe" stepKey="clickPrintOrderLink"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="waitForPayPalBtn"/>
+        <click selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="clickPayPalBtn"/>
+        <switchToIFrame stepKey="switchBack1"/>
+        <!--Check in-context-->
+        <comment userInput="Check in-context" stepKey="commentVerifyInContext"/>
+        <switchToNextTab stepKey="switchToInContentTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeCurrentUrlMatches regex="~\//www.sandbox.paypal.com/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
+        <waitForElement selector="{{PayPalPaymentSection.email}}" stepKey="waitForLoginForm" />
+        <fillField selector="{{PayPalPaymentSection.email}}" userInput="{{Payer.buyerEmail}}" stepKey="fillEmail"/>
+        <fillField selector="{{PayPalPaymentSection.password}}" userInput="{{Payer.buyerPassword}}" stepKey="fillPassword"/>
+        <click selector="{{PayPalPaymentSection.loginBtn}}" stepKey="login"/>
+        <waitForPageLoad stepKey="wait"/>
+        <seeElement selector="{{PayPalPaymentSection.reviewUserInfo}}" stepKey="seePayerName"/>
+    </actionGroup>
+    <actionGroup name="addProductToCheckoutPage">
+        <arguments>
+            <argument name="Category"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCategoryPage.url(Category.name)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
+        <click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
+        <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
+        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPlaceOrderButton"/>
+        <click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="clickPayPalCheckbox"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
index 6d5f80e30dc7f..d97e60043cc5d 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml
@@ -58,4 +58,35 @@
     <entity name="DefaultApiSignature" type="api_signature">
         <data key="value"/>
     </entity>
+    <entity name="Payer" type="paypal_buyer">
+        <data key="buyerEmail">buyer.mpi@gmail.com</data>
+        <data key="buyerPassword">12345678</data>
+    </entity>
+    <entity name="PayPalLabel" type="paypal">
+        <data key="checkout">checkout</data>
+        <data key="credit">credit</data>
+        <data key="pay">pay</data>
+        <data key="buynow">buy now</data>
+        <data key="paypal">pay pal</data>
+        <data key="installment">installment</data>
+    </entity>
+    <entity name="PayPalLayout" type="paypal">
+        <data key="horizontal">horizontal</data>
+        <data key="vertical">vertical</data>
+    </entity>
+    <entity name="PayPalSize" type="paypal">
+        <data key="medium">medium</data>
+        <data key="large">large</data>
+        <data key="responsive">responsive</data>
+    </entity>
+    <entity name="PayPalShape" type="paypal">
+        <data key="pill">pill</data>
+        <data key="rectangle">rectangle</data>
+    </entity>
+    <entity name="PayPalColor" type="paypal">
+        <data key="gold">gold</data>
+        <data key="blue">blue</data>
+        <data key="silver">silver</data>
+        <data key="black">black</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
new file mode 100644
index 0000000000000..3ac0bb2707556
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="PayPalExpressCheckoutConfigSection">
+        <element name="configureBtn" type="button" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us-head"/>
+        <element name="email" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_business_account" />
+        <element name="apiMethod" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_authentication"/>
+        <element name="username" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_username"/>
+        <element name="password" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_password"/>
+        <element name="signature" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_signature"/>
+        <element name="sandboxMode" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_sandbox_flag"/>
+        <element name="enableSolution" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_enable_express_checkout"/>
+        <element name="merchantID" type="input" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_merchant_id"/>
+    </section>
+    <section name="PayPalAdvancedSettingConfigSection">
+        <element name="advancedSettingTab" type="button" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced-head"/>
+        <element name="frontendExperienceSettingsTab" type="button" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend-head"/>
+        <element name="checkoutPageTab" type="button" selector="#payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button-head"/>
+       </section>
+    <section name="ButtonCustomization">
+        <element name="customizeDrpDown" type="button" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button_checkout_page_button_customize']//select[contains(@data-ui-id, 'button-customize')]"/>
+        <element name="customizeNo" type="text" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button_checkout_page_button_customize']//select[contains(@data-ui-id, 'button-customize')]/option[@value='0' and @selected='selected']"/>
+        <element name="label" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_label')]"/>
+        <element name="layout" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_layout')]"/>
+        <element name="size" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_size')]"/>
+        <element name="shape" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_shape')]"/>
+        <element name="color" type="input" selector="//tr[@id='row_payment_us_paypal_alternative_payment_methods_express_checkout_us_settings_ec_settings_ec_advanced_express_checkout_frontend_checkout_page_button']//select[contains(@id, 'button_color')]"/>
+    </section>
+    <section name="PayPalButtonOnStorefront">
+        <element name="label" type="text" selector="[aria-label='{{label}}']" parameterized="true"/>
+        <element name="layout" type="text" selector="[data-layout='{{layout}}']" parameterized="true"/>
+        <element name="size" type="text" selector="[data-size='{{size}}']" parameterized="true"/>
+        <element name="shape" type="text" selector=".paypal-button-shape-{{shape}}" parameterized="true"/>
+        <element name="color" type="text" selector=".paypal-button-color-{{color}}" parameterized="true"/>
+    </section>
+    <section name="CheckoutPaymentSection">
+        <element name="PayPalPaymentRadio" type="radio" selector="input#paypal_express.radio" timeout="30"/>
+        <element name="PayPalBtn" type="radio" selector=".paypal-button.paypal-button-number-0" timeout="30"/>
+    </section>
+    <section name="PayPalPaymentSection">
+        <element name="guestCheckout" type="input" selector="#guest"/>
+        <element name="loginSection" type="input" selector=" #main>#login"/>
+        <element name="email" type="input" selector="//input[contains(@name, 'email') and not(contains(@style, 'display:none'))]"/>
+        <element name="password" type="input" selector="//input[contains(@name, 'password') and not(contains(@style, 'display:none'))]"/>
+        <element name="loginBtn" type="input" selector="button#btnLogin"/>
+        <element name="reviewUserInfo" type="text" selector="//p[@id='reviewUserInfo' and contains(text(),'Hi, MPI!')]"/>
+        <element name="cartIcon" type="text" selector="#transactionCart"/>
+        <element name="itemName" type="text" selector="//span[@title='{{productName}}']" parameterized="true"/>
+        <element name="PayPalSubmitBtn" type="text" selector="//input[@type='submit']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/Suite/suite.xml b/app/code/Magento/Paypal/Test/Mftf/Suite/suite.xml
new file mode 100644
index 0000000000000..621f2e6a67688
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Suite/suite.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
+    <suite name="PaypalTestSuite">
+        <include>
+            <test name="CheckDefaultValueOfPayPalCustomizeButtonTest"/>
+            <test name="PayPalSmartButtonInCheckoutPage"/>
+            <test name="CheckCreditButtonConfiguration"/>
+        </include>
+    </suite>
+</suites>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
index ac752e8412ff9..934449dfd136c 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsSectionState.xml
@@ -18,7 +18,7 @@
             <testCaseId value="MAGETWO-92043"/>
         </annotations>
         <after>
-            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="logout" stepKey="amOnLogoutPage"/>
         </after>
 
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/PayPalSmartButtonInCheckoutPage.xml b/app/code/Magento/Paypal/Test/Mftf/Test/PayPalSmartButtonInCheckoutPage.xml
new file mode 100644
index 0000000000000..1858ee130a347
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/PayPalSmartButtonInCheckoutPage.xml
@@ -0,0 +1,170 @@
+<?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="CheckDefaultValueOfPayPalCustomizeButtonTest">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Button Configuration"/>
+            <title value="Check Default Value Of PayPal Customize Button"/>
+            <description value="Default value of PayPal Customize Button should be NO"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-10904"/>
+            <skip>
+                <issueId value="DEVOPS-3311"/>
+            </skip>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <actionGroup ref="ConfigPayPalExpressCheckout" stepKey="ConfigPayPalExpressCheckout"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <actionGroup ref="OpenPayPalButtonCheckoutPage" stepKey="openPayPalButtonCheckoutPage"/>
+        <seeElement selector="{{ButtonCustomization.customizeDrpDown}}" stepKey="seeCustomizeDropDown"/>
+        <seeOptionIsSelected selector="{{ButtonCustomization.customizeDrpDown}}" userInput="No" stepKey="seeNoIsDefaultValue"/>
+        <selectOption selector="{{ButtonCustomization.customizeDrpDown}}" userInput="Yes" stepKey="enableButtonCustomization"/>
+        <!--Verify default value-->
+        <comment userInput="Verify default value" stepKey="commentVerifyDefaultValue1"/>
+        <seeElement selector="{{ButtonCustomization.label}}" stepKey="seeLabel"/>
+        <seeElement selector="{{ButtonCustomization.layout}}" stepKey="seeLayout"/>
+        <seeElement selector="{{ButtonCustomization.size}}" stepKey="seeSize1"/>
+        <seeElement selector="{{ButtonCustomization.shape}}" stepKey="seeShape1"/>
+        <seeElement selector="{{ButtonCustomization.color}}" stepKey="seeColor"/>
+    </test>
+    <test name="CheckCreditButtonConfiguration">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Button Configuration"/>
+            <title value="Check Credit Button Configuration"/>
+            <description value="Admin is able to customize Credit button"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-10900"/>
+            <skip>
+                <issueId value="DEVOPS-3311"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <!-- Create Customer -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <!--Config PayPal Express Checkout-->
+            <comment userInput="config PayPal Express Checkout" stepKey="commemtConfigPayPalExpressCheckout"/>
+            <actionGroup ref="ConfigPayPalExpressCheckout" stepKey="ConfigPayPalExpressCheckout"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCategory" createDataKey="createPreReqCategory"/>
+            <deleteData stepKey="deleteProduct" createDataKey="createPreReqProduct"/>
+            <deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <!--Navigate to button configuration setting-->
+        <comment userInput="Navigate to button configuration setting in Admin site" stepKey="commentNavigateToButtonConfigurationInAdmin"/>
+        <actionGroup ref="OpenPayPalButtonCheckoutPage" stepKey="openPayPalButtonCheckoutPage"/>
+        <waitForElement selector="{{ButtonCustomization.customizeDrpDown}}" stepKey="seeCustomizeDropDown"/>
+        <selectOption selector="{{ButtonCustomization.customizeDrpDown}}" userInput="Yes" stepKey="enableButtonCustomization"/>
+        <!--Verify Credit Button value-->
+        <comment userInput="Verify Credit Button value" stepKey="commentVerifyDefaultValue2"/>
+        <selectOption selector="{{ButtonCustomization.label}}" userInput="{{PayPalLabel.credit}}" stepKey="selectCreditAsLabel"/>
+        <seeElement selector="{{ButtonCustomization.size}}" stepKey="seeSize2"/>
+        <seeElement selector="{{ButtonCustomization.shape}}" stepKey="seeShape2"/>
+        <dontSeeElement selector="{{ButtonCustomization.layout}}" stepKey="dontSeeLayout"/>
+        <dontSeeElement selector="{{ButtonCustomization.color}}" stepKey="dontSeeColor"/>
+        <!--Customize Credit Button-->
+        <selectOption selector="{{ButtonCustomization.size}}" userInput="{{PayPalSize.medium}}" stepKey="selectSize"/>
+        <selectOption selector="{{ButtonCustomization.shape}}" userInput="{{PayPalShape.pill}}" stepKey="selectShape"/>
+        <!--Save configuration-->
+        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
+        <waitForPageLoad stepKey="waitForConfigSave"/>
+        <openNewTab stepKey="openNewTab"/>
+        <amOnPage url="/" stepKey="openStorefront"/>
+        <!--Login to storefront as previously created customer-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="addProductToCheckoutPage" stepKey="addProductToCheckoutPage">
+            <argument name="Category" value="$$createPreReqCategory$$"/>
+        </actionGroup>
+        <!--set ID for iframe of PayPal group button-->
+        <executeJS function="jQuery('.zoid-component-frame.zoid-visible').attr('id', 'myIframe')" stepKey="clickOrderLink"/>
+        <!--switch to iframe of PayPal group button-->
+        <comment userInput="switch to iframe of PayPal group button" stepKey="commentSwitchToIframe"/>
+        <switchToIframe userInput="myIframe" stepKey="clickPrintOrderLink"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="waitForPayPalBtn"/>
+        <seeElement selector="{{PayPalButtonOnStorefront.label(PayPalLabel.credit)}}{{PayPalButtonOnStorefront.size(PayPalSize.medium)}}" stepKey="seeButtonInMediumSize"/>
+        <seeElement selector="{{PayPalButtonOnStorefront.label(PayPalLabel.credit)}}{{PayPalButtonOnStorefront.shape(PayPalShape.pill)}}" stepKey="seeButtonInPillShape"/>
+    </test>
+    <test name="PayPalSmartButtonInCheckoutPage">
+        <annotations>
+            <features value="PayPal"/>
+            <stories value="Generic checkout skeleton flow"/>
+            <title value="Mainflow of PayPal Smart Button"/>
+            <description value="Users are able to place order using PayPal Smart Button"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-13690"/>
+            <skip>
+                <issueId value="DEVOPS-3311"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct">
+            <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <!-- Create Customer -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginActionGroup" stepKey="login"/>
+            <!--Config PayPal Express Checkout-->
+            <comment userInput="config PayPal Express Checkout" stepKey="commemtConfigPayPalExpressCheckout"/>
+            <actionGroup ref="ConfigPayPalExpressCheckout" stepKey="ConfigPayPalExpressCheckout"/>
+            <magentoCLI command="config:set payment/paypal_express/in_context 1" stepKey="disableInContextPayPal"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCategory" createDataKey="createPreReqCategory"/>
+            <deleteData stepKey="deleteProduct" createDataKey="createPreReqProduct"/>
+            <deleteData stepKey="deleteCustomer" createDataKey="createCustomer"/>
+            <magentoCLI command="config:set payment/paypal_express/in_context 0" stepKey="enableInContextPayPal"/>
+            <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
+        </after>
+        <magentoCLI command="config:set payment/paypal_express/payment_action Authorization" stepKey="inputPaymentAction"/>
+        <magentoCLI command="config:set payment/paypal_express/solution_type Sole" stepKey="enablePayPalGuestCheckout"/>
+        <magentoCLI command="config:set payment/paypal_express/line_items_enabled 1" stepKey="enableTransferCartLine"/>
+        <magentoCLI command="config:set payment/paypal_express/skip_order_review_step 1" stepKey="enableSkipOrderReview"/>
+        <!--Login to storefront as previously created customer-->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <!--Place an order using PayPal method-->
+        <comment userInput="Place an order using PayPal method" stepKey="commentPayPalPlaceOrder"/>
+        <actionGroup ref="CreatePayPalOrderWithSelectedPaymentMethodActionGroup" stepKey="createPayPalOrder">
+            <argument name="Category" value="$$createPreReqCategory$$"/>
+        </actionGroup>
+        <!--Open Cart on PayPal-->
+        <comment userInput="Open Cart on PayPal" stepKey="commentOpenCart"/>
+        <click selector="{{PayPalPaymentSection.cartIcon}}" stepKey="openCart"/>
+        <seeElement selector="{{PayPalPaymentSection.itemName($$createPreReqProduct.name$$)}}" stepKey="seeProductname"/>
+        <click selector="{{PayPalPaymentSection.PayPalSubmitBtn}}" stepKey="clickPayPalSubmitBtn"/>
+        <switchToPreviousTab stepKey="switchToPreviousTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <!--I see order successful Page instead of Order Review Page-->
+        <comment userInput="I see order successful Page instead of Order Review Page" stepKey="commentVerifyOrderReviewPage"/>
+        <waitForElement selector="{{CheckoutSuccessMainSection.successTitle}}" stepKey="waitForLoadSuccessPageTitle"/>
+        <waitForElement selector="{{CheckoutSuccessMainSection.success}}" time="30" stepKey="waitForLoadSuccessPage"/>
+        <seeElement selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="seeOrderLink"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
index e48e7bb3f0b1e..e7cbac5769eea 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
@@ -34,4 +34,5 @@
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="clickNext" stepKey="waitForPaymentSectionLoaded"/>
         <conditionalClick selector="{{CheckoutPaymentSection.checkMoneyOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" before="waitForPlaceOrderButton" stepKey="clickCheckMoneyOrderPayment"/>
     </actionGroup>
+
 </actionGroups>

From b31b0bcbb82aba1fd176cca3e3957f0bd146e035 Mon Sep 17 00:00:00 2001
From: Kieu Phan <kphan@adobe.com>
Date: Thu, 31 Jan 2019 10:26:54 -0600
Subject: [PATCH 908/932] MC-10985: Create MFTF Tests

---
 .../Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
index e7cbac5769eea..e48e7bb3f0b1e 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/CreateOrderToPrintPageActionGroup.xml
@@ -34,5 +34,4 @@
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" after="clickNext" stepKey="waitForPaymentSectionLoaded"/>
         <conditionalClick selector="{{CheckoutPaymentSection.checkMoneyOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.billingAddress}}" visible="false" before="waitForPlaceOrderButton" stepKey="clickCheckMoneyOrderPayment"/>
     </actionGroup>
-
 </actionGroups>

From cc1cadf00e16c34fb4e313bc7bacfcdbb143aaf0 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Thu, 31 Jan 2019 15:56:06 -0600
Subject: [PATCH 909/932] MC-13644: Default billing and default shipping
 address lose their status after edit

---
 .../Customer/Controller/Address/FormPost.php  | 14 ++++++++--
 .../StorefrontUpdateCustomerAddressTest.xml   |  3 ---
 .../Unit/Controller/Address/FormPostTest.php  | 26 ++++++++++++-------
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Address/FormPost.php b/app/code/Magento/Customer/Controller/Address/FormPost.php
index 217af0abd7592..0fc0c4611ab9c 100644
--- a/app/code/Magento/Customer/Controller/Address/FormPost.php
+++ b/app/code/Magento/Customer/Controller/Address/FormPost.php
@@ -120,8 +120,18 @@ protected function _extractAddress()
             \Magento\Customer\Api\Data\AddressInterface::class
         );
         $addressDataObject->setCustomerId($this->_getSession()->getCustomerId())
-            ->setIsDefaultBilling($this->getRequest()->getParam('default_billing', false))
-            ->setIsDefaultShipping($this->getRequest()->getParam('default_shipping', false));
+            ->setIsDefaultBilling(
+                $this->getRequest()->getParam(
+                    'default_billing',
+                    isset($existingAddressData['default_billing']) ? $existingAddressData['default_billing'] : false
+                )
+            )
+            ->setIsDefaultShipping(
+                $this->getRequest()->getParam(
+                    'default_shipping',
+                    isset($existingAddressData['default_shipping']) ? $existingAddressData['default_shipping'] : false
+                )
+            );
 
         return $addressDataObject;
     }
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
index d1b5fb2aa7d11..d9d1c9f2e05a0 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressTest.xml
@@ -18,9 +18,6 @@
             <testCaseId value="MAGETWO-97501"/>
             <group value="customer"/>
             <group value="update"/>
-            <skip>
-                <issueId value="MAGETWO-97504"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer_With_Different_Billing_Shipping_Addresses" stepKey="createCustomer"/>
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
index c2a795fc95016..7ae55f44421c7 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Address/FormPostTest.php
@@ -455,14 +455,20 @@ public function testExecute(
         $regionCode,
         $newRegionId,
         $newRegion,
-        $newRegionCode
+        $newRegionCode,
+        $existingDefaultBilling = false,
+        $existingDefaultShipping = false,
+        $setDefaultBilling = false,
+        $setDefaultShipping = false
     ): void {
         $existingAddressData = [
             'country_id' => $countryId,
             'region_id' => $regionId,
             'region' => $region,
             'region_code' => $regionCode,
-            'customer_id' => $customerId
+            'customer_id' => $customerId,
+            'default_billing' => $existingDefaultBilling,
+            'default_shipping' => $existingDefaultShipping,
         ];
         $newAddressData = [
             'country_id' => $countryId,
@@ -486,8 +492,8 @@ public function testExecute(
             ->method('getParam')
             ->willReturnMap([
                 ['id', null, $addressId],
-                ['default_billing', false, $addressId],
-                ['default_shipping', false, $addressId],
+                ['default_billing', $existingDefaultBilling, $setDefaultBilling],
+                ['default_shipping', $existingDefaultShipping, $setDefaultShipping],
             ]);
 
         $this->addressRepository->expects($this->once())
@@ -565,11 +571,11 @@ public function testExecute(
             ->willReturnSelf();
         $this->addressData->expects($this->once())
             ->method('setIsDefaultBilling')
-            ->with()
+            ->with($setDefaultBilling)
             ->willReturnSelf();
         $this->addressData->expects($this->once())
             ->method('setIsDefaultShipping')
-            ->with()
+            ->with($setDefaultShipping)
             ->willReturnSelf();
 
         $this->messageManager->expects($this->once())
@@ -628,11 +634,11 @@ public function dataProviderTestExecute(): array
 
             [1, 1, 1, 2, null, null, 12, null, null],
             [1, 1, 1, 2, 'Alaska', null, 12, null, 'CA'],
-            [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null],
+            [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null, true, true, true, false],
 
-            [1, 1, 1, 2, null, null, 12, null, null],
-            [1, 1, 1, 2, 'Alaska', null, 12, null, 'CA'],
-            [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null],
+            [1, 1, 1, 2, null, null, 12, null, null, false, false, true, false],
+            [1, 1, 1, 2, 'Alaska', null, 12, null, 'CA', true, false, true, false],
+            [1, 1, 1, 2, 'Alaska', 'AK', 12, 'California', null, true, true, true, true],
         ];
     }
 

From 9551799d2237337ec15c92238c27d85800d4ae0f Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Thu, 31 Jan 2019 17:59:21 -0600
Subject: [PATCH 910/932] GraphQL-248: [My Account] Create customer account

---
 .../Magento/CustomerGraphQl/Model/Customer/CreateAccount.php | 5 +++++
 .../CustomerGraphQl/Model/Customer/SetUpUserContext.php      | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
index 355bd1c6ec853..e21e0330bc5a2 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 namespace Magento\CustomerGraphQl\Model\Customer;
 
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php b/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
index 94131722e5a9f..720034e06c331 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 namespace Magento\CustomerGraphQl\Model\Customer;
 

From 0533dc290d9e0390ca3086f461a9f0dd35cc7e23 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Thu, 31 Jan 2019 19:27:03 -0600
Subject: [PATCH 911/932] GraphQL-248: [My Account] Create customer account

-- fix static tests
---
 .../Model/ConfigurableProductTypeResolver.php              | 7 +++----
 .../CustomerGraphQl/Model/Customer/CreateAccount.php       | 4 +++-
 .../CustomerGraphQl/Model/Customer/SetUpUserContext.php    | 2 ++
 .../testsuite/Magento/GraphQl/Quote/GetCartTest.php        | 1 -
 .../testsuite/Magento/Checkout/_files/active_quote.php     | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
index f65a331ab803c..eda2ce11daaf6 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php
@@ -11,7 +11,7 @@
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as Type;
 
 /**
- * {@inheritdoc}
+ * @inheritdoc
  */
 class ConfigurableProductTypeResolver implements TypeResolverInterface
 {
@@ -21,13 +21,12 @@ class ConfigurableProductTypeResolver implements TypeResolverInterface
     const TYPE_RESOLVER = 'ConfigurableProduct';
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function resolveType(array $data) : string
+    public function resolveType(array $data): string
     {
         if (isset($data['type_id']) && $data['type_id'] == Type::TYPE_CODE) {
             return self::TYPE_RESOLVER;
-
         }
         return '';
     }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
index e21e0330bc5a2..4a4b5c863528b 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php
@@ -59,12 +59,14 @@ public function __construct(
     }
 
     /**
+     * Creates new customer account
+     *
      * @param array $args
      * @return CustomerInterface
      * @throws LocalizedException
      * @throws NoSuchEntityException
      */
-    public function execute($args)
+    public function execute(array $args): CustomerInterface
     {
         $customerDataObject = $this->customerFactory->create();
         $this->dataObjectHelper->populateWithArray(
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php b/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
index 720034e06c331..1fcf1c0d7c1c3 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php
@@ -17,6 +17,8 @@
 class SetUpUserContext
 {
     /**
+     * Set up user context after creating new customer account
+     *
      * @param ContextInterface $context
      * @param CustomerInterface $customer
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
index e837afc65481e..78204aaa567b0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartTest.php
@@ -85,7 +85,6 @@ public function testGetCartFromAnotherCustomer()
             'reserved_order_id'
         );
 
-
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
         $query = $this->prepareGetCartQuery($maskedQuoteId);
 
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php
index 6b569f37a1a9f..52437ef828afd 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/active_quote.php
@@ -16,4 +16,4 @@
     ->create();
 $quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);
-$quoteIdMask->save();
\ No newline at end of file
+$quoteIdMask->save();

From ed37f5ba3c669f14ed7613cbd9ac00770e481658 Mon Sep 17 00:00:00 2001
From: Joan He <johe@magento.com>
Date: Thu, 31 Jan 2019 20:47:10 -0600
Subject: [PATCH 912/932] MC-13644: Default billing and default shipping
 address lose their status after edit

- Fix static test failure
---
 app/code/Magento/Customer/Controller/Address/FormPost.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Customer/Controller/Address/FormPost.php b/app/code/Magento/Customer/Controller/Address/FormPost.php
index 0fc0c4611ab9c..25618e3129160 100644
--- a/app/code/Magento/Customer/Controller/Address/FormPost.php
+++ b/app/code/Magento/Customer/Controller/Address/FormPost.php
@@ -26,6 +26,8 @@
 use Magento\Framework\View\Result\PageFactory;
 
 /**
+ * Customer Address Form Post Controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FormPost extends \Magento\Customer\Controller\Address implements HttpPostActionInterface

From 45df4a71d2a96a3cb00822509b1b11fa48c12fd3 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 1 Feb 2019 15:49:56 +0300
Subject: [PATCH 913/932] MAGETWO-96406: [2.3.x] Swatch Attribute is not
 displayed in the Widget CMS

- Update fixes based on comments
---
 .../Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
index b45339edecd86..674b2b66cd0c0 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
@@ -28,6 +28,9 @@
             <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteProduct">
                 <argument name="product" value="BaseConfigurableProduct"/>
             </actionGroup>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+            <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
+            <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
             <actionGroup ref="deleteProductAttributeByLabel" stepKey="deleteAttribute">
                 <argument name="ProductAttribute" value="visualSwatchAttribute"/>
             </actionGroup>

From 30e84d398230d8b2cc2aaada731636a97f9dd974 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 1 Feb 2019 21:40:03 +0300
Subject: [PATCH 914/932] MC-13779: [MFTF]
 CreateAnAdminOrderUsingBraintreePaymentTest1 randomly fails on jenkins

---
 .../Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
index 2376fe9f8006f..88bcf22a4b79f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-93677"/>
             <group value="braintree"/>
+            <skip>
+                <issueId value="MC-13779"/>
+            </skip>
         </annotations>
 
 

From 25302856ae002c4320a8942ea02b48debb4ad2fc Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Sun, 3 Feb 2019 20:15:42 -0600
Subject: [PATCH 915/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Test/TestCase/Category/MoveCategoryEntityTest.xml |  3 +++
 .../TestCase/Category/UpdateTopCategoryEntityTest.xml |  2 ++
 .../Product/UpdateVirtualProductEntityTest.xml        | 11 +++++++++++
 3 files changed, 16 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml
index 446011902c096..a5758fe1d1346 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/MoveCategoryEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Category\MoveCategoryEntityTest" summary="Move category from one to another" ticketId="MAGETWO-27319">
         <variation name="MoveCategoryEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="childCategory/dataset" xsi:type="string">three_nested_categories</data>
             <data name="parentCategory/dataset" xsi:type="string">default</data>
             <data name="nestingLevel" xsi:type="string">3</data>
@@ -15,6 +16,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryInGrid" />
         </variation>
         <variation name="MoveCategoryEntityTestVariation2" summary="Move default subcategory with anchored parent to default subcategory" ticketId="MAGETWO-21202">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="issue" xsi:type="string">MAGETWO-65147: Category is not present in Layered navigation block when anchor is on</data>
             <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent</data>
             <data name="parentCategory/dataset" xsi:type="string">default</data>
@@ -25,6 +27,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryBreadcrumbs" />
         </variation>
         <variation name="MoveCategoryEntityTestVariation3" summary="Move default anchored subcategory with anchored parent to default subcategory" ticketId="MAGETWO-21202">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="issue" xsi:type="string">MAGETWO-65147: Category is not present in Layered navigation block when anchor is on</data>
             <data name="childCategory/dataset" xsi:type="string">default_subcategory_with_anchored_parent</data>
             <data name="childCategory/data/parent_id/dataset" xsi:type="string">default_anchor_subcategory_with_anchored_parent</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateTopCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateTopCategoryEntityTest.xml
index 9126b619bbfdb..e8a5fd355da7d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateTopCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateTopCategoryEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Category\UpdateTopCategoryEntityTest" summary="Update top category url" ticketId="MAGETWO-27327">
         <variation name="UpdateCategoryEntityTestVariation1" summary="Update top category url and do not create redirect">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCategory/dataset" xsi:type="string">three_nested_categories</data>
             <data name="nestingLevel" xsi:type="number">3</data>
             <data name="category/data/url_key" xsi:type="string">cat1-rewrite%isolation%</data>
@@ -17,6 +18,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewritesCategoriesInGrid" />
         </variation>
         <variation name="UpdateCategoryEntityTestVariation2" summary="Update top category url and create redirect">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCategory/dataset" xsi:type="string">three_nested_categories</data>
             <data name="nestingLevel" xsi:type="number">3</data>
             <data name="category/data/url_key" xsi:type="string">cat1-rewrite%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
index daa19a8fe6fe8..e2715bb6b4b81 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\UpdateVirtualProductEntityTest" summary="Update Virtual Product" ticketId="MAGETWO-26204">
         <variation name="UpdateVirtualProductEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">99.99</data>
@@ -28,6 +29,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">virtual_product_%isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">120.00</data>
@@ -47,6 +49,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">185.00</data>
@@ -67,6 +70,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">virtual_product_%isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">99.99</data>
@@ -82,6 +86,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">5.00</data>
@@ -97,6 +102,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation6">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">virtual_product_%isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">145.00</data>
@@ -116,6 +122,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation7">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">99.99</data>
@@ -133,6 +140,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation8">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">virtual_product_%isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">5.00</data>
@@ -149,6 +157,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation9">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">120.00</data>
@@ -168,6 +177,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation10">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">99.99</data>
@@ -183,6 +193,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="UpdateVirtualProductEntityTestVariation11">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
             <data name="product/data/price/value" xsi:type="string">99.99</data>

From 406f7d85cc13d56f7fb2f8784f842e71f1a2c9d5 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Sun, 3 Feb 2019 22:09:00 -0600
Subject: [PATCH 916/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml
index 72a76dacc3297..06fe76c5efd0e 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Cms\Test\TestCase\CreateCmsPageEntityMultipleStoreViewsTest" summary="Page cache for different CMS pages on multiple store views" ticketId="MAGETWO-52467">
         <variation name="CreateCmsPageEntityMultipleStoreViewsTestVariation1">
+            <data name="issue" xsi:type="string">MC-13801: Test "Page cache for different CMS pages on multiple store views" fails on Jenkins</data>
             <data name="cmsPages/0/is_active" xsi:type="string">Yes</data>
             <data name="cmsPages/0/title" xsi:type="string">NewCmsPage</data>
             <data name="cmsPages/0/store_id/dataset" xsi:type="string">default</data>

From 689739ce9ce9775ca7af76dcb3629605fa51f8bd Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Mon, 4 Feb 2019 10:03:17 -0600
Subject: [PATCH 917/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Catalog/Test/Mftf/Section/AdminProductFormSection.xml        | 1 +
 .../Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index ad3e140c0818e..4cb676420689b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -39,6 +39,7 @@
         <element name="addAttributeBtn" type="button" selector="#addAttribute"/>
         <element name="createNewAttributeBtn" type="button" selector="button[data-index='add_new_attribute_button']"/>
         <element name="save" type="button" selector="#save-button"/>
+        <element name="saveNewAttribute" type="button" selector="//aside[contains(@class, 'create_new_attribute_modal')]//button[@id='save']"/>
         <element name="successMessage" type="text" selector="#messages"/>
         <element name="attributeTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Attributes']"/>
         <element name="attributeLabel" type="input" selector="//input[@name='frontend_label[0]']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index 845b7070e46cd..a173864136e7b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -17,6 +17,7 @@
         <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
         <element name="specifiedProductItemInfo" type="button" selector="//a[@class='product-item-link'][contains(text(), '{{var1}}')]" parameterized="true"/>
         <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <element name="addToCartProductBySku" type="button" selector="//form[@data-product-sku='{{productSku}}']//button[contains(@class, 'tocart')]" parameterized="true" />
         <element name="SuccessMsg" type="button" selector="div.message-success"/>
         <element name="productCount" type="text" selector="#toolbar-amount"/>
         <element name="CatalogDescription" type="text" selector="//div[@class='category-description']//p"/>

From 0a99f0659c897e9887e163832bd6cacf21012e46 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 5 Feb 2019 10:29:27 -0600
Subject: [PATCH 918/932] MC-6279: Generic checkout skeleton flow

-- fix a performance degradation
---
 app/code/Magento/Config/etc/adminhtml/di.xml | 1 -
 app/code/Magento/Variable/etc/di.xml         | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Config/etc/adminhtml/di.xml b/app/code/Magento/Config/etc/adminhtml/di.xml
index 5e54f177776ba..189fbdf69a7e8 100644
--- a/app/code/Magento/Config/etc/adminhtml/di.xml
+++ b/app/code/Magento/Config/etc/adminhtml/di.xml
@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\Config\Model\Config\Structure\SearchInterface" type="Magento\Config\Model\Config\Structure" />
     <preference for="Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Config\Model\Config\Backend\File\RequestData" />
     <preference for="Magento\Config\Model\Config\Structure\ElementVisibilityInterface" type="Magento\Config\Model\Config\Structure\ElementVisibilityComposite" />
     <type name="Magento\Config\Model\Config\Structure\Element\Iterator\Tab" shared="false" />
diff --git a/app/code/Magento/Variable/etc/di.xml b/app/code/Magento/Variable/etc/di.xml
index f0a24e89ef8d4..41759e1f1582b 100644
--- a/app/code/Magento/Variable/etc/di.xml
+++ b/app/code/Magento/Variable/etc/di.xml
@@ -42,6 +42,7 @@
                     <item name="general/store_information/merchant_vat_number" xsi:type="string">1</item>
                 </item>
             </argument>
+            <argument name="configStructure" xsi:type="object">Magento\Config\Model\Config\Structure\Proxy</argument>
         </arguments>
     </type>
-</config>
\ No newline at end of file
+</config>

From f28c4b458146c8de7f1818f8c0b7215c0ff84962 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Tue, 5 Feb 2019 13:03:32 -0600
Subject: [PATCH 919/932] MC-13824: Ensure core tests disable WYSIWYG before
 execution

 - move disabling WYSIWYG to core tests
---
 app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml | 4 ++++
 .../Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
index c3c92dc59c288..f6c0ed8ebe50e 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -19,6 +19,7 @@
             <group value="Cms"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
                 <argument name="newWebsiteName" value="secondWebsite"/>
@@ -34,6 +35,9 @@
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
         </before>
+        <after>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+        </after>
 
         <!--Go to Cms blocks page-->
         <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSPagesGrid"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
index 674b2b66cd0c0..9f267fd3d0d89 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
@@ -20,6 +20,7 @@
         </annotations>
 
         <before>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <createData entity="NewRootCategory" stepKey="createRootCategory"/>
         </before>
 
@@ -44,6 +45,7 @@
             <waitForElementVisible selector="{{AdminCategoryModalSection.ok}}" stepKey="waitForModalDeleteDefaultRootCategory" />
             <click selector="{{AdminCategoryModalSection.ok}}" stepKey="acceptModal1"/>
             <waitForElementVisible selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="waitForPageReloadAfterDeleteDefaultCategory"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
             <!--logout-->
             <actionGroup ref="logout" stepKey="logoutFromAdmin"/>
         </after>

From 209cd44f9911210d973980ef6a9816414284f3d2 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Tue, 5 Feb 2019 16:19:06 -0600
Subject: [PATCH 920/932] MC-13824: Ensure core tests disable WYSIWYG before
 execution

 - fix generation error
---
 app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
index f6c0ed8ebe50e..e6ab1c130606b 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -35,9 +35,6 @@
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
         </before>
-        <after>
-            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-        </after>
 
         <!--Go to Cms blocks page-->
         <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSPagesGrid"/>
@@ -71,6 +68,7 @@
                 <argument name="websiteName" value="secondWebsite"/>
             </actionGroup>
             <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
         </after>
     </test>
 </tests>

From 61bb47e035ddb75265974586e818a7640c3b71cd Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Wed, 6 Feb 2019 13:00:54 +0100
Subject: [PATCH 921/932] MC-13824: Ensure core tests disable WYSIWYG before
 execution

- Skip flaky test AdminProductImageAssignmentForMultipleStoresTest, see MC-13841
---
 .../Test/AdminProductImageAssignmentForMultipleStoresTest.xml  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml
index b9a5a31ad2168..37fbf01a6b9aa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductImageAssignmentForMultipleStoresTest.xml
@@ -18,6 +18,9 @@
             <testCaseId value="MAGETWO-58718"/>
             <group value="product"/>
             <group value="WYSIWYGDisabled"/>
+            <skip>
+                <issueId value="MC-13841"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login Admin -->

From d3466576ede9213ffd8bf67ae1608a5c715f5258 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 6 Feb 2019 14:00:27 -0600
Subject: [PATCH 922/932] MC-6279: Generic checkout skeleton flow

- skip failing MFTF test
---
 .../Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
index b91f796e6a18f..ede63322235f2 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
@@ -16,6 +16,9 @@
             <group value="wishlist"/>
             <severity value="AVERAGE"/>
             <testCaseId value="MAGETWO-95678"/>
+            <skip>
+                <issueId value="MC-13867"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="customStoreGroup" stepKey="storeGroup"/>

From 6ba77d5f6b6b4091cd675d5ed9d0442329d1f054 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Wed, 6 Feb 2019 14:03:26 -0600
Subject: [PATCH 923/932] MC-13824: Ensure core tests disable WYSIWYG before
 execution

 - skip flaky tests
---
 .../Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml
index 72a76dacc3297..06fe76c5efd0e 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityMultipleStoreViewsTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Cms\Test\TestCase\CreateCmsPageEntityMultipleStoreViewsTest" summary="Page cache for different CMS pages on multiple store views" ticketId="MAGETWO-52467">
         <variation name="CreateCmsPageEntityMultipleStoreViewsTestVariation1">
+            <data name="issue" xsi:type="string">MC-13801: Test "Page cache for different CMS pages on multiple store views" fails on Jenkins</data>
             <data name="cmsPages/0/is_active" xsi:type="string">Yes</data>
             <data name="cmsPages/0/title" xsi:type="string">NewCmsPage</data>
             <data name="cmsPages/0/store_id/dataset" xsi:type="string">default</data>

From 141453950f3a0cd7d3ba873359dff445e7d68c71 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 7 Feb 2019 00:11:35 -0600
Subject: [PATCH 924/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Test/Mftf/Data/CustomAttributeData.xml    |   8 +
 .../Bundle/Test/Mftf/Data/ProductData.xml     |  16 ++
 .../AdminDeleteBundleDynamicProductTest.xml   |  52 +++++
 .../AdminDeleteBundleFixedProductTest.xml     |  52 +++++
 .../ActionGroup/AdminProductActionGroup.xml   |   2 +-
 .../AdminProductAttributeActionGroup.xml      |  41 +++-
 .../AdminProductAttributeSetActionGroup.xml   |   9 +
 .../AdminProductGridActionGroup.xml           |  13 ++
 .../Catalog/Test/Mftf/Data/CategoryData.xml   |  16 +-
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  12 ++
 .../Catalog/Test/Mftf/Data/TierPriceData.xml  |   2 +-
 .../AdminProductAttributeGridSection.xml      |   1 +
 .../Mftf/Section/AdminProductFormSection.xml  |   5 +-
 .../Mftf/Section/AdminProductGridSection.xml  |   4 +-
 .../AdminProductModalSlideGridSection.xml     |   1 +
 .../Section/StorefrontCategoryMainSection.xml |   1 +
 ...StorefrontProductUpSellProductsSection.xml |  15 ++
 ...iveFlatCategoryAndUpdateAsInactiveTest.xml |  88 +++++++++
 .../AdminCreateInactiveFlatCategoryTest.xml   |  90 +++++++++
 ...inCreateInactiveInMenuFlatCategoryTest.xml |  89 +++++++++
 ...untryOfManufactureAttributeSKUMaskTest.xml |  61 ++++++
 .../Mftf/Test/AdminDeleteAttributeSetTest.xml |  55 ++++++
 .../Test/AdminDeleteProductAttributeTest.xml  |  64 ++++++
 ...AdminDeleteProductWithCustomOptionTest.xml |  54 ++++++
 .../Test/AdminDeleteSimpleProductTest.xml     |  53 +++++
 .../Test/AdminDeleteVirtualProductTest.xml    |  54 ++++++
 ...oryToAnotherPositionInCategoryTreeTest.xml | 116 +++++++++++
 ...dminNavigateMultipleUpSellProductsTest.xml | 183 ++++++++++++++++++
 ...inUpdateFlatCategoryAndAddProductsTest.xml | 102 ++++++++++
 ...ateFlatCategoryIncludeInNavigationTest.xml |  89 +++++++++
 ...dateFlatCategoryNameAndDescriptionTest.xml |  99 ++++++++++
 .../StorefrontCatalogSearchMainSection.xml    |   1 +
 .../Test/AdminAddImageToWYSIWYGBlockTest.xml  |   1 +
 .../ActionGroup/ConfigWYSIWYGActionGroup.xml  |  18 +-
 .../AdminDeleteConfigurableProductTest.xml    |  52 +++++
 .../Downloadable/Test/Mftf/Data/LinkData.xml  |  22 +++
 .../Test/Mftf/Data/ProductData.xml            |  14 ++
 .../AdminDeleteDownloadableProductTest.xml    |  57 ++++++
 .../Test/Mftf/Data/GroupedProductData.xml     |  12 ++
 .../Test/AdminDeleteGroupedProductTest.xml    |  57 ++++++
 .../Test/Mftf/Page/AdminExportIndexPage.xml   |  14 ++
 .../Section/AdminExportAttributeSection.xml   |  15 ++
 .../Mftf/Section/AdminExportMainSection.xml   |  14 ++
 .../Mftf/Page/AdminIndexManagementPage.xml    |  14 ++
 .../Section/AdminIndexManagementSection.xml   |   5 +-
 .../CreateCustomStoreViewActionGroup.xml      |  18 ++
 .../Section/AdminStoresMainActionsSection.xml |   2 +-
 .../Mftf/Section/StorefrontHeaderSection.xml  |   1 +
 .../Test/EndToEndB2CGuestUserTest.xml         |   2 +-
 .../Test/TestCase/DeleteProductEntityTest.xml |   2 +
 .../AdvancedMoveCategoryEntityTest.xml        |   1 +
 .../UpdateCategoryEntityFlatDataTest.xml      |   3 +
 ...dateInactiveCategoryEntityFlatDataTest.xml |   3 +
 ...pleProductEntityByAttributeMaskSkuTest.xml |   1 +
 .../CreateVirtualProductEntityTest.xml        |   7 +-
 .../Product/DeleteProductEntityTest.xml       |   4 +-
 .../Product/NavigateUpSellProductsTest.xml    |   2 +-
 .../DeleteAttributeSetTest.xml                |   2 +-
 .../DeleteProductAttributeEntityTest.xml      |   1 +
 .../Test/TestCase/DeleteProductEntityTest.xml |   2 +
 .../Test/TestCase/DeleteProductEntityTest.xml |   1 +
 .../Test/TestCase/DeleteProductEntityTest.xml |   1 +
 62 files changed, 1769 insertions(+), 27 deletions(-)
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductUpSellProductsSection.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml
 create mode 100644 app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
 create mode 100644 app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
 create mode 100644 app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportMainSection.xml
 create mode 100644 app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
index e6866ae74a7e1..256bfd7746957 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/CustomAttributeData.xml
@@ -23,4 +23,12 @@
         <data key="attribute_code">price_view</data>
         <data key="value">0</data>
     </entity>
+    <entity name="CustomAttributeFixWeight" type="custom_attribute">
+        <data key="attribute_code">weight_type</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="CustomAttributeFixSku" type="custom_attribute">
+        <data key="attribute_code">sku_type</data>
+        <data key="value">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
index 9dc30e73228d3..0a0c77755fc7a 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Data/ProductData.xml
@@ -31,6 +31,22 @@
         <data key="fixedPriceFormatted">$10.00</data>
         <data key="defaultAttribute">Default</data>
     </entity>
+    <entity name="FixedBundleProduct" type="product2">
+        <data key="name" unique="suffix">FixedBundleProduct</data>
+        <data key="sku" unique="suffix">fixed-bundle-product</data>
+        <data key="type_id">bundle</data>
+        <data key="attribute_set_id">4</data>
+        <data key="price">1.23</data>
+        <data key="visibility">4</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">fixed-bundle-product</data>
+        <requiredEntity type="custom_attribute">CustomAttributeCategoryIds</requiredEntity>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributePriceView</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeFixPrice</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeFixWeight</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeFixSku</requiredEntity>
+    </entity>
     <entity name="ApiBundleProduct" type="product2">
         <data key="name" unique="suffix">Api Bundle Product</data>
         <data key="sku" unique="suffix">api-bundle-product</data>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
new file mode 100644
index 0000000000000..bc9a3dba9a5f1
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
@@ -0,0 +1,52 @@
+<?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="AdminDeleteBundleDynamicProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Delete products"/>
+            <title value="Delete Bundle Dynamic Product"/>
+            <description value="Admin should be able to delete a bundle dynamic product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11016"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiBundleProductPriceViewRange" stepKey="createDynamicBundleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteBundleProductFilteredBySkuAndName">
+            <argument name="product" value="$$createDynamicBundleProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
+        <!-- Verify product on Product Page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createDynamicBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <!-- Search for the product by sku -->
+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createDynamicBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
+        <waitForPageLoad stepKey="waitForSearchButton"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResults"/>
+         <!-- Should not see any search results -->
+        <dontSee userInput="$$createDynamicBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
+        <!-- Go to the category page that we created in the before block -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <!-- Should not see the product -->
+        <dontSee userInput="$$createDynamicBundleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml
new file mode 100644
index 0000000000000..2527dae7eadf8
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml
@@ -0,0 +1,52 @@
+<?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="AdminDeleteBundleFixedProductTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Delete products"/>
+            <title value="Delete Bundle Fixed Product"/>
+            <description value="Admin should be able to delete a bundle fixed product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11017"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="FixedBundleProduct" stepKey="createFixedBundleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteBundleProductFilteredBySkuAndName">
+            <argument name="product" value="$$createFixedBundleProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
+        <!-- Verify product on Product Page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createFixedBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <!-- Search for the product by sku -->
+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createFixedBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
+        <waitForPageLoad stepKey="waitForSearchButton"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <!-- Should not see any search results -->
+        <dontSee userInput="$$createFixedBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
+        <!-- Go to the category page that we created in the before block -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <!-- Should not see the product -->
+        <dontSee userInput="$$createFixedBundleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index b74746035878b..cd4d58aaf4ec1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -235,7 +235,7 @@
         <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectProduct"/>
+        <checkOption selector="{{AdminProductModalSlideGridSection.productRowCheckboxBySku(sku)}}" stepKey="selectProduct"/>
         <click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
     </actionGroup>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index 8f8a86ac5adf1..ac2868396845f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -52,15 +52,48 @@
             <argument name="ProductAttribute"/>
         </arguments>
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}"
-                   userInput="{{ProductAttribute.default_label}}" stepKey="setAttributeCode"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttribute.default_label}}" stepKey="setAttributeCode"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
         <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
         <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="ClickOnDeleteButton"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
-                    stepKey="waitForSuccessMessage"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+    </actionGroup>
+    <!-- Delete product attribute by Attribute Code -->
+    <actionGroup name="deleteProductAttributeByAttributeCode">
+        <arguments>
+            <argument name="ProductAttributeCode" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttributeCode}}" stepKey="setAttributeCode"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
+        <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="clickOnAttributeRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+        <click selector="{{AttributePropertiesSection.DeleteAttribute}}" stepKey="deleteAttribute"/>
+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="ClickOnDeleteButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccessMessage"/>
+    </actionGroup>
+    <!--Filter product attribute by Attribute Code -->
+    <actionGroup name="filterProductAttributeByAttributeCode">
+        <arguments>
+            <argument name="ProductAttributeCode" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{ProductAttributeCode}}" stepKey="setAttributeCode"/>
+        <waitForPageLoad stepKey="waitForUserInput"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
+    </actionGroup>
+    <!--Filter product attribute by Default Label -->
+    <actionGroup name="filterProductAttributeByDefaultLabel">
+        <arguments>
+            <argument name="productAttributeLabel" type="string"/>
+        </arguments>
+        <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
+        <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="{{productAttributeLabel}}" stepKey="setDefaultLabel"/>
+        <waitForPageLoad stepKey="waitForUserInput"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
index 5948ca12dcf0f..a3b4203b7a69e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml
@@ -45,4 +45,13 @@
         <fillField selector="{{AdminProductAttributeSetSection.name}}" userInput="{{label}}" stepKey="fillName"/>
         <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave1"/>
     </actionGroup>
+    <!-- Filter By Attribute Label -->
+    <actionGroup name="filterProductAttributeByAttributeLabel">
+        <arguments>
+            <argument name="productAttributeLabel" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminProductAttributeGridSection.attributeLabelFilter}}" userInput="{{productAttributeLabel}}" stepKey="setAttributeLabel"/>
+        <waitForPageLoad stepKey="waitForUserInput"/>
+        <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index 817da18f5f2b7..7d58f97e0cbb6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -144,6 +144,18 @@
         <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
     </actionGroup>
 
+    <!-- Filter product grid by sku, name -->
+    <actionGroup name="filterProductGridBySkuAndName">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+    </actionGroup>
+
     <!--Delete a product by filtering grid and using delete action-->
     <actionGroup name="deleteProductUsingProductGrid">
         <arguments>
@@ -155,6 +167,7 @@
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
         <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{product.name}}" stepKey="fillProductNameFilter"/>
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
         <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{product.sku}}"  stepKey="seeProductSkuInGrid"/>
         <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index 5419a564966e7..a11c3fd0d7afa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -44,11 +44,11 @@
     </entity>
     <entity name="FirstLevelSubCat" type="category">
         <data key="name" unique="suffix">FirstLevelSubCategory</data>
-        <data key="name_lwr" unique="suffix">subcategory</data>
+        <data key="name_lwr" unique="suffix">firstlevelsubcategory</data>
     </entity>
     <entity name="SecondLevelSubCat" type="category">
         <data key="name" unique="suffix">SecondLevelSubCategory</data>
-        <data key="name_lwr" unique="suffix">subcategory</data>
+        <data key="name_lwr" unique="suffix">secondlevelsubcategory</data>
     </entity>
     <entity name="ThirdLevelSubCat" type="category">
         <data key="name" unique="suffix">ThirdLevelSubCategory</data>
@@ -92,4 +92,16 @@
         <data key="include_in_menu">true</data>
         <var key="parent_id" entityType="category" entityKey="id" />
     </entity>
+    <entity name="CatNotIncludeInMenu" type="category">
+        <data key="name" unique="suffix">NotInclMenu</data>
+        <data key="name_lwr" unique="suffix">notinclemenu</data>
+        <data key="is_active">true</data>
+        <data key="include_in_menu">false</data>
+    </entity>
+    <entity name="CatNotActive" type="category">
+        <data key="name" unique="suffix">NotActive</data>
+        <data key="name_lwr" unique="suffix">notactive</data>
+        <data key="is_active">false</data>
+        <data key="include_in_menu">true</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 47dff6cb17c85..7a9467ca54acd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -696,4 +696,16 @@
         <data key="urlKey" unique="suffix">virtual-product</data>
         <data key="type_id">virtual</data>
     </entity>
+    <entity name="nameAndAttributeSkuMaskSimpleProduct" type="product">
+        <data key="urlKey" unique="suffix">simple-product</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
+        <data key="price">10000.00</data>
+        <data key="quantity">657</data>
+        <data key="weight">50</data>
+        <data key="country_of_manufacture">UA</data>
+        <data key="country_of_manufacture_label">Ukraine</data>
+        <data key="type_id">simple</data>
+        <data key="status">1</data>
+        <requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
index 7fd0c65a2f753..cb8bb47f3cc93 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
@@ -7,7 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="testDataTierPrice" type="data">
         <data key="goldenPrice1">$676.50</data>
         <data key="goldenPrice2">$615.00</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
index 160948f8f1f2c..d3aaeefdc6bb2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeGridSection.xml
@@ -16,5 +16,6 @@
         <element name="ResetFilter" type="button" selector="button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="FirstRow" type="button" selector="//*[@id='attributeGrid_table']/tbody/tr[1]" timeout="30"/>
         <element name="FilterByAttributeCode" type="input" selector="#attributeGrid_filter_attribute_code"/>
+        <element name="attributeLabelFilter" type="input" selector="//input[@name='frontend_label']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 4cb676420689b..13dc2320c7095 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -57,6 +57,7 @@
         <element name="selectCategory" type="input" selector="//*[@data-index='category_ids']//label[contains(., '{{categoryName}}')]" parameterized="true"/>
         <element name="done" type="button" selector="//*[@data-index='category_ids']//button[@data-action='close-advanced-select']" timeout="30"/>
         <element name="selectMultipleCategories" type="input" selector="//*[@data-index='container_category_ids']//*[contains(@class, '_selected')]"/>
+        <element name="countryOfManufacture" type="select" selector="select[name='product[country_of_manufacture]']"/>
     </section>
     <section name="ProductInWebsitesSection">
         <element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>
@@ -67,10 +68,12 @@
         <element name="LayoutDropdown" type="select" selector="select[name='product[page_layout]']"/>
     </section>
     <section name="AdminProductFormRelatedUpSellCrossSellSection">
+        <element name="relatedProductsHeader" type="button" selector=".admin__collapsible-block-wrapper[data-index='related']" timeout="30"/>
         <element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
+        <element name="addUpSellProduct" type="button" selector="button[data-index='button_upsell']" timeout="30"/>
     </section>
     <section name="AdminAddRelatedProductsModalSection">
-        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'product_form_product_form_related_related_modal')]//button/span[contains(text(), 'Add Selected Products')]" timeout="30"/>
+        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'upsell_modal')]//button[contains(@class, 'action-primary')]" timeout="30"/>
     </section>
     <section name="ProductWYSIWYGSection">
         <element name="Switcher" type="button" selector="//select[@id='dropdown-switcher']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index 30d1088303214..02bdbac313076 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -8,8 +8,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductGridSection">
-        <element name="productRowBySku" type="block" selector="//div[@id='container']//tr//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
-        <element name="productRowCheckboxBySku" type="block" selector="//div[@id='container']//tr//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]/../td//input[@data-action='select-row']" parameterized="true" />
+        <element name="productRowBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
+        <element name="productRowCheckboxBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]/../td//input[@data-action='select-row']" parameterized="true" />
         <element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
index adc3a753f06f5..dbdc82026947e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductModalSlideGridSection.xml
@@ -10,5 +10,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductModalSlideGridSection">
         <element name="productGridXRowYColumnButton" type="input" selector=".modal-slide table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
+        <element name="productRowCheckboxBySku" type="input" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]/../td//input[@data-action='select-row']" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index a173864136e7b..de7ee35a40f8f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -31,5 +31,6 @@
         <element name="emptyProductMessage" type="block" selector=".message.info.empty>div"/>
         <element name="lineProductName" type="text" selector=".products.list.items.product-items li:nth-of-type({{line}}) .product-item-link" timeout="30" parameterized="true"/>
         <element name="asLowAs" type="input" selector="//*[@class='price-box price-final_price']/a/span[@class='price-container price-final_price tax weee']"/>
+        <element name="productsList" type="block" selector="#maincontent .column.main"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductUpSellProductsSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductUpSellProductsSection.xml
new file mode 100644
index 0000000000000..f00abbe3c58c5
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductUpSellProductsSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontProductUpSellProductsSection">
+        <element name="upSellHeading" type="text" selector="#block-upsell-heading"/>
+        <element name="upSellProducts" type="text" selector="div.upsell .product-item-name"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
new file mode 100644
index 0000000000000..4ea41f7fea95b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -0,0 +1,88 @@
+<?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="AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest">
+        <annotations>
+            <stories value="Create category"/>
+            <title value="Flat Catalog - Update Inactive Category as Inactive, Should Not be Visible on Storefront"/>
+            <description value="Login as admin and create inactive flat category and update category as inactive and verify category is not visible in store front"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11009"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!--Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <!--Create category-->
+            <createData entity="CatNotActive" stepKey="createCategory"/>
+            <!-- Create First StoreView  -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
+                <argument name="storeView" value="customStoreEN"/>
+            </actionGroup>
+            <!-- Create Second StoreView -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
+                <argument name="storeView" value="customStoreFR"/>
+            </actionGroup>
+            <!--Run full reindex and clear caches -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <!--Enable Flat Catalog Category -->
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Select created category and make category inactive-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatNotActive.name)}}" stepKey="selectCreatedCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{CatNotActive.name}}" stepKey="seeUpdatedCategoryTitle"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"  stepKey="verifyInactiveCategory"/>
+        <!--Run full reindex and clear caches -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <!--Open Index Management Page -->
+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
+        <!--Verify Category In Store Front-->
+        <amOnPage url="/$$createCategory.name$$.html"  stepKey="openCategoryPage1"/>
+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
+        <seeElement selector="{{StorefrontBundledSection.pageNotFound}}" stepKey="seeWhoopsOurBadMessage"/>
+        <!--Verify category is not visible in First Store View -->
+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectForstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnNavigation"/>
+        <!--Verify category is not visible in Second Store View -->
+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
+        <waitForPageLoad stepKey="waitForSecondStoreView"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnNavigation1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
new file mode 100644
index 0000000000000..22fb2034be562
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
@@ -0,0 +1,90 @@
+<?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="AdminCreateInactiveFlatCategoryTest">
+        <annotations>
+            <stories value="Create category"/>
+            <title value="Flat Catalog - Create Category as Inactive, Should Not be Visible on Storefront"/>
+            <description value="Login as admin and create flat Inactive category and verify category is not visible in store front"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11007"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!--Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <!--Create category-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <!-- Create First StoreView  -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
+                <argument name="storeView" value="customStoreEN"/>
+            </actionGroup>
+            <!-- Create Second StoreView -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
+                <argument name="storeView" value="customStoreFR"/>
+            </actionGroup>
+            <!--Run full reindex and clear caches -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <!--Enable Flat Catalog Category -->
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Select created category and make category inactive-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableActiveCategory"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
+        <!--Run full reindex and clear caches -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <!--Open Index Management Page -->
+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
+        <!--Verify Category In Store Front-->
+        <amOnPage url="/$$createCategory.name$$.html"  stepKey="openCategoryPage1"/>
+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
+        <!--Verify category is not visible in First Store View -->
+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectForstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnNavigation"/>
+        <seeElement selector="{{StorefrontBundledSection.pageNotFound}}" stepKey="seeWhoopsOurBadMessage"/>
+        <!--Verify category is not visible in Second Store View -->
+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
+        <waitForPageLoad stepKey="waitForSecondstoreView"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="dontSeeCategoryOnNavigation1"/>
+        <seeElement selector="{{StorefrontBundledSection.pageNotFound}}" stepKey="seeWhoopsOurBadMessage1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
new file mode 100644
index 0000000000000..4046c81d32981
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
@@ -0,0 +1,89 @@
+<?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="AdminCreateInactiveInMenuFlatCategoryTest">
+        <annotations>
+            <stories value="Create category"/>
+            <title value="Flat Catalog - Exclude Category from Navigation Menu"/>
+            <description value="Login as admin and create inactive Include In Menu flat category and verify category is not displayed in Navigation Menu"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11008"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <!--Login as admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <!--Create category-->
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <!-- Create First StoreView  -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
+                <argument name="storeView" value="customStoreEN"/>
+            </actionGroup>
+            <!-- Create Second StoreView -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
+                <argument name="storeView" value="customStoreFR"/>
+            </actionGroup>
+            <!--Run full reindex and clear caches -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <!--Enable Flat Catalog Category -->
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Select created category and disable Include In Menu option-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIcludeInMenuOption"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <!--Verify category is saved and Include In Menu Option is disabled in Category Page -->
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
+        <!--Run full reindex and clear caches -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <!--Open Index Management Page -->
+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
+        <!--Verify Category In Store Front-->
+        <amOnPage url="/$$category.name$$.html"  stepKey="openCategoryPage1"/>
+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
+        <!--Verify category is not displayed in navigation menu in First Store View -->
+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectForstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category.name$$)}}" stepKey="seeCategoryOnNavigation"/>
+        <!--Verify category is not displayed in navigation menu in Second Store View -->
+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
+        <waitForPageLoad stepKey="waitForSecondstoreView"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category.name$$)}}" stepKey="seeCategoryOnNavigation1"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
new file mode 100644
index 0000000000000..2298ce817fe95
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
@@ -0,0 +1,61 @@
+<?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="AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest">
+        <annotations>
+            <stories value="Create simple product"/>
+            <title value="Create simple product with (Country of Manufacture) Attribute SKU Mask"/>
+            <description value="Test log in to Create simple product and Create simple product with (Country of Manufacture) Attribute SKU Mask"/>
+            <testCaseId value="MC-11024"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <magentoCLI stepKey="setCountryOfManufacture" command="config:set catalog/fields_masks/sku" arguments="'{{name}} {{country_of_manufacture}}'"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
+                <argument name="sku" value="{{nameAndAttributeSkuMaskSimpleProduct.name}} {{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" />
+            </actionGroup>
+            <magentoCLI stepKey="setName" command="config:set catalog/fields_masks/sku" arguments="'{{name}}'"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
+        <waitForPageLoad stepKey="waitForProductToggleToSelectSimpleProduct"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickSimpleProductFromDropDownList"/>
+
+        <!-- Create simple product with country of manufacture attribute -->
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}" stepKey="fillSimpleProductName"/>
+        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.price}}" stepKey="fillSimpleProductPrice"/>
+        <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.weight}}" stepKey="fillSimpleProductWeight"/>
+        <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.quantity}}" stepKey="fillSimpleProductQuantity"/>
+        <selectOption selector="{{AdminProductFormSection.countryOfManufacture}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="selectCountryOfManufacture"/>
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForSimpleProductToSave"/>
+        <!-- Verify customer see success message -->
+        <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
+
+        <!-- Search created simple product(from above step) in the grid page to verify sku masked as name and country of manufacture -->
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchCreatedSimpleProduct"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}} {{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="fillSkuFilterFieldWithNameAndCountryOfManufactureInput" />
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <waitForPageLoad stepKey="waitForProductSearchAfterApplyingFilters"/>
+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}} {{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="seeSimpleProductSkuMaskedAsNameAndCountryOfManufacture"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml
new file mode 100644
index 0000000000000..4d28ccbd44d2c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml
@@ -0,0 +1,55 @@
+<?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="AdminDeleteAttributeSetTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Delete Attribute Set"/>
+            <description value="Admin should be able to delete an attribute set"/>
+            <testCaseId value="MC-4413"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
+            <createData entity="SimpleProductWithCustomAttributeSet" stepKey="SimpleProductWithCustomAttributeSet">
+                <requiredEntity createDataKey="createCategory"/>
+                <requiredEntity createDataKey="createAttributeSet"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSetsPage"/>
+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="filterByAttributeName"/>
+        <!-- Filter the grid to find created below attribute set -->
+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
+        <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+        <!-- Delete attribute set and confirm the modal -->
+        <click selector="{{AdminProductAttributeSetSection.deleteBtn}}" stepKey="clickDelete"/>
+        <click selector="{{AdminProductAttributeSetSection.modalOk}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="The attribute set has been removed." stepKey="deleteMessage"/>
+        <!-- Assert the attribute set is not in the grid -->
+        <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="$$createAttributeSet.attribute_set_name$$" stepKey="filterByAttributeName2"/>
+        <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch2"/>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
+        <!-- Search for the product by sku and name on the product page -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToAdminProductIndex"/>
+        <waitForPageLoad stepKey="waitForAdminProductIndex"/>
+        <actionGroup ref="filterProductGridBySkuAndName" stepKey="filerProductsBySkuAndName">
+            <argument name="product" value="SimpleProductWithCustomAttributeSet"/>
+        </actionGroup>
+        <!-- Should not see the product -->
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml
new file mode 100644
index 0000000000000..54b83e034fb11
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml
@@ -0,0 +1,64 @@
+<?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="DeleteProductAttributeTest">
+        <annotations>
+            <features value="Catalog"/>
+            <title value="Delete Product Attribute"/>
+            <description value="Admin should able to delete a product attribute"/>
+            <testCaseId value="MC-10887"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="productAttributeWysiwyg" stepKey="createProductAttribute"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="deleteProductAttributeByAttributeCode" stepKey="deleteProductAttribute">
+            <argument name="ProductAttributeCode" value="$$createProductAttribute.attribute_code$$"/>
+        </actionGroup>
+        <!-- Assert the product attribute is not in the grid by Attribute code -->
+        <actionGroup ref="filterProductAttributeByAttributeCode" stepKey="filterByAttributeCode">
+            <argument name="ProductAttributeCode" value="$$createProductAttribute.attribute_code$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
+        <!--Assert the product attribute is not in the grid by Default Label -->
+        <actionGroup ref="filterProductAttributeByDefaultLabel" stepKey="filterByDefaultLabel">
+            <argument name="productAttributeLabel" value="$$createProductAttribute.default_frontend_label$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
+         <!--Go to the Catalog > Products page and create Simple Product -->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
+        <waitForPageLoad stepKey="waitForProductList"/>
+        <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductBtn"/>
+        <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="chooseAddSimpleProduct"/>
+        <waitForPageLoad stepKey="waitForProductAdded"/>
+        <!-- Press Add Attribute button -->
+        <click selector="{{AdminProductFormSection.addAttributeBtn}}" stepKey="clickAddAttributeBtn"/>
+        <waitForPageLoad stepKey="waitForAttributeAdded"/>
+        <!-- Filter By Attribute Label on Add Attribute Page -->
+        <click selector="{{AdminProductFiltersSection.filter}}" stepKey="clickOnFilter"/>
+        <actionGroup ref="filterProductAttributeByAttributeLabel" stepKey="filterByAttributeLabel">
+            <argument name="productAttributeLabel" value="$$createProductAttribute.default_frontend_label$$"/>
+        </actionGroup>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage3"/>
+         <!-- Filter By Attribute Code on Export > Products page -->
+        <amOnPage url="{{AdminExportIndexPage.url}}" stepKey="navigateToSystemExport"/>
+        <selectOption selector="{{AdminExportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
+        <waitForElementVisible selector="{{AdminExportMainSection.entityAttributes}}" stepKey="waitForElementVisible"/>
+        <click selector="{{AdminExportAttributeSection.resetFilter}}" stepKey="resetFilter"/>
+        <fillField selector="{{AdminExportAttributeSection.filterByAttributeCode}}" userInput="$$createProductAttribute.attribute_code$$" stepKey="setAttributeCode"/>
+        <waitForPageLoad stepKey="waitForUserInput"/>
+        <click selector="{{AdminExportAttributeSection.search}}" stepKey="searchForAttribute"/>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml
new file mode 100644
index 0000000000000..7f6a1333b721a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml
@@ -0,0 +1,54 @@
+<?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="AdminDeleteProductWithCustomOptionTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Delete products"/>
+            <title value="Delete Product with Custom Option"/>
+            <description value="Admin should be able to delete a product with custom option"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11015"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <updateData createDataKey="createSimpleProduct" entity="productWithOptions2" stepKey="updateProductWithCustomOption"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProductFilteredBySkuAndName">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
+        <!--Verify product on product page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <!-- Search for the product by sku -->
+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
+        <waitForPageLoad stepKey="waitForSearchButton"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <!-- Should not see any search results -->
+        <dontSee userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
+        <!-- Go to the category page that we created in the before block -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <!-- Should not see the product -->
+        <dontSee userInput="$$createSimpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml
new file mode 100644
index 0000000000000..7c460a3dfc51e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml
@@ -0,0 +1,53 @@
+<?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="AdminDeleteSimpleProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Delete products"/>
+            <title value="Delete Simple Product"/>
+            <description value="Admin should be able to delete a simple product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11013"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteSimpleProductFilteredBySkuAndName">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
+        <!--Verify product on Product Page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <!-- Search for the product by sku -->
+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
+        <waitForPageLoad stepKey="waitForSearchButton"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <!-- Should not see any search results -->
+        <dontSee userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
+        <!-- Go to the category page that we created in the before block -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <!-- Should not see the product -->
+        <dontSee userInput="$$createSimpleProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml
new file mode 100644
index 0000000000000..413d53d1c3746
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml
@@ -0,0 +1,54 @@
+<?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="AdminDeleteVirtualProductTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Delete products"/>
+            <title value="Delete Virtual Product"/>
+            <description value="Admin should be able to delete a virtual product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11014"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="defaultVirtualProduct" stepKey="createVirtualProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteVirtualProductFilteredBySkuAndName">
+            <argument name="product" value="$$createVirtualProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
+        <!--Verify product on product page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.name$$)}}" stepKey="amOnVirtualProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <!-- Search for the product by sku -->
+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createVirtualProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
+        <waitForPageLoad stepKey="waitForSearchButton"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <!-- Should not see any search results -->
+        <dontSee userInput="$$createVirtualProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
+        <!-- Go to the category page that we created in the before block -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <!-- Should not see the product -->
+        <dontSee userInput="$$createVirtualProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
new file mode 100644
index 0000000000000..9831f73e07877
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.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="AdminMoveCategoryToAnotherPositionInCategoryTreeTest">
+        <annotations>
+            <stories value="Move categories"/>
+            <title value="Move Category to Another Position in Category Tree"/>
+            <description value="Test log in to Move Category and Move Category to Another Position in Category Tree"/>
+            <testCaseId value="MC-13612"/>
+            <severity value="CRITICAL"/>
+            <group value="catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
+            <actionGroup ref="DeleteCategory" stepKey="SecondLevelSubCat">
+                <argument name="categoryEntity" value="SecondLevelSubCat"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!-- Open Category Page -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickExpandTree"/>
+        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <!-- Create three level deep sub Category -->
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickAddSubCategoryButton"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillSubCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFirstLevelSubCategory"/>
+        <waitForPageLoad stepKey="waitForFirstLevelCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButtonAgain"/>
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondLevelSubCategoryName"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSecondLevelSubCategory"/>
+        <waitForPageLoad stepKey="waitForSecondLevelCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
+        <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#" />
+
+        <!-- Move Category to another position in category tree, but click cancel button -->
+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
+        <click selector="{{AdminCategoryModalSection.cancel}}" stepKey="clickCancelButtonOnWarningPopup"/>
+        <!-- Verify Category in store front page after clicking cancel button -->
+        <amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SecondLevelSubCat.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
+        <waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
+        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
+        <!-- Verify breadcrumbs in store front page after clicking cancel button -->
+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
+        <assertEquals  stepKey="verifyTheCategoryInStoreFrontPage">
+            <expectedResult type="array">['Home', $$createDefaultCategory.name$$,{{FirstLevelSubCat.name}},{{SecondLevelSubCat.name}}]</expectedResult>
+            <actualResult type="variable">breadcrumbs</actualResult>
+        </assertEquals>
+
+        <!-- Move Category to another position in category tree and click ok button-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openTheAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitTillPageLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="DragCategory"/>
+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessageForOneMoreTime"/>
+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
+        <waitForPageLoad stepKey="waitTheForPageToLoad"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
+        <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeCategoryNameInStoreFrontPage"/>
+        <waitForPageLoad  stepKey="waitForStoreFrontPageToLoad"/>
+        <!-- Verify Category in store front after moving category to another position in category tree -->
+        <amOnPage url="{{StorefrontCategoryPage.url(SecondLevelSubCat.name)}}"  stepKey="amOnCategoryPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SecondLevelSubCat.name)}}" stepKey="seeCategoryInTitle"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
+        <!-- Verify breadcrumbs in store front page after moving category to another position in category tree -->
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="clickCategoryOnNavigation"/>
+        <waitForPageLoad stepKey="waitForCategoryLoad"/>
+        <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbsAfterMove"/>
+        <assertEquals  stepKey="verifyBreadcrumbsInFrontPageAfterMove">
+            <expectedResult type="array">['Home',{{SecondLevelSubCat.name}}]</expectedResult>
+            <actualResult type="variable">breadcrumbsAfterMove</actualResult>
+        </assertEquals>
+
+        <!-- Open Url Rewrite page and see the url rewrite for the moved category -->
+        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
+        <waitForPageLoad stepKey="waitForUrlRewritePageLoad"/>
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SecondLevelSubCat.name_lwr}}.html" stepKey="fillCategoryUrlKey"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton"/>
+        <waitForPageLoad stepKey="waitForUrlPageToLoad"/>
+        <!-- Verify new Redirect Path after move -->
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('2')}}" userInput="{{SecondLevelSubCat.name_lwr}}.html" stepKey="verifyTheRequestPathAfterMove"/>
+        <!-- Verify new Target Path after move -->
+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('2')}}" userInput="catalog/category/view/id/{$categoryId}" stepKey="verifyTheTargetPathAfterMove"/>
+        <!-- Verify new RedirectType after move -->
+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('2')}}" userInput="No" stepKey="verifyTheRedirectTypeAfterMove"/>
+        <!-- Verify before move Redirect Path displayed with associated Target Path and Redirect Type-->
+        <fillField selector="{{AdminUrlRewriteIndexSection.requestPathFilter}}" userInput="{{SecondLevelSubCat.name_lwr}}" stepKey="fillTheCategoryUrlKey"/>
+        <click selector="{{AdminUrlRewriteIndexSection.searchButton}}" stepKey="clickOnSearchButton2"/>
+        <waitForPageLoad stepKey="waitForSearch"/>
+        <see selector="{{AdminUrlRewriteIndexSection.redirectTypeColumn('1')}}" userInput="Permanent (301)" stepKey="verifyTheRedirectTypeBeforeMove"/>
+        <see selector="{{AdminUrlRewriteIndexSection.requestPathColumn('1')}}" userInput="{{_defaultCategory.name_lwr}}2/{{FirstLevelSubCat.name_lwr}}/{{SecondLevelSubCat.name_lwr}}.html" stepKey="verifyTheRequestPathBeforeMove"/>
+        <see selector="{{AdminUrlRewriteIndexSection.targetPathColumn('1')}}" userInput="{{SecondLevelSubCat.name_lwr}}.html" stepKey="verifyTheTargetPathBeforeMove"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
new file mode 100644
index 0000000000000..b7540d8935960
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
@@ -0,0 +1,183 @@
+<?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="AdminNavigateMultipleUpSellProductsTest">
+        <annotations>
+            <stories value="Up Sell products"/>
+            <title value="Promote Multiple Products (Simple, Configurable) as Up-Sell Products"/>
+            <description value="Login as admin and add simple and configurable Products as Up-Sell products"/>
+            <testCaseId value="MC-8902"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <!--Create Simple Products-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory1"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleSubCategory" stepKey="createCategory2"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct1">
+                <requiredEntity createDataKey="createCategory2"/>
+            </createData>
+
+            <!-- Create the configurable product with product Attribute options-->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="AddToDefaultSet" stepKey="delete">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+            </createData>
+            <createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+
+            <!--Login as admin-->
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <!--Logout as admin-->
+            <actionGroup ref="logout" stepKey="logout"/>
+
+            <!--Delete created data-->
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCategory1" stepKey="deleteSubCategory1"/>
+            <deleteData createDataKey="createCategory2" stepKey="deleteCategory2"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deletecreateConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deletecreateConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
+        </after>
+
+        <!--Open Product Index Page-->
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+
+        <!--Select SimpleProduct -->
+        <actionGroup ref="filterProductGridBySku" stepKey="findCreatedProduct">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
+        <waitForPageLoad stepKey="waitForProductToLoad"/>
+
+        <!--Add SimpleProduct1 and ConfigProduct as Up sell products-->
+        <click stepKey="clickOnRelatedProducts" selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedProductsHeader}}"/>
+        <click stepKey="clickOnAddUpSellProducts" selector="{{AdminProductFormRelatedUpSellCrossSellSection.addUpSellProduct}}"/>
+        <actionGroup ref="filterProductGridBySku2" stepKey="filterProduct">
+            <argument name="sku" value="$$createSimpleProduct1.sku$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForTheProductToLoad"/>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectTheSimpleProduct2"/>
+        <click stepKey="addSelectedProduct" selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}"/>
+        <waitForPageLoad stepKey="waitForProductToBeAdded"/>
+        <click stepKey="clickOnAddUpSellProductsButton" selector="{{AdminProductFormRelatedUpSellCrossSellSection.addUpSellProduct}}"/>
+        <actionGroup ref="filterProductGridBySku2" stepKey="filterConfigurableProduct">
+            <argument name="sku" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForTheConfigProductToLoad"/>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectTheConfigProduct"/>
+        <click stepKey="addSelectedProductButton" selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}"/>
+        <waitForPageLoad stepKey="waitForConfigProductToBeAdded"/>
+        <click stepKey="clickOnRelatedProducts1" selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedProductsHeader}}"/>
+        <click stepKey="clickOnSaveButton" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <waitForPageLoad stepKey="waitForLoading1"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
+
+        <!--Go to Product Index Page -->
+        <click stepKey="clickOnBackButton" selector="{{AdminGridMainControls.back}}"/>
+        <waitForPageLoad stepKey="waitForProductsToBeLoaded"/>
+
+        <!--Select Configurable Product-->
+        <actionGroup ref="filterProductGridBySku" stepKey="findConfigProduct">
+            <argument name="product" value="$$createConfigProduct$$"/>
+        </actionGroup>
+        <click stepKey="openConfigProduct" selector="{{AdminProductGridSection.productRowBySku($$createConfigProduct.sku$$)}}"/>
+        <waitForPageLoad stepKey="waitForConfigProductToLoad"/>
+
+        <!--Add  SimpleProduct1 as Up Sell Product-->
+        <click stepKey="clickOnRelatedProductsHeader" selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedProductsHeader}}"/>
+        <click stepKey="clickOnAddUpSellProductsButton1" selector="{{AdminProductFormRelatedUpSellCrossSellSection.addUpSellProduct}}"/>
+        <actionGroup ref="filterProductGridBySku2" stepKey="filterSimpleProduct2">
+            <argument name="sku" value="$$createSimpleProduct1.sku$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForTheSimpleProduct2ToBeLoaded"/>
+        <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectSimpleProduct1"/>
+        <click stepKey="addSimpleProduct2" selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}"/>
+        <waitForPageLoad stepKey="waitForSimpleProductToBeAdded"/>
+        <scrollTo selector="{{AdminProductFormActionSection.saveButton}}" stepKey="scrollToTheSaveButton"/>
+        <click stepKey="clickOnSaveButton1" selector="{{AdminProductFormActionSection.saveButton}}"/>
+        <waitForPageLoad stepKey="waitForLoading2"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown1"/>
+        <waitForPageLoad stepKey="waitForUpdatesTobeSaved1"/>
+
+        <!--Go to SimpleProduct store front page-->
+        <amOnPage url="$$createSimpleProduct.sku$$.html" stepKey="goToSimpleProductFrontPage"/>
+        <waitForPageLoad stepKey="waitForProduct"/>
+        <see stepKey="seeProductName" userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontProductInfoMainSection.productName}}"/>
+        <scrollTo stepKey="scrollToTheUpSellHeading" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}"/>
+
+        <!--Verify Up Sell Products displayed in SimpleProduct page-->
+        <see stepKey="seeTheUpSellHeading" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}" userInput="We found other products you might like!"/>
+        <see stepKey="seeSimpleProduct1" selector="{{StorefrontProductUpSellProductsSection.upSellProducts}}" userInput="$$createSimpleProduct1.name$$"/>
+        <see stepKey="seeConfigProduct" selector="{{StorefrontProductUpSellProductsSection.upSellProducts}}" userInput="$$createConfigProduct.name$$"/>
+
+        <!--Go to Config Product store front page-->
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="goToConfigProductFrontPage"/>
+        <waitForPageLoad stepKey="waitForConfigProductToBeLoaded"/>
+        <scrollTo stepKey="scrollToTheUpSellHeading1" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}"/>
+
+        <!--Verify Up Sell Products displayed in ConfigProduct page-->
+        <see stepKey="seeTheUpSellHeading1" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}" userInput="We found other products you might like!"/>
+        <see stepKey="seeSimpleProduct2" selector="{{StorefrontProductUpSellProductsSection.upSellProducts}}" userInput="$$createSimpleProduct1.name$$"/>
+
+        <!--Go to SimpleProduct1 store front page-->
+        <amOnPage url="$$createSimpleProduct1.sku$$.html" stepKey="goToSimpleProduct1FrontPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProduct1ToBeLoaded"/>
+
+        <!--Verify No Up Sell Products displayed in SimplProduct1 page-->
+        <dontSee stepKey="dontSeeTheUpSellHeading1" selector="{{StorefrontProductUpSellProductsSection.upSellHeading}}" userInput="We found other products you might like!"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
new file mode 100644
index 0000000000000..73b6855c0e3e1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -0,0 +1,102 @@
+<?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="AdminUpdateFlatCategoryAndAddProductsTest">
+        <annotations>
+            <stories value="Update category"/>
+            <title value="Flat Catalog - Assign Simple Product to Category"/>
+            <description value="Login as admin, update flat category by adding a simple product"/>
+            <testCaseId value="MC-11012"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <!-- Create Simple Product -->
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <!-- Create category -->
+            <createData entity="defaultSimpleProduct" stepKey="createSimpleProduct"/>
+            <!-- Create First StoreView  -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
+                <argument name="storeView" value="customStoreEN"/>
+            </actionGroup>
+            <!-- Create Second StoreView -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
+                <argument name="storeView" value="customStoreFR"/>
+            </actionGroup>
+            <!--Run full reindex and clear caches -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <!--Enable Flat Catalog Category -->
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <magentoCLI stepKey="setIndexersMode" command="indexer:set-mode" arguments="realtime" />
+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Select Created Category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
+        <waitForPageLoad stepKey="waitForTheCategoryPageToLoaded"/>
+        <!--Add Products in Category-->
+        <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
+        <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
+        <scrollToTopOfPage stepKey="scrollOnTopOfPage"/>
+        <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
+        <waitForPageLoad stepKey="waitForProductsToLoad"/>
+        <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$createSimpleProduct.name$$"  stepKey="selectProduct"/>
+        <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitFroPageToLoad1"/>
+        <scrollTo  selector="{{AdminCategoryContentSection.productTableRow}}"  stepKey="scrollToTableRow"/>
+        <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <!--Open Index Management Page and verify flat categoryIndex status-->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <!--Open Index Management Page -->
+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageToLoad"/>
+        <see stepKey="seeCategoryIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
+        <!--Verify Product In Store Front-->
+        <amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <!--Verify product and category is visible in First Store View -->
+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectFirstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category.name$$)}}" stepKey="seeCategoryOnNavigation"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="assertProductName"/>
+        <!--Verify product and category is visible in Second Store View -->
+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
+        <waitForPageLoad stepKey="waitForSecondStoreView"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$category.name$$)}}" stepKey="seeCategoryOnNavigation1"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="seeProductName"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
new file mode 100644
index 0000000000000..8ecd860dfa082
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
@@ -0,0 +1,89 @@
+<?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="AdminUpdateFlatCategoryAndIncludeInMenuTest">
+        <annotations>
+            <stories value="Update category"/>
+            <title value="Flat Catalog - Update Category, Include in Navigation Menu"/>
+            <description value="Login as admin and update flat category by enabling Include in Menu"/>
+            <testCaseId value="MC-11011"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <!--Create category-->
+            <createData entity="CatNotIncludeInMenu" stepKey="createCategory"/>
+            <!-- Create First StoreView  -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
+                <argument name="storeView" value="customStoreEN"/>
+            </actionGroup>
+            <!-- Create Second StoreView -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
+                <argument name="storeView" value="customStoreFR"/>
+            </actionGroup>
+            <!--Run full reindex and clear caches -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <!--Enable Flat Catalog Category -->
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!--Verify Category is not listed in navigation menu-->
+        <amOnPage url="/{{CatNotIncludeInMenu.name_lwr}}.html"  stepKey="openCategoryPage"/>
+        <waitForPageLoad time="60" stepKey="waitForPageToBeLoaded"/>
+        <dontSee selector="{{StorefrontHeaderSection.NavigationCategoryByName(CatNotIncludeInMenu.name)}}" stepKey="dontSeeCategoryOnNavigation"/>
+        <!-- Select created category and enable Include In Menu option-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatNotIncludeInMenu.name)}}" stepKey="selectCreatedCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="enableIncludeInMenuOption"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <!--Run full reindex and clear caches -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <!--Open Index Management Page -->
+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
+        <!--Verify Category In Store Front-->
+        <amOnPage url="/$$createCategory.name$$.html"  stepKey="openCategoryPage1"/>
+        <waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
+        <!--Verify category is visible in First Store View -->
+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectForstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryOnNavigation"/>
+        <!--Verify category is visible in Second Store View -->
+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
+        <waitForPageLoad stepKey="waitForSecondstoreView"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryOnNavigation1"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
new file mode 100644
index 0000000000000..93ca23e2afc9f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
@@ -0,0 +1,99 @@
+<?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="AdminUpdateFlatCategoryNameAndDescriptionTest">
+        <annotations>
+            <stories value="Update category"/>
+            <title value="Flat Catalog - Update Category Name and Description"/>
+            <description value="Login as admin and update flat category name and description"/>
+            <testCaseId value="MC-11010"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
+            <!--Create category-->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <!-- Create First StoreView  -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewEn">
+                <argument name="storeView" value="customStoreEN"/>
+            </actionGroup>
+            <!-- Create Second StoreView -->
+            <actionGroup ref="CreateStoreView" stepKey="createCustomStoreViewFr">
+                <argument name="storeView" value="customStoreFR"/>
+            </actionGroup>
+            <!--Run full reindex and clear caches -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <!--Enable Flat Catalog Category -->
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
+            <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
+            <!-- Run cron twice -->
+            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" stepKey="runCron2"/>
+        </before>
+        <after>
+            <deleteData stepKey="deleteCategory" createDataKey="createCategory" />
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Select Created Category-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
+        <waitForPageLoad stepKey="waitForPageToLoaded"/>
+        <!--Update Category Name and Description -->
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent"/>
+        <fillField selector="{{AdminCategoryContentSection.description}}"  userInput="Updated category Description Fields" stepKey="fillUpdatedDescription"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <!--Run full reindex and clear caches -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <!--Open Index Management Page -->
+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
+        <waitForPageLoad stepKey="waitForIndexPageToLoad"/>
+        <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="READY"/>
+        <!--Verify Category In Store Front-->
+        <amOnPage url="{{SimpleSubCategory.name}}.html" stepKey="goToStorefrontPage"/>
+        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
+        <!--Verify category is visible in First Store View -->
+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectFirstStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreEN.name)}}"/>
+        <waitForPageLoad stepKey="waitForFirstStoreView"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
+        <!--Verify  category is visible in Second Store View -->
+        <click stepKey="selectStoreSwitcher1" selector="{{StorefrontHeaderSection.storeViewSwitcher}}"/>
+        <click stepKey="selectSecondStoreView" selector="{{StorefrontHeaderSection.storeViewList(customStoreFR.name)}}"/>
+        <waitForPageLoad stepKey="waitForSecondStoreView"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnNavigation1"/>
+        <!-- Verify Updated  Category Name and description on Category Page-->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage1"/>
+        <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
+        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree1"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectUpdatedCategory"/>
+        <waitForPageLoad stepKey="waitForUpdatedCategoryPageToLoad"/>
+        <seeInField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedSubCategoryName"/>
+        <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent1"/>
+        <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent1"/>
+        <seeInField selector="{{AdminCategoryContentSection.description}}" userInput="Updated category Description Fields" stepKey="seeUpdatedDescription"/>
+    </test>
+</tests>
\ No newline at end of file
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
index 8b35ef3336175..667f08fea6579 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Section/StorefrontCatalogSearchMainSection.xml
@@ -15,5 +15,6 @@
         <element name="SuccessMsg" type="button" selector="div.message-success"/>
         <element name="productCount" type="text" selector="#toolbar-amount"/>
         <element name="message" type="text" selector="div.message div"/>
+        <element name="searchResults" type="block" selector="#maincontent .column.main"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
index 03edc69e6d625..05b7dfeeb3953 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -16,6 +16,7 @@
             <description value="Admin should be able to add image to WYSIWYG content of Block"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84376"/>
+            <group value="WYSIWYGDisabled" />
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
index 771f0035b82b9..82411faddfed7 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigWYSIWYGActionGroup.xml
@@ -12,15 +12,15 @@
         <magentoCLI stepKey="enableWYSIWYG" command="config:set cms/wysiwyg/enabled enabled"/>
     </actionGroup>
     <actionGroup name="SwitchToTinyMCE3">
-    <comment userInput="Choose TinyMCE3 as the default editor" stepKey="chooseTinyMCE3AsEditor"/>
-    <conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
-    <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
-    <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>
-    <waitForElementVisible selector="{{ContentManagementSection.Switcher}}" stepKey="waitForSwitcherDropdown2" />
-    <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 3" stepKey="switchToVersion3" />
-    <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
-    <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
-    <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage"/>
+        <comment userInput="Choose TinyMCE3 as the default editor" stepKey="chooseTinyMCE3AsEditor"/>
+        <conditionalClick stepKey="expandWYSIWYGOptions1" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
+        <waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox2" />
+        <uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue2"/>
+        <waitForElementVisible selector="{{ContentManagementSection.Switcher}}" stepKey="waitForSwitcherDropdown2" />
+        <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 3" stepKey="switchToVersion3" />
+        <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
+        <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" />
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigurationSuccessMessage"/>
     </actionGroup>
     <actionGroup name="DisabledWYSIWYG">
         <magentoCLI stepKey="disableWYSIWYG" command="config:set cms/wysiwyg/enabled disabled"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml
new file mode 100644
index 0000000000000..fb2920be528b6
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml
@@ -0,0 +1,52 @@
+<?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="AdminDeleteConfigurableProductTest">
+        <annotations>
+            <features value="ConfigurableProduct"/>
+            <stories value="Delete products"/>
+            <title value="Delete configurable product test"/>
+            <description value="Admin should be able to delete a configurable product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11020"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="BaseConfigurableProduct" stepKey="createConfigurableProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteConfigurableProductFilteredBySkuAndName">
+            <argument name="product" value="$$createConfigurableProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
+        <!-- Verify product on Product Page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createConfigurableProduct.name$$)}}" stepKey="amOnConfigurableProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <!-- Search for the product by sku -->
+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createConfigurableProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
+        <waitForPageLoad stepKey="waitForSearchButton"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <!-- Should not see any search results -->
+        <dontSee userInput="$$createConfigurableProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
+        <!-- Go to the category page that we created in the before block -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <!-- Should not see the product -->
+        <dontSee userInput="$$createConfigurableProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
index 38ac2c99e4756..08f1c2349357d 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
@@ -31,6 +31,28 @@
         <data key="file">magento-logo.png</data>
         <data key="sample">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data>
     </entity>
+    <entity name="downloadableLink1" type="downloadable_link">
+        <data key="title" unique="suffix">link-1</data>
+        <data key="price">2.43</data>
+        <data key="number_of_downloads">2</data>
+        <data key="sample_type">url</data>
+        <data key="sample_url">http://example.com</data>
+        <data key="link_type">url</data>
+        <data key="link_url">http://example.com</data>
+        <data key="is_shareable">0</data>
+        <data key="sort_order">1</data>
+    </entity>
+    <entity name="downloadableLink2" type="downloadable_link">
+        <data key="title" unique="suffix">link-2</data>
+        <data key="price">3</data>
+        <data key="number_of_downloads">3</data>
+        <data key="sample_type">url</data>
+        <data key="sample_url">http://example.com</data>
+        <data key="link_type">url</data>
+        <data key="link_url">http://example.com</data>
+        <data key="is_shareable">1</data>
+        <data key="sort_order">2</data>
+    </entity>
     <entity name="downloadableSampleFile" type="downloadable_sample">
         <data key="title" unique="suffix">SampleFile</data>
         <data key="file_type">Upload File</data>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
index 6a91b60dcb588..4bed31d9f854e 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
@@ -19,6 +19,20 @@
         <data key="status">1</data>
         <data key="urlKey" unique="suffix">downloadableproduct</data>
     </entity>
+    <entity name="DownloadableProductWithTwoLink" type="product">
+        <data key="sku" unique="suffix">downloadableproduct</data>
+        <data key="type_id">downloadable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">DownloadableProduct</data>
+        <data key="price">50.99</data>
+        <data key="quantity">100</data>
+        <data key="weight">0</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">downloadableproduct</data>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+        <requiredEntity type="downloadable_link">downloadableLink1</requiredEntity>
+        <requiredEntity type="downloadable_link">downloadableLink2</requiredEntity>
+    </entity>
     <entity name="ApiDownloadableProduct" type="product">
         <data key="sku" unique="suffix">api-downloadable-product</data>
         <data key="type_id">downloadable</data>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
new file mode 100644
index 0000000000000..d7e93d3429b96
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
@@ -0,0 +1,57 @@
+<?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="AdminDeleteDownloadableProductTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <title value="Delete Downloadable Product"/>
+            <description value="Admin should be able to delete a downloadable product"/>
+            <testCaseId value="MC-11018"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="DownloadableProductWithTwoLink" stepKey="createDownloadableProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="downloadableLink1" stepKey="addDownloadableLink1">
+                <requiredEntity createDataKey="createDownloadableProduct"/>
+            </createData>
+            <createData entity="downloadableLink2" stepKey="addDownloadableLink2">
+                <requiredEntity createDataKey="createDownloadableProduct"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteDownloadableProductFilteredBySkuAndName">
+            <argument name="product" value="$$createDownloadableProduct$$"/>
+        </actionGroup>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
+        <!--Verify product on Product Page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createDownloadableProduct.name$$)}}" stepKey="amOnDownloadableProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <!-- Search for the product by sku -->
+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createDownloadableProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
+        <waitForPageLoad stepKey="waitForSearchButton"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <!-- Should not see any search results -->
+        <dontSee userInput="$$createDownloadableProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
+        <!-- Go to the category page that we created in the before block -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <!-- Should not see the product -->
+        <dontSee userInput="$$createDownloadableProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
index 4d979953a934e..cb268b51f08f9 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Data/GroupedProductData.xml
@@ -28,4 +28,16 @@
         <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
         <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
     </entity>
+    <entity name="ApiGroupedProduct2" type="product3">
+        <data key="sku" unique="suffix">api-grouped-product</data>
+        <data key="type_id">grouped</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">Api Grouped Product</data>
+        <data key="status">1</data>
+        <data key="urlKey" unique="suffix">api-grouped-product</data>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml
new file mode 100644
index 0000000000000..966e24851395c
--- /dev/null
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml
@@ -0,0 +1,57 @@
+<?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="AdminDeleteGroupedProductTest">
+        <annotations>
+            <features value="GroupedProduct"/>
+            <title value="Delete Grouped Product"/>
+            <description value="Admin should be able to delete a grouped product"/>
+            <testCaseId value="MC-11019"/>
+            <severity value="CRITICAL"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <createData entity="ApiProductWithDescription" stepKey="createSimpleProduct"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="ApiGroupedProduct2" stepKey="createGroupedProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="OneSimpleProductLink" stepKey="addProductOne">
+                <requiredEntity createDataKey="createGroupedProduct"/>
+                <requiredEntity createDataKey="createSimpleProduct"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <actionGroup ref="deleteProductUsingProductGrid" stepKey="deleteGroupedProductFilteredBySkuAndName">
+            <argument name="product" value="$$createGroupedProduct$$"/>
+        </actionGroup>
+        <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="A total of 1 record(s) have been deleted." stepKey="deleteMessage"/>
+        <!--Verify product on Product Page -->
+        <amOnPage url="{{StorefrontProductPage.url($$createGroupedProduct.name$$)}}" stepKey="amOnGroupedProductPage"/>
+        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
+        <!--Search for the product by sku-->
+        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createGroupedProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
+        <waitForPageLoad stepKey="waitForSearchButton"/>
+        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
+        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <!-- Should not see any search results -->
+        <dontSee userInput="$$createGroupedProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
+        <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
+        <!-- Go to the category page that we created in the before block -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
+        <!-- Should not see the product -->
+        <dontSee userInput="$$createGroupedProduct.name$$" selector="{{StorefrontCategoryMainSection.productsList}}" stepKey="dontSeeProductInCategory"/>
+        <see selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" userInput="We can't find products matching the selection." stepKey="seeEmptyProductMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml
new file mode 100644
index 0000000000000..55ed3edd9bc79
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Page/AdminExportIndexPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminExportIndexPage" url="admin/export/" area="admin" module="Magento_ImportExport">
+        <section name="AdminExportMainSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
new file mode 100644
index 0000000000000..ad9e7672ce11a
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportAttributeSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminExportAttributeSection">
+        <element name="filterByAttributeCode" type="input" selector="#export_filter_grid_filter_attribute_code"/>
+        <element name="resetFilter" type="button" selector="button[data-action='grid-filter-reset']" timeout="30"/>
+        <element name="search" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportMainSection.xml b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportMainSection.xml
new file mode 100644
index 0000000000000..da1d928607e75
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Mftf/Section/AdminExportMainSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminExportMainSection">
+        <element name="entityType" type="select" selector="#entity"/>
+        <element name="entityAttributes" type="select" selector="#export_filter_form"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml b/app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml
new file mode 100644
index 0000000000000..ed9a3dbb8c74b
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/Page/AdminIndexManagementPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminIndexManagementPage" url="indexer/indexer/list/" area="admin" module="Indexer">
+        <section name="AdminIndexManagementSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
index db98116c224dd..860b600de2b53 100644
--- a/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
+++ b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
@@ -9,9 +9,12 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminIndexManagementSection">
-        <!--<element name="catalogSearchCheckbox" type="checkbox" selector="input[value='catalogsearch_fulltext']"/>-->
+        <element name="catalogSearchCheckbox" type="checkbox" selector="input[value='catalogsearch_fulltext']"/>
         <element name="indexerCheckbox" type="checkbox" selector="input[value='{{var1}}']" parameterized="true"/>
         <element name="massActionSelect" type="select" selector="#gridIndexer_massaction-select"/>
         <element name="massActionSubmit" type="button" selector="#gridIndexer_massaction-form button"/>
+        <element name="indexerSelect" type="select" selector="//select[contains(@class,'action-select-multiselect')]"/>
+        <element name="indexerStatus" type="text" selector="//tr[descendant::td[contains(., '{{status}}')]]//*[contains(@class, 'col-indexer_status')]/span" parameterized="true"/>
+        <element name="successMessage" type="text" selector="//*[@data-ui-id='messages-message-success']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
index 31bbe7550e5a1..86d3963bc42b6 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/CreateCustomStoreViewActionGroup.xml
@@ -5,6 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CreateCustomStoreViewActionGroup">
@@ -18,7 +19,24 @@
         <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
         <selectOption userInput="{{customStore.is_active}}" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="selectStoreViewStatus"/>
         <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="clickAcceptNewStoreViewCreationButton"/>
+    </actionGroup>
+    <actionGroup name="CreateStoreView">
+        <arguments>
+            <argument name="storeView" defaultValue="customStore"/>
+            <argument name="storeGroupName" defaultValue="_defaultStoreGroup.name"/>
+            <argument name="storeViewStatus" defaultValue="_defaultStore.is_active"/>
+        </arguments>
+        <amOnPage  url="{{AdminSystemStoreViewPage.url}}" stepKey="amOnAdminSystemStoreViewPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <selectOption userInput="{{storeGroupName}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
+        <fillField userInput="{{storeView.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
+        <fillField userInput="{{storeView.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
+        <selectOption userInput="{{storeViewStatus}}" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="selectStoreViewStatus"/>
+        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
         <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationButton" />
         <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="clickAcceptNewStoreViewCreationButton"/>
+        <see userInput="You saved the store view." stepKey="seeSavedMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
index 98ad1db46732b..e40aa76967bec 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresMainActionsSection.xml
@@ -10,7 +10,7 @@
         <element name="createStoreViewButton" type="button" selector="#add_store" timeout="30"/>
         <element name="createStoreButton" type="button" selector="#add_group" timeout="30"/>
         <element name="createWebsiteButton" type="button" selector="#add" timeout="30"/>
-        <element name="saveButton" type="button" selector="#save" timeout="30"/>
+        <element name="saveButton" type="button" selector="#save" timeout="90"/>
         <element name="backButton" type="button" selector="#back" timeout="30"/>
         <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
     </section>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
index af24a3b9d29f8..bee9a79abeb77 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -12,5 +12,6 @@
         <element name="storeViewDropdown" type="button" selector="ul.switcher-dropdown"/>
         <element name="storeViewOption" type="button" selector="li.view-{{var1}}>a" parameterized="true"/>
         <element name="storeView" type="button" selector="//div[@class='actions dropdown options switcher-options active']//ul//li//a[contains(text(),'{{var}}')]" parameterized="true"/>
+        <element name="storeViewList" type="button" selector="//li[contains(.,'{{storeViewName}}')]//a" parameterized="true"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
index 404bebfb719dc..f0bfec543f281 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProductCatalogSearch/Test/EndToEndB2CGuestUserTest.xml
@@ -26,5 +26,5 @@
         <!-- @TODO: Move Image check to action group after MQE-697 is fixed -->
         <grabAttributeFrom selector="{{StorefrontProductInfoMainSection.productImage}}" userInput="src" stepKey="searchGrabConfigProductPageImageSrc" after="searchAssertConfigProductPage"/>
         <assertNotRegExp expected="'/placeholder\/image\.jpg/'" actual="$searchGrabConfigProductPageImageSrc" stepKey="searchAssertConfigProductPageImageNotDefault" after="searchGrabConfigProductPageImageSrc"/>
-   </test>
+    </test>
 </tests>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml
index 45e255649d2cd..157135117fbee 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/DeleteProductEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\DeleteProductEntityTest">
         <variation name="DeleteProductEntityTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products" xsi:type="string">bundleProduct::bundle_dynamic_product</data>
             <data name="isRequired" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
@@ -15,6 +16,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
         </variation>
         <variation name="DeleteProductEntityTestVariation5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products" xsi:type="string">bundleProduct::bundle_fixed_product</data>
             <data name="isRequired" xsi:type="string">No</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AdvancedMoveCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AdvancedMoveCategoryEntityTest.xml
index 96a9d91a8e5f3..e92edf4a143b9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AdvancedMoveCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/AdvancedMoveCategoryEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Category\AdvancedMoveCategoryEntityTest" summary="Move category from one to another" ticketId="MAGETWO-27319">
         <variation name="AdvancedMoveCategoryEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="childCategory/dataset" xsi:type="string">three_nested_categories</data>
             <data name="parentCategory/dataset" xsi:type="string">default</data>
             <data name="moveLevel" xsi:type="number">1</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml
index 5f14f579a4271..99f4b6718feb9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Category\UpdateCategoryEntityFlatDataTest" summary="Update Category if Use Category Flat (Cron is ON, 'Update on Save' Mode)" ticketId="MAGETWO-20169">
         <variation name="UpdateCategoryEntityFlatDataTestVariation1" summary="Update Category with custom name and description">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCategory/dataset" xsi:type="string">default</data>
             <data name="category/data/name" xsi:type="string">Name%isolation%</data>
             <data name="category/data/description" xsi:type="string">Category Description Updated</data>
@@ -23,6 +24,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
         </variation>
         <variation name="UpdateCategoryEntityFlatDataTestVariation2" summary="Include category to navigation menu">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCategory/dataset" xsi:type="string">default</data>
             <data name="initialCategory/data/include_in_menu" xsi:type="string">No</data>
             <data name="category/data/include_in_menu" xsi:type="string">Yes</data>
@@ -37,6 +39,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryInNavigationMenu" />
         </variation>
         <variation name="UpdateCategoryEntityFlatDataTestVariation3" summary="Update category and assert assigned products">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCategory/dataset" xsi:type="string">default</data>
             <data name="category/data/category_products/dataset" xsi:type="string">catalogProductSimple::default</data>
             <data name="indexers/0" xsi:type="string">Category Flat Data</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.xml
index fd2c9afaea160..0c7d88cc920b2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Category\UpdateInactiveCategoryEntityFlatDataTest" summary="Update Category if Use Category Flat (Cron is ON, 'Update on Save' Mode)" ticketId="MAGETWO-20169">
         <variation name="UpdateInactiveCategoryEntityFlatDataTestVariation1" summary="Inactive category and check that category is absent on frontend">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCategory/dataset" xsi:type="string">default</data>
             <data name="category/data/is_active" xsi:type="string">No</data>
             <data name="indexers/0" xsi:type="string">Category Flat Data</data>
@@ -22,6 +23,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryAbsenceOnFrontend" />
         </variation>
         <variation name="UpdateInactiveCategoryEntityFlatDataTestVariation2" summary="Inactive category and check that category is not active on frontend">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCategory/dataset" xsi:type="string">default</data>
             <data name="initialCategory/data/is_active" xsi:type="string">No</data>
             <data name="category/data/is_active" xsi:type="string">No</data>
@@ -36,6 +38,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryIsNotActive" />
         </variation>
         <variation name="UpdateInactiveCategoryEntityFlatDataTestVariation3" summary="Exclude category from navigation menu">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="initialCategory/dataset" xsi:type="string">default</data>
             <data name="category/data/include_in_menu" xsi:type="string">No</data>
             <data name="indexers/0" xsi:type="string">Category Flat Data</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityByAttributeMaskSkuTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityByAttributeMaskSkuTest.xml
index aecdbc5362fbb..bdea332a3af0d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityByAttributeMaskSkuTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityByAttributeMaskSkuTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\CreateSimpleProductEntityByAttributeMaskSkuTest" summary="Create Simple Product with attribute sku mask" ticketId="MAGETWO-59861">
         <variation name="CreateSimpleProductEntityByAttributeMaskSkuTest1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="configData" xsi:type="string">attribute_product_mask_sku</data>
             <data name="description" xsi:type="string">Create product with country of manufacture attribute sku mask</data>
             <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
index 1449e7df0ce61..a9c78117d7b69 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\CreateVirtualProductEntityTest" summary="Create Virtual Product" ticketId="MAGETWO-23417">
         <variation name="CreateVirtualProductEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Create product with required fields</data>
             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
@@ -17,7 +18,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
         </variation>
         <variation name="CreateVirtualProductEntityTestVariation2" summary="Create product with tier price">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
             <data name="product/data/sku" xsi:type="string">virtual_sku_%isolation%</data>
@@ -51,6 +52,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
         <variation name="CreateVirtualProductEntityTestVariation4">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Create product with tier price for "General" group</data>
             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
@@ -71,6 +73,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPageWithCustomer" />
         </variation>
         <variation name="CreateVirtualProductEntityTestVariation5">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Create product with custom options suite and import options</data>
             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
@@ -86,6 +89,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
         </variation>
         <variation name="CreateVirtualProductEntityTestVariation6">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Create product without manage stock</data>
             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
@@ -102,6 +106,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock" />
         </variation>
         <variation name="CreateVirtualProductEntityTestVariation7">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="description" xsi:type="string">Create product out of stock with tier price</data>
             <data name="product/data/url_key" xsi:type="string">virtual-product-%isolation%</data>
             <data name="product/data/name" xsi:type="string">VirtualProduct %isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml
index fc566e855c0ff..2d91f4a7024e5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteProductEntityTest.xml
@@ -10,12 +10,13 @@
         <variation name="DeleteProductEntityTestVariation1">
             <data name="products" xsi:type="string">catalogProductSimple::default</data>
             <data name="isRequired" xsi:type="string">Yes</data>
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="tag" xsi:type="string">to_maintain:yes, mftf_migrated:yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductNotInGrid" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
         </variation>
         <variation name="DeleteProductEntityTestVariation2">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products" xsi:type="string">catalogProductVirtual::default</data>
             <data name="isRequired" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
@@ -23,6 +24,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
         </variation>
         <variation name="DeleteProductEntityTestVariation3">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products" xsi:type="string">catalogProductSimple::with_one_custom_option</data>
             <data name="isRequired" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml
index cf52597cfc52f..0db197ba3b385 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\NavigateUpSellProductsTest" summary="Promote Products as Up-Sells" ticketId="MAGETWO-12391">
         <variation name="NavigateUpSellProductsTestVariation1" method="test">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, stable:no, mftf_migrated:yes</data>
             <data name="products" xsi:type="string">simple1::catalogProductSimple::product_with_category,simple2::catalogProductSimple::product_with_category,config1::configurableProduct::two_options_with_fixed_price</data>
             <data name="promotedProducts" xsi:type="string">simple1:simple2,config1;config1:simple2</data>
             <data name="navigateProductsOrder" xsi:type="string">simple1,config1,simple2</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml
index 361f2acb1d8a6..a83fce14d9381 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\DeleteAttributeSetTest" summary="Delete Attribute Set (Attribute Set)" ticketId="MAGETWO-25473">
         <variation name="DeleteAttributeSetTestVariation1">
-            <data name="tag" xsi:type="string">stable:no</data>
+            <data name="tag" xsi:type="string">stable:no, mftf_migrated:yes</data>
             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
             <data name="attributeSet/data/assigned_attributes/dataset" xsi:type="string">default</data>
             <data name="product/dataset" xsi:type="string">default</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml
index 6cca4b3f3685b..11ba7266ce564 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteProductAttributeEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\ProductAttribute\DeleteProductAttributeEntityTest" summary="Delete Product Attribute" ticketId="MAGETWO-24998">
         <variation name="DeleteProductAttributeEntityTestVariation1">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="attribute/dataset" xsi:type="string">attribute_type_text_field</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeSuccessDeleteMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeAbsenceInGrid" />
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml
index 25f31b23fa665..68dc1ecbe787e 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/DeleteProductEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\DeleteProductEntityTest">
         <variation name="DeleteProductEntityTestVariation9">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products" xsi:type="string">configurableProduct::default</data>
             <data name="isRequired" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
@@ -15,6 +16,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductIsNotDisplayingOnFrontend" />
         </variation>
         <variation name="DeleteProductEntityTestVariation10">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products" xsi:type="string">configurableProduct::with_one_option</data>
             <data name="isRequired" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml
index e2f86d82363c3..ffcafbe687236 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/DeleteProductEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\DeleteProductEntityTest">
         <variation name="DeleteProductEntityTestVariation7" firstConstraint="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" method="test">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products" xsi:type="string">downloadableProduct::default</data>
             <data name="isRequired" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml
index cf0c8c8141678..e62e5ad73958f 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/TestCase/DeleteProductEntityTest.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Catalog\Test\TestCase\Product\DeleteProductEntityTest">
         <variation name="DeleteProductEntityTestVariation8" firstConstraint="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" method="test">
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
             <data name="products" xsi:type="string">groupedProduct::default</data>
             <data name="isRequired" xsi:type="string">Yes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSuccessDeleteMessage" />

From c17aebcf2b707786322b59ecce20f132026eaeec Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 7 Feb 2019 02:26:47 -0600
Subject: [PATCH 925/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Catalog/Test/Mftf/Section/AdminProductFormSection.xml    | 2 +-
 ...leProductWithCountryOfManufactureAttributeSKUMaskTest.xml | 4 ++--
 .../Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml  | 5 ++++-
 .../Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml   | 1 +
 ...oductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml | 3 ++-
 ...uctWithTierPriceInStockVisibleInCategoryAndSearchTest.xml | 3 ++-
 ...lProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml | 3 ++-
 ...WithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 3 ++-
 .../Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml     | 1 +
 9 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 13dc2320c7095..d512189adf0a5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -73,7 +73,7 @@
         <element name="addUpSellProduct" type="button" selector="button[data-index='button_upsell']" timeout="30"/>
     </section>
     <section name="AdminAddRelatedProductsModalSection">
-        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'upsell_modal')]//button[contains(@class, 'action-primary')]" timeout="30"/>
+        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'related_modal')]//button[contains(@class, 'action-primary')]" timeout="30"/>
     </section>
     <section name="ProductWYSIWYGSection">
         <element name="Switcher" type="button" selector="//select[@id='dropdown-switcher']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
index 2298ce817fe95..bb73085c97b4d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
@@ -24,10 +24,10 @@
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <magentoCLI stepKey="setName" command="config:set catalog/fields_masks/sku" arguments="'{{name}}'"/>
             <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
                 <argument name="sku" value="{{nameAndAttributeSkuMaskSimpleProduct.name}} {{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" />
             </actionGroup>
-            <magentoCLI stepKey="setName" command="config:set catalog/fields_masks/sku" arguments="'{{name}}'"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
 
@@ -39,10 +39,10 @@
 
         <!-- Create simple product with country of manufacture attribute -->
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}" stepKey="fillSimpleProductName"/>
+        <selectOption selector="{{AdminProductFormSection.countryOfManufacture}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="selectCountryOfManufacture"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.price}}" stepKey="fillSimpleProductPrice"/>
         <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.weight}}" stepKey="fillSimpleProductWeight"/>
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.quantity}}" stepKey="fillSimpleProductQuantity"/>
-        <selectOption selector="{{AdminProductFormSection.countryOfManufacture}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="selectCountryOfManufacture"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForSimpleProductToSave"/>
         <!-- Verify customer see success message -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index 73b6855c0e3e1..807973203279c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -16,6 +16,9 @@
             <severity value="CRITICAL"/>
             <group value="Catalog"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MQE-1424" />
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
@@ -66,7 +69,7 @@
         <scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
         <scrollToTopOfPage stepKey="scrollOnTopOfPage"/>
-        <click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
+        <conditionalClick selector="{{CatalogProductsSection.resetFilter}}" dependentSelector="{{CatalogProductsSection.resetFilter}}" visible="true" stepKey="clickOnResetFilter"/>
         <waitForPageLoad stepKey="waitForProductsToLoad"/>
         <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$createSimpleProduct.name$$"  stepKey="selectProduct"/>
         <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
index 93ca23e2afc9f..4ff1884a5be81 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
@@ -16,6 +16,7 @@
             <severity value="CRITICAL"/>
             <group value="Catalog"/>
             <group value="mtf_migrated"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index ce23c311006e1..9bdc93e61e499 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -63,8 +63,9 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$categoryEntity.name$$]" requiredAction="true" stepKey="selectCategory"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
index 1b0aa36189816..d4ec5e410d9ff 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -63,8 +63,9 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$categoryEntity.name$$]" requiredAction="true" stepKey="selectCategory"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 921ca06cfbeda..717d710b4a288 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -63,8 +63,9 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$categoryEntity.name$$]" requiredAction="true" stepKey="selectCategory"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 532214c897f82..703a4e24cdca9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -63,8 +63,9 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$initialCategoryEntity.name$$" stepKey="fillSearchForInitialCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$initialCategoryEntity.name$$)}}" stepKey="unselectInitialCategory"/>
+        <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
+        <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
-        <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$categoryEntity.name$$]" requiredAction="true" stepKey="selectCategory"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualTierPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
index c3c92dc59c288..0ca4ce1eabf3b 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-94229"/>
             <group value="Cms"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>

From 66e12326ec535b69a7caa8cce42089d8d04f8a6d Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 7 Feb 2019 03:55:02 -0600
Subject: [PATCH 926/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Test/Mftf/Section/AdminProductFormSection.xml      |  1 +
 ...eateInactiveFlatCategoryAndUpdateAsInactiveTest.xml |  4 +++-
 .../Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml  |  4 +++-
 .../Test/AdminCreateInactiveInMenuFlatCategoryTest.xml |  4 +++-
 ...uctWithCountryOfManufactureAttributeSKUMaskTest.xml | 10 +++++-----
 ...eateVirtualProductFillingRequiredFieldsOnlyTest.xml |  2 +-
 .../Test/AdminNavigateMultipleUpSellProductsTest.xml   |  2 +-
 7 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index d512189adf0a5..26d6c939faad5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -74,6 +74,7 @@
     </section>
     <section name="AdminAddRelatedProductsModalSection">
         <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'related_modal')]//button[contains(@class, 'action-primary')]" timeout="30"/>
+        <element name="AddUpSellProductsButton" type="button" selector="//aside[contains(@class, 'upsell_modal')]//button[contains(@class, 'action-primary')]" timeout="30"/>
     </section>
     <section name="ProductWYSIWYGSection">
         <element name="Switcher" type="button" selector="//select[@id='dropdown-switcher']"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
index 4ea41f7fea95b..21b3dba7140c0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -42,6 +42,9 @@
             <magentoCLI command="cron:run" stepKey="runCron2"/>
         </before>
         <after>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
@@ -49,7 +52,6 @@
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
                 <argument name="customStore" value="customStoreFR"/>
             </actionGroup>
-            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!-- Select created category and make category inactive-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
index 22fb2034be562..aa3dba85dfadf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
@@ -42,6 +42,9 @@
             <magentoCLI command="cron:run" stepKey="runCron2"/>
         </before>
         <after>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
@@ -49,7 +52,6 @@
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
                 <argument name="customStore" value="customStoreFR"/>
             </actionGroup>
-            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!-- Select created category and make category inactive-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
index 4046c81d32981..37417cd7fdb85 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
@@ -42,6 +42,9 @@
             <magentoCLI command="cron:run" stepKey="runCron2"/>
         </before>
         <after>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
             </actionGroup>
@@ -49,7 +52,6 @@
                 <argument name="customStore" value="customStoreFR"/>
             </actionGroup>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
-            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!-- Select created category and disable Include In Menu option-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
index bb73085c97b4d..3487de656173f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
@@ -20,13 +20,13 @@
         </annotations>
 
         <before>
-            <magentoCLI stepKey="setCountryOfManufacture" command="config:set catalog/fields_masks/sku" arguments="'{{name}} {{country_of_manufacture}}'"/>
+            <magentoCLI stepKey="setCountryOfManufacture" command="config:set catalog/fields_masks/sku" arguments="{{name}}-{{country_of_manufacture}}"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <magentoCLI stepKey="setName" command="config:set catalog/fields_masks/sku" arguments="'{{name}}'"/>
+            <magentoCLI stepKey="setName" command="config:set catalog/fields_masks/sku" arguments="{{name}}"/>
             <actionGroup ref="deleteProductBySku" stepKey="deleteCreatedProduct">
-                <argument name="sku" value="{{nameAndAttributeSkuMaskSimpleProduct.name}} {{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" />
+                <argument name="sku" value="{{nameAndAttributeSkuMaskSimpleProduct.name}}-{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" />
             </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
@@ -53,9 +53,9 @@
         <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
-        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}} {{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="fillSkuFilterFieldWithNameAndCountryOfManufactureInput" />
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}-{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="fillSkuFilterFieldWithNameAndCountryOfManufactureInput" />
         <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
         <waitForPageLoad stepKey="waitForProductSearchAfterApplyingFilters"/>
-        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}} {{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="seeSimpleProductSkuMaskedAsNameAndCountryOfManufacture"/>
+        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}-{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="seeSimpleProductSkuMaskedAsNameAndCountryOfManufacture"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
index 5e7bc591348fa..c3fe666c84fd4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
@@ -19,7 +19,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
-            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
index b7540d8935960..2ae58b29bf6cb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
@@ -145,7 +145,7 @@
         </actionGroup>
         <waitForPageLoad stepKey="waitForTheSimpleProduct2ToBeLoaded"/>
         <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectSimpleProduct1"/>
-        <click stepKey="addSimpleProduct2" selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}"/>
+        <click stepKey="addSimpleProduct2" selector="{{AdminAddRelatedProductsModalSection.AddUpSellProductsButton}}"/>
         <waitForPageLoad stepKey="waitForSimpleProductToBeAdded"/>
         <scrollTo selector="{{AdminProductFormActionSection.saveButton}}" stepKey="scrollToTheSaveButton"/>
         <click stepKey="clickOnSaveButton1" selector="{{AdminProductFormActionSection.saveButton}}"/>

From 9fba225cb542961ea6325deb01d000f43e349a48 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 7 Feb 2019 04:42:21 -0600
Subject: [PATCH 927/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
index 4ff1884a5be81..fcbc0cb205268 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
@@ -42,6 +42,9 @@
             <magentoCLI command="cron:run" stepKey="runCron2"/>
         </before>
         <after>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
             <deleteData stepKey="deleteCategory" createDataKey="createCategory" />
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
@@ -49,7 +52,6 @@
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
                 <argument name="customStore" value="customStoreFR"/>
             </actionGroup>
-            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!-- Select Created Category-->

From 89aacac09fea9acce37a7f8ee3443c59d8c8e811 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Thu, 7 Feb 2019 13:17:25 +0200
Subject: [PATCH 928/932] MSI-2020: Fix static tests

---
 .../Magento/Test/Php/_files/phpcpd/blacklist/common.txt          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 9c40f33f27a12..43a5aa2f66fbc 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -207,3 +207,4 @@ Magento/InventoryConfigurableProductIndexer/Indexer
 Magento/InventoryGroupedProductIndexer/Indexer
 Magento/Customer/Model/FileUploaderDataResolver.php
 Magento/Customer/Model/Customer/DataProvider.php
+Magento/InventoryShippingAdminUi/Ui/DataProvider/GetSourcesByStockIdSkuAndQty.php

From fb3bd3f2c435d7df411cb1bba1e11e1c9b312a4f Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 7 Feb 2019 05:35:40 -0600
Subject: [PATCH 929/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml     | 4 ++--
 .../Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
index 2ae58b29bf6cb..bcd4ca8531203 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
@@ -111,7 +111,7 @@
         </actionGroup>
         <waitForPageLoad stepKey="waitForTheProductToLoad"/>
         <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectTheSimpleProduct2"/>
-        <click stepKey="addSelectedProduct" selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}"/>
+        <click stepKey="addSelectedProduct" selector="{{AdminAddRelatedProductsModalSection.AddUpSellProductsButton}}"/>
         <waitForPageLoad stepKey="waitForProductToBeAdded"/>
         <click stepKey="clickOnAddUpSellProductsButton" selector="{{AdminProductFormRelatedUpSellCrossSellSection.addUpSellProduct}}"/>
         <actionGroup ref="filterProductGridBySku2" stepKey="filterConfigurableProduct">
@@ -119,7 +119,7 @@
         </actionGroup>
         <waitForPageLoad stepKey="waitForTheConfigProductToLoad"/>
         <checkOption selector="{{AdminAddProductsToGroupPanel.firstCheckbox}}" stepKey="selectTheConfigProduct"/>
-        <click stepKey="addSelectedProductButton" selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}"/>
+        <click stepKey="addSelectedProductButton" selector="{{AdminAddRelatedProductsModalSection.AddUpSellProductsButton}}"/>
         <waitForPageLoad stepKey="waitForConfigProductToBeAdded"/>
         <click stepKey="clickOnRelatedProducts1" selector="{{AdminProductFormRelatedUpSellCrossSellSection.relatedProductsHeader}}"/>
         <click stepKey="clickOnSaveButton" selector="{{AdminProductFormActionSection.saveButton}}"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
index 8ecd860dfa082..5527303370623 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
@@ -41,6 +41,9 @@
             <magentoCLI command="cron:run" stepKey="runCron2"/>
         </before>
         <after>
+            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
+            <magentoCLI stepKey="setIndexersMode" command="indexer:set-mode" arguments="realtime" />
+            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
@@ -48,7 +51,6 @@
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr">
                 <argument name="customStore" value="customStoreFR"/>
             </actionGroup>
-            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Verify Category is not listed in navigation menu-->

From a54b21191833836b792dc9f15c594ba26a913279 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 7 Feb 2019 05:42:59 -0600
Subject: [PATCH 930/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml    | 3 ---
 .../Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml  | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index 807973203279c..cdeb1911878e6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -16,9 +16,6 @@
             <severity value="CRITICAL"/>
             <group value="Catalog"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MQE-1424" />
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
index 674b2b66cd0c0..127256497d64a 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
@@ -17,6 +17,9 @@
             <testCaseId value="MAGETWO-96469"/>
             <useCaseId value="MAGETWO-96406"/>
             <group value="ConfigurableProduct"/>
+            <skip>
+                <issueId value="MQE-1424" />
+            </skip>
         </annotations>
 
         <before>

From 8e53431d562d2668a4f4b7a83c2741734c6aafe0 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 7 Feb 2019 10:03:48 -0600
Subject: [PATCH 931/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index cdeb1911878e6..8872ea98eb504 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -32,8 +32,8 @@
                 <argument name="storeView" value="customStoreFR"/>
             </actionGroup>
             <!--Run full reindex and clear caches -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
             <!--Enable Flat Catalog Category -->
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
@@ -57,6 +57,7 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!-- Select Created Category-->
+        <magentoCLI command="indexer:reindex" stepKey="reindexBeforeFlow"/>
         <amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>

From 54b0ed823b8fe11ddc88b1392e549b38914ded63 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Thu, 7 Feb 2019 17:08:52 -0600
Subject: [PATCH 932/932] MQE-1424: Stabilize mtf-eol branch

---
 .../Magento/Test/Php/_files/phpcpd/blacklist/common.txt         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 43a5aa2f66fbc..837fef7a1935d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -207,4 +207,4 @@ Magento/InventoryConfigurableProductIndexer/Indexer
 Magento/InventoryGroupedProductIndexer/Indexer
 Magento/Customer/Model/FileUploaderDataResolver.php
 Magento/Customer/Model/Customer/DataProvider.php
-Magento/InventoryShippingAdminUi/Ui/DataProvider/GetSourcesByStockIdSkuAndQty.php
+Magento/InventoryShippingAdminUi/Ui/DataProvider